ci/cli: add support to test specific OS channel

Signed-off-by: Loic Devulder <ldevulder@suse.com>

Author: ldevulder

.github/workflows/cli-obs-manual-workflow.yaml

@@ -27,6 +27,9 @@ on:
         description: Elemental operator repository to use
         default: oci://registry.opensuse.org/isv/rancher/elemental/dev/charts/rancher
         type: string
+      os_channel:
+        description: OS channel to test
+        type: string
       os_to_test:
         description: OS repository to test (dev/staging/stable)
         type: string
@@ -38,10 +41,6 @@ on:
         description: Rancher Manager channel/version/head_version to use for installation
         default: stable/latest
         type: string
-      sequential:
-        description: Defines if bootstrapping is done sequentially (true) or in parallel (false)
-        default: false
-        type: boolean
 
 jobs:
   cli:
@@ -57,9 +56,9 @@ jobs:
       k8s_downstream_version: ${{ inputs.k8s_downstream_version }}
       k8s_upstream_version: ${{ inputs.k8s_upstream_version }}
       operator_repo: ${{ inputs.operator_repo }}
+      os_channel: ${{ inputs.os_channel }}
       os_to_test: ${{ inputs.os_to_test }}
       qase_run_id: ${{ inputs.qase_run_id }}
       rancher_version: ${{ inputs.rancher_version }}
       reset: true
-      sequential: ${{ inputs.sequential }}
       test_type: cli

.github/workflows/master_e2e.yaml

@@ -9,8 +9,8 @@ on:
         description: Version of backup-restore-operator to use
         type: string
       boot_type:
-        description: Choose booting type (pxe, iso, raw) 
-        default: pxe 
+        description: Choose booting type (pxe, iso, raw)
+        default: pxe
         type: string
       ca_type:
         description: CA type to use (selfsigned or private)
@@ -70,6 +70,9 @@ on:
       operator_upgrade:
         description: Elemental operator version to upgrade to
         type: string
+      os_channel:
+        description: Specific OS channel to test
+        type: string
       os_to_test:
         description: OS repository to test (dev/staging/stable)
         type: string
@@ -242,6 +245,7 @@ jobs:
       operator_install_type: ${{ inputs.operator_install_type }}
       operator_repo: ${{ inputs.operator_repo }}
       operator_upgrade: ${{ inputs.operator_upgrade }}
+      os_channel: ${{ inputs.os_channel }}
       os_to_test: ${{ inputs.os_to_test }}
       os_version_install: ${{ inputs.os_version_install }}
       os_version_target: ${{ inputs.os_version_target }}

.github/workflows/sub_cli.yaml

@@ -53,6 +53,9 @@ on:
       operator_upgrade:
         required: true
         type: string
+      os_channel:
+        required: true
+        type: string
       os_to_test:
         required: true
         type: string
@@ -137,6 +140,7 @@ jobs:
       # For K8s cluster to provision with Rancher Manager
       K8S_DOWNSTREAM_VERSION: ${{ inputs.k8s_downstream_version }}
       OPERATOR_INSTALL_TYPE: ${{ inputs.operator_install_type }}
+      OS_CHANNEL: ${{ inputs.os_channel }}
       OS_TO_TEST: ${{ inputs.os_to_test }}
       # For Rancher Manager
       RANCHER_VERSION: ${{ inputs.rancher_version }}

.github/workflows/sub_test_choice.yaml

@@ -62,6 +62,9 @@ on:
       operator_upgrade:
         required: true
         type: string
+      os_channel:
+        required: true
+        type: string
       os_to_test:
         required: true
         type: string
@@ -183,6 +186,7 @@ jobs:
       operator_install_type: ${{ inputs.operator_install_type }}
       operator_repo: ${{ inputs.operator_repo }}
       operator_upgrade: ${{ inputs.operator_upgrade }}
+      os_channel: ${{ inputs.os_channel }}
       os_to_test: ${{ inputs.os_to_test }}
       public_domain: ${{ inputs.public_domain }}
       public_fqdn: ${{ inputs.public_fqdn }}

tests/assets/osChannel.yaml

@@ -0,0 +1,11 @@
+apiVersion: elemental.cattle.io/v1beta1
+kind: ManagedOSVersionChannel
+metadata:
+  name: os-channel-to-test
+  # namespace: fleet-default
+spec:
+  deleteNoLongerInSyncVersions: true
+  options:
+    image: %OS_CHANNEL%
+  syncInterval: 1h
+  type: custom

tests/e2e/seedImage_test.go

@@ -18,6 +18,7 @@ import (
 	"os"
 	"os/exec"
 	"strconv"
+	"strings"
 	"time"
 
 	. "github.com/onsi/ginkgo/v2"
@@ -42,6 +43,47 @@ var _ = Describe("E2E - Creating ISO image", Label("iso-image"), func() {
 		// Report to Qase
 		testCaseID = 38
 
+		if osChannel != "" {
+			By("Adding OSChannel to test", func() {
+				// Get default channel image
+				defChannel, err := kubectl.RunWithoutErr("get", "managedOSVersionChannel",
+					"--namespace", clusterNS,
+					"-o", "jsonpath={.items[0].spec.options.image}")
+				Expect(err).To(Not(HaveOccurred()))
+				Expect(defChannel).To(Not(BeEmpty()))
+
+				if !strings.Contains(defChannel, osChannel) {
+					// Set temporary file
+					osChannelTmp, err := tools.CreateTemp("osChannel")
+					Expect(err).To(Not(HaveOccurred()))
+					defer os.Remove(osChannelTmp)
+
+					// Save original file as it can be modified multiple time
+					err = tools.CopyFile(osChannelYaml, osChannelTmp)
+					Expect(err).To(Not(HaveOccurred()))
+
+					// Set the OS channel to test
+					err = tools.Sed("%OS_CHANNEL%", osChannel, osChannelTmp)
+					Expect(err).To(Not(HaveOccurred()))
+
+					// Apply to k8s
+					err = kubectl.Apply(clusterNS, osChannelTmp)
+					Expect(err).To(Not(HaveOccurred()))
+
+					// Check that the OS channel to test has been added
+					const channel = "os-channel-to-test"
+					newChannel, err := kubectl.RunWithoutErr("get", "managedOSVersionChannel",
+						"--namespace", clusterNS, channel,
+						"-o", "jsonpath={.spec.options.image}")
+					Expect(err).To(Not(HaveOccurred()))
+					Expect(newChannel).To(Equal(osChannel))
+				}
+
+				// Clear OS_TO_TEST, as Staging and Dev channels manually added do not contain "unstable" tag
+				os2Test = ""
+			})
+		}
+
 		By("Adding SeedImage", func() {
 			var (
 				baseImageURL string

tests/e2e/suite_test.go

@@ -49,6 +49,7 @@ const (
 	localStorageYaml      = "../assets/local-storage.yaml"
 	metallbRscYaml        = "../assets/metallb_rsc.yaml"
 	numberOfNodesMax      = 30
+	osChannelYaml         = "../assets/osChannel.yaml"
 	resetMachineInv       = "../assets/reset_machine_inventory.yaml"
 	restoreYaml           = "../assets/restore.yaml"
 	sshConfigFile         = "../assets/ssh_config"
@@ -78,6 +79,7 @@ var (
 	operatorInstallType       string
 	operatorRepo              string
 	operatorUpgrade           string
+	osChannel                 string
 	os2Test                   string
 	poolType                  string
 	proxy                     string
@@ -772,6 +774,7 @@ var _ = BeforeSuite(func() {
 	operatorInstallType = os.Getenv("OPERATOR_INSTALL_TYPE")
 	operatorRepo = os.Getenv("OPERATOR_REPO")
 	operatorUpgrade = os.Getenv("OPERATOR_UPGRADE")
+	osChannel = os.Getenv("OS_CHANNEL")
 	os2Test = os.Getenv("OS_TO_TEST")
 	poolType = os.Getenv("POOL")
 	proxy = os.Getenv("PROXY")