Allow to upgrade from local directories

- Bump installer - Add test for upgrades from directory - Add missing labels for autobump Co-authored-by: Darren Shepherd <[email protected]> Signed-off-by: Ettore Di Giacinto <[email protected]>
rancher · Jun 21, 2021 · 2b29653 · 2b29653
1 parent 7b0bf09
commit 2b29653
Show file tree

Hide file tree

Showing 15 changed files with 108 additions and 24 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -253,7 +253,7 @@ jobs:
     strategy:
       matrix:
         flavor: ["opensuse"]
-        test: ["test-features", "test-smoke", "test-fallback", "test-recovery", "test-upgrades-images-signed", "test-upgrades-images-unsigned"]
+        test: ["test-features", "test-smoke", "test-fallback", "test-recovery", "test-upgrades-images-signed", "test-upgrades-images-unsigned", "test-upgrades-local"]
     steps:
       - name: Install Go
         uses: actions/setup-go@v2
@@ -490,7 +490,7 @@ jobs:
       max-parallel: 1
       matrix:
         flavor: ["opensuse"]
-        test: ["test-features", "test-smoke", "test-fallback", "test-recovery", "test-upgrades-images-signed", "test-upgrades-images-unsigned"]
+        test: ["test-features", "test-smoke", "test-fallback", "test-recovery", "test-upgrades-images-signed", "test-upgrades-images-unsigned", "test-upgrades-local"]
     steps:
       - name: Install Go
         uses: actions/setup-go@v2

diff --git a/make/Makefile.test b/make/Makefile.test
@@ -124,6 +124,9 @@ test-upgrades-images-signed: $(GINKGO)
 test-upgrades-images-unsigned: $(GINKGO)
 	cd $(ROOT_DIR)/tests && $(GINKGO) $(GINKGO_ARGS) ./upgrades-images-unsigned
 
+test-upgrades-local: $(GINKGO)
+	cd $(ROOT_DIR)/tests && $(GINKGO) $(GINKGO_ARGS) ./upgrades-local
+
 test-smoke: $(GINKGO)
 	cd $(ROOT_DIR)/tests && $(GINKGO) $(GINKGO_ARGS) ./smoke
 

diff --git a/packages/cos/collection.yaml b/packages/cos/collection.yaml
@@ -1,15 +1,14 @@
 packages:
   - name: "cos"
     category: "system"
-    version: 0.5.3+3
+    version: "0.5.4"
     brand_name: "cOS"
     labels:
       autobump.revdeps: "true"
       autobump.revbump_related: "recovery/cos-img recovery/cos-squash"
   - name: "cos"
     category: "recovery"
-    version: "0.5.3+2"
-    version: 0.5.3+3
+    version: "0.5.4"
     brand_name: "cOS recovery"
     labels:
       autobump.revdeps: "true"

diff --git a/packages/installer/definition.yaml b/packages/installer/definition.yaml
@@ -1,3 +1,3 @@
 name: "installer"
 category: "utils"
-version: 0.7.4+1
+version: "0.7.5"
diff --git a/packages/installer/upgrade.sh b/packages/installer/upgrade.sh
@@ -159,22 +159,25 @@ upgrade() {
     export TMPDIR=$temp_upgrade
     export LUET_PRIVILEGED_EXTRACT=true
 
+    args=""
+    if [ -z "$VERIFY" ]; then
+        args="--enable-logfile --logfile /tmp/luet.log --plugin image-mtree-check"
+    fi
     if [ -n "$CHANNEL_UPGRADES" ] && [ "$CHANNEL_UPGRADES" == true ]; then
-        if [ -z "$VERIFY" ]; then
-          args="--enable-logfile --logfile /tmp/luet.log --plugin luet-mtree"
-        fi
+        echo "Upgrading from release channel"
         luet install $args --system-target $TARGET --system-engine memory -y $UPGRADE_IMAGE
         luet cleanup
+    elif [ "$DIRECTORY" == true ]; then
+        echo "Upgrading from local folder: $UPGRADE_IMAGE"
+        rsync -axq --exclude='host' --exclude='mnt' --exclude='proc' --exclude='sys' --exclude='dev' --exclude='tmp' ${UPGRADE_IMAGE}/ $TARGET
     else
-        args=""
-        if [ -z "$VERIFY" ]; then
-          args="--enable-logfile --logfile /tmp/luet.log --plugin luet-mtree"
-        fi
+        echo "Upgrading from container image: $UPGRADE_IMAGE"
         luet util unpack $args $UPGRADE_IMAGE /usr/local/tmp/rootfs
         rsync -aqzAX --exclude='mnt' --exclude='proc' --exclude='sys' --exclude='dev' --exclude='tmp' /usr/local/tmp/rootfs/ $TARGET
         rm -rf /usr/local/tmp/rootfs
     fi
 
+    chmod 755 $TARGET
     SELinux_relabel
 
     rm -rf $temp_upgrade
@@ -263,6 +266,10 @@ while [ "$#" -gt 0 ]; do
         --docker-image)
             CHANNEL_UPGRADES=false
             ;;
+        --directory)
+            CHANNEL_UPGRADES=false
+            DIRECTORY=true
+            ;;
         --recovery)
             UPGRADE_RECOVERY=true
             ;;

diff --git a/packages/recovery-img/definition.yaml b/packages/recovery-img/definition.yaml
@@ -1,4 +1,4 @@
 name: "cos-img"
 category: "recovery"
-version: 0.5.3+2
+version: "0.5.4"
 brand_name: "cOS"
diff --git a/packages/recovery-img/squash/definition.yaml b/packages/recovery-img/squash/definition.yaml
@@ -1,3 +1,3 @@
 name: "cos-squash"
 category: "recovery"
-version: "0.5.3+1"
+version: "0.5.4"
diff --git a/packages/toolchain/luet-mtree/definition.yaml b/packages/toolchain/luet-mtree/definition.yaml
@@ -5,4 +5,4 @@ labels:
   github.repo: "luet-mtree"
   github.owner: "rancher-sandbox"
   autobump.revdeps: "true"
-  autobump.revbump_related: "system/cos"
+  autobump.revbump_related: "system/cos recovery/cos recovery/cos-img recovery/cos-squash"
diff --git a/packages/toolchain/luet/definition.yaml b/packages/toolchain/luet/definition.yaml
@@ -6,4 +6,4 @@ labels:
   github.repo: "luet"
   github.owner: "mudler"
   autobump.revdeps: "true"
-  autobump.revbump_related: "system/cos"
+  autobump.revbump_related: "system/cos recovery/cos recovery/cos-img recovery/cos-squash"
diff --git a/packages/toolchain/yip/definition.yaml b/packages/toolchain/yip/definition.yaml
@@ -5,4 +5,4 @@ labels:
   github.repo: "yip"
   github.owner: "mudler"
   autobump.revdeps: "true"
-  autobump.revbump_related: "system/cos"
+  autobump.revbump_related: "system/cos recovery/cos recovery/cos-img recovery/cos-squash"
diff --git a/packages/toolchain/yq/definition.yaml b/packages/toolchain/yq/definition.yaml
@@ -5,3 +5,6 @@ arch: "amd64"
 uri:
   - https://github.com/mikefarah/yq
 license: "MIT"
+labels:
+  autobump.revdeps: "true"
+  autobump.revbump_related: "system/cos recovery/cos recovery/cos-img recovery/cos-squash"
diff --git a/tests/upgrades-images-unsigned/tests_suite_test.go b/tests/upgrades-images-unsigned/tests_suite_test.go
@@ -9,5 +9,5 @@ import (
 
 func TestTests(t *testing.T) {
 	RegisterFailHandler(Fail)
-	RunSpecs(t, "cOS Upgrate test Suite - Images unsugned")
+	RunSpecs(t, "cOS Upgrate test Suite - Images unsigned")
 }
diff --git a/tests/upgrades-images-unsigned/upgrade_test.go b/tests/upgrades-images-unsigned/upgrade_test.go
@@ -15,12 +15,9 @@ var _ = Describe("cOS Upgrade tests - Images unsigned", func() {
 		s.EventuallyConnects(360)
 	})
 
-	AfterEach(func() {
-		s.Reset()
-	})
-	Context("After install", func() {
+	Context("After install can upgrade and reset", func() {
 		When("images are not signed", func() {
-			It("upgrades to latest available (master) with --no-verify and reset", func() {
+			It("upgrades to latest available (master) with --no-verify", func() {
 				out, err := s.Command("source /etc/os-release && echo $VERSION")
 				Expect(err).ToNot(HaveOccurred())
 				Expect(out).ToNot(Equal(""))

diff --git a/tests/upgrades-local/tests_suite_test.go b/tests/upgrades-local/tests_suite_test.go
@@ -0,0 +1,13 @@
+package cos_test
+
+import (
+	"testing"
+
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+)
+
+func TestTests(t *testing.T) {
+	RegisterFailHandler(Fail)
+	RunSpecs(t, "cOS Upgrate test Suite - local upgrades")
+}
diff --git a/tests/upgrades-local/upgrade_test.go b/tests/upgrades-local/upgrade_test.go
@@ -0,0 +1,62 @@
+package cos_test
+
+import (
+	"fmt"
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+	"github.com/rancher-sandbox/cOS/tests/sut"
+)
+
+var _ = Describe("cOS Upgrade tests - local upgrades", func() {
+	var s *sut.SUT
+
+	BeforeEach(func() {
+		s = sut.NewSUT()
+		s.EventuallyConnects(360)
+	})
+
+	Context("After install can upgrade and reset", func() {
+		When("specifying a directory to upgrade from", func() {
+			It("upgrades from the specified path", func() {
+				out, err := s.Command("source /etc/os-release && echo $VERSION")
+				Expect(err).ToNot(HaveOccurred())
+				Expect(out).ToNot(Equal(""))
+
+				version := out
+
+				out, err = s.Command("mkdir /run/update && luet util unpack quay.io/costoolkit/releases-opensuse:cos-system-0.5.1 /run/update")
+				if err != nil{
+					fmt.Fprintf(GinkgoWriter, "Error from luet util unpack: %v\n", err)
+				}
+				Expect(err).ToNot(HaveOccurred())
+				Expect(out).ToNot(Equal(""))
+
+				out, err = s.Command("cos-upgrade --no-verify --directory /run/update")
+				if err != nil{
+					fmt.Fprintf(GinkgoWriter, "Error from cos-upgrade: %v\n", err)
+				}
+				Expect(err).ToNot(HaveOccurred())
+				Expect(out).Should(ContainSubstring("Upgrade done, now you might want to reboot"))
+				Expect(out).Should(ContainSubstring("Upgrade target: active.img"))
+				By("rebooting")
+				s.Reboot()
+				Expect(s.BootFrom()).To(Equal(sut.Active))
+
+				out, err = s.Command("source /etc/os-release && echo $VERSION")
+				Expect(err).ToNot(HaveOccurred())
+				Expect(out).ToNot(Equal(""))
+				Expect(out).ToNot(Equal(version))
+				Expect(out).To(Equal("0.5.1\n"))
+
+				By("rollbacking state")
+				s.Reset()
+
+				out, err = s.Command("source /etc/os-release && echo $VERSION")
+				Expect(err).ToNot(HaveOccurred())
+				Expect(out).ToNot(Equal(""))
+				Expect(out).ToNot(Equal("0.5.1\n"))
+				Expect(out).To(Equal(version))
+			})
+		})
+	})
+})