E2E test: Add more BMO versions for upgrade tests

Signed-off-by: Huy Mai <huy.mai@est.tech>
metal3-io · Feb 5, 2024 · 4c94b2b · 4c94b2b
1 parent 53281e6
commit 4c94b2b
Show file tree

Hide file tree

Showing 12 changed files with 172 additions and 39 deletions.
diff --git a/config/overlays/e2e-release-0.3/ironic.env b/config/overlays/e2e-release-0.3/ironic.env
@@ -0,0 +1,10 @@
+HTTP_PORT=6180
+PROVISIONING_IP=192.168.222.199
+DEPLOY_KERNEL_URL=http://192.168.222.199:6180/images/ironic-python-agent.kernel
+DEPLOY_RAMDISK_URL=http://192.168.222.199:6180/images/ironic-python-agent.initramfs
+IRONIC_ENDPOINT=https://192.168.222.199:6385/v1/
+IRONIC_INSPECTOR_ENDPOINT=https://192.168.222.199:5050/v1/
+CACHEURL=http://192.168.222.199/images
+IRONIC_FAST_TRACK=true
+IRONIC_KERNEL_PARAMS=console=ttyS0
+IRONIC_INSPECTOR_VLAN_INTERFACES=all
diff --git a/config/overlays/e2e-release-0.3/kustomization.yaml b/config/overlays/e2e-release-0.3/kustomization.yaml
@@ -0,0 +1,38 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: baremetal-operator-system
+resources:
+- https://github.com/metal3-io/baremetal-operator/config/tls?ref=release-0.3
+components:
+- ../../components/basic-auth
+configMapGenerator:
+- name: ironic
+  behavior: merge
+  envs:
+  - ironic.env
+patches:
+- patch: |
+    # Don't try to pull again the pre-loaded image
+    - op: replace
+      path: /spec/template/spec/containers/0/imagePullPolicy
+      value: IfNotPresent
+  target:
+    kind: Deployment
+    name: controller-manager
+images:
+- name: quay.io/metal3-io/baremetal-operator
+  newTag: release-0.3
+# We cannot use suffix hashes since the kustomizations we build on
+# cannot be aware of what suffixes we add.
+generatorOptions:
+  disableNameSuffixHash: true
+# NOTE: These credentials are generated automatically in hack/ci-e2e.sh
+secretGenerator:
+- name: ironic-credentials
+  files:
+  - username=ironic-username
+  - password=ironic-password
+- name: ironic-inspector-credentials
+  files:
+  - username=ironic-inspector-username
+  - password=ironic-inspector-password
diff --git a/config/overlays/e2e-release-0.4/kustomization.yaml b/config/overlays/e2e-release-0.4/kustomization.yaml
@@ -2,17 +2,14 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: baremetal-operator-system
 resources:
-  - https://github.com/metal3-io/baremetal-operator/config/tls?ref=release-0.4
-
+- https://github.com/metal3-io/baremetal-operator/config/tls?ref=release-0.4
 components:
-  - ../../components/basic-auth
-
+- ../../components/basic-auth
 configMapGenerator:
 - name: ironic
   behavior: merge
   envs:
   - ironic.env
-
 patches:
 - patch: |
     # Don't try to pull again the pre-loaded image
@@ -22,24 +19,20 @@ patches:
   target:
     kind: Deployment
     name: controller-manager
-
 images:
 - name: quay.io/metal3-io/baremetal-operator
   newTag: release-0.4
-
 # We cannot use suffix hashes since the kustomizations we build on
 # cannot be aware of what suffixes we add.
 generatorOptions:
   disableNameSuffixHash: true
-
 # NOTE: These credentials are generated automatically in hack/ci-e2e.sh
 secretGenerator:
-  - name: ironic-credentials
-    files:
-    - username=ironic-username
-    - password=ironic-password
-  - name: ironic-inspector-credentials
-    files:
-    - username=ironic-inspector-username
-    - password=ironic-inspector-password
-
+- name: ironic-credentials
+  files:
+  - username=ironic-username
+  - password=ironic-password
+- name: ironic-inspector-credentials
+  files:
+  - username=ironic-inspector-username
+  - password=ironic-inspector-password
diff --git a/config/overlays/e2e-release-0.5/ironic.env b/config/overlays/e2e-release-0.5/ironic.env
@@ -0,0 +1,9 @@
+HTTP_PORT=6180
+PROVISIONING_IP=192.168.222.199
+DEPLOY_KERNEL_URL=http://192.168.222.199:6180/images/ironic-python-agent.kernel
+DEPLOY_RAMDISK_URL=http://192.168.222.199:6180/images/ironic-python-agent.initramfs
+IRONIC_ENDPOINT=https://192.168.222.199:6385/v1/
+CACHEURL=http://192.168.222.199/images
+IRONIC_FAST_TRACK=true
+IRONIC_KERNEL_PARAMS=console=ttyS0
+IRONIC_INSPECTOR_VLAN_INTERFACES=all
diff --git a/config/overlays/e2e-release-0.5/kustomization.yaml b/config/overlays/e2e-release-0.5/kustomization.yaml
@@ -0,0 +1,36 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: baremetal-operator-system
+resources:
+- https://github.com/metal3-io/baremetal-operator/config/overlays/basic-auth_tls?ref=release-0.5
+configMapGenerator:
+- name: ironic
+  behavior: create
+  envs:
+  - ironic.env
+patches:
+- patch: |
+    # Don't try to pull again the pre-loaded image
+    - op: replace
+      path: /spec/template/spec/containers/0/imagePullPolicy
+      value: IfNotPresent
+  target:
+    kind: Deployment
+    name: controller-manager
+images:
+- name: quay.io/metal3-io/baremetal-operator
+  newTag: release-0.5
+# We cannot use suffix hashes since the kustomizations we build on
+# cannot be aware of what suffixes we add.
+generatorOptions:
+  disableNameSuffixHash: true
+# NOTE: These credentials are generated automatically in hack/ci-e2e.sh
+secretGenerator:
+- name: ironic-credentials
+  files:
+  - username=ironic-username
+  - password=ironic-password
+- name: ironic-inspector-credentials
+  files:
+  - username=ironic-inspector-username
+  - password=ironic-inspector-password
diff --git a/config/overlays/fixture-release-0.3/kustomization.yaml b/config/overlays/fixture-release-0.3/kustomization.yaml
@@ -0,0 +1,21 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+- https://github.com/metal3-io/baremetal-operator/config/namespace?ref=release-0.3
+- https://github.com/metal3-io/baremetal-operator/config/default?ref=release-0.3
+patches:
+- patch: |
+    # Enable test mode (fixture provider instead of ironic)
+    - op: add
+      path: /spec/template/spec/containers/0/args/-
+      value: --test-mode
+    # Don't try to pull again the pre-loaded image
+    - op: replace
+      path: /spec/template/spec/containers/0/imagePullPolicy
+      value: IfNotPresent
+  target:
+    kind: Deployment
+    name: controller-manager
+images:
+- name: quay.io/metal3-io/baremetal-operator
+  newTag: release-0.3
diff --git a/config/overlays/fixture-release-0.4/kustomization.yaml b/config/overlays/fixture-release-0.4/kustomization.yaml
@@ -1,10 +1,8 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-
 resources:
 - https://github.com/metal3-io/baremetal-operator/config/namespace?ref=release-0.4
 - https://github.com/metal3-io/baremetal-operator/config/default?ref=release-0.4
-
 patches:
 - patch: |
     # Enable test mode (fixture provider instead of ironic)
@@ -18,7 +16,6 @@ patches:
   target:
     kind: Deployment
     name: controller-manager
-
 images:
 - name: quay.io/metal3-io/baremetal-operator
   newTag: release-0.4
diff --git a/config/overlays/fixture-release-0.5/kustomization.yaml b/config/overlays/fixture-release-0.5/kustomization.yaml
@@ -0,0 +1,21 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+- https://github.com/metal3-io/baremetal-operator/config/namespace?ref=release-0.5
+- https://github.com/metal3-io/baremetal-operator/config/default?ref=release-0.5
+patches:
+- patch: |
+    # Enable test mode (fixture provider instead of ironic)
+    - op: add
+      path: /spec/template/spec/containers/0/args/-
+      value: --test-mode
+    # Don't try to pull again the pre-loaded image
+    - op: replace
+      path: /spec/template/spec/containers/0/imagePullPolicy
+      value: IfNotPresent
+  target:
+    kind: Deployment
+    name: controller-manager
+images:
+- name: quay.io/metal3-io/baremetal-operator
+  newTag: release-0.5
diff --git a/hack/ci-e2e.sh b/hack/ci-e2e.sh
@@ -113,24 +113,20 @@ docker run --name image-server-e2e -d \
 ssh-keygen -t ed25519 -f "${IMAGE_DIR}/ssh_testkey" -q -N ""
 
 # Generate credentials
-BMO_OVERLAY="${REPO_ROOT}/config/overlays/e2e"
+BMO_OVERLAYS=("${REPO_ROOT}/config/overlays/e2e" "${REPO_ROOT}/config/overlays/e2e-release-0.4" "${REPO_ROOT}/config/overlays/e2e-release-0.5")
 IRONIC_OVERLAY="${REPO_ROOT}/ironic-deployment/overlays/e2e"
 
 IRONIC_USERNAME="$(tr -dc 'a-zA-Z0-9' < /dev/urandom | fold -w 12 | head -n 1)"
 IRONIC_PASSWORD="$(tr -dc 'a-zA-Z0-9' < /dev/urandom | fold -w 12 | head -n 1)"
 IRONIC_INSPECTOR_USERNAME="$(tr -dc 'a-zA-Z0-9' < /dev/urandom | fold -w 12 | head -n 1)"
 IRONIC_INSPECTOR_PASSWORD="$(tr -dc 'a-zA-Z0-9' < /dev/urandom | fold -w 12 | head -n 1)"
 
-echo "${IRONIC_USERNAME}" > "${BMO_OVERLAY}/ironic-username"
-echo "${IRONIC_PASSWORD}" > "${BMO_OVERLAY}/ironic-password"
-echo "${IRONIC_INSPECTOR_USERNAME}" > "${BMO_OVERLAY}/ironic-inspector-username"
-echo "${IRONIC_INSPECTOR_PASSWORD}" > "${BMO_OVERLAY}/ironic-inspector-password"
-
-BMO_UPGRADE_FROM_OVERLAY="${REPO_ROOT}/config/overlays/e2e-release-0.4"
-echo "${IRONIC_USERNAME}" > "${BMO_UPGRADE_FROM_OVERLAY}/ironic-username"
-echo "${IRONIC_PASSWORD}" > "${BMO_UPGRADE_FROM_OVERLAY}/ironic-password"
-echo "${IRONIC_INSPECTOR_USERNAME}" > "${BMO_UPGRADE_FROM_OVERLAY}/ironic-inspector-username"
-echo "${IRONIC_INSPECTOR_PASSWORD}" > "${BMO_UPGRADE_FROM_OVERLAY}/ironic-inspector-password"
+for overlay in "${BMO_OVERLAYS[@]}"; do
+  echo "${IRONIC_USERNAME}" > "${overlay}/ironic-username"
+  echo "${IRONIC_PASSWORD}" > "${overlay}/ironic-password"
+  echo "${IRONIC_INSPECTOR_USERNAME}" > "${overlay}/ironic-inspector-username"
+  echo "${IRONIC_INSPECTOR_PASSWORD}" > "${overlay}/ironic-inspector-password"
+done
 
 envsubst < "${REPO_ROOT}/ironic-deployment/components/basic-auth/ironic-auth-config-tpl" > \
   "${IRONIC_OVERLAY}/ironic-auth-config"

diff --git a/test/e2e/config/fixture.yaml b/test/e2e/config/fixture.yaml
@@ -23,7 +23,7 @@ variables:
   UPGRADE_DEPLOY_IRONIC: "false"
   UPGRADE_DEPLOY_BMO: "true"
   UPGRADE_DEPLOY_CERT_MANAGER: "true"
-  UPGRADE_BMO_KUSTOMIZATION_FROM: "../../config/overlays/fixture-release-0.4"
+  UPGRADE_BMO_KUSTOMIZATION_FROM: "../../config/overlays/fixture-release-0.5"
 
   IMAGE_URL: "http://192.168.222.1/cirros-0.6.2-x86_64-disk.img"
   IMAGE_CHECKSUM: "c8fc807773e5354afe61636071771906"

diff --git a/test/e2e/config/ironic.yaml b/test/e2e/config/ironic.yaml
@@ -27,7 +27,7 @@ variables:
   UPGRADE_DEPLOY_IRONIC: "true"
   UPGRADE_DEPLOY_BMO: "true"
   UPGRADE_DEPLOY_CERT_MANAGER: "true"
-  UPGRADE_BMO_KUSTOMIZATION_FROM: "../../config/overlays/e2e-release-0.4"
+  UPGRADE_BMO_KUSTOMIZATION_FROM: "../../config/overlays/e2e-release-0.5"
 
   IMAGE_URL: "http://192.168.222.1/cirros-0.6.2-x86_64-disk.img"
   IMAGE_CHECKSUM: "c8fc807773e5354afe61636071771906"

diff --git a/test/e2e/upgrade_test.go b/test/e2e/upgrade_test.go
@@ -233,15 +233,17 @@ var _ = Describe("BMO Upgrade", func() {
 		}
 
 		if e2eConfig.GetVariable("UPGRADE_DEPLOY_BMO") != "false" {
-			By("Installing BMO on the upgrade cluster")
+			bmoKustomization := e2eConfig.GetVariable("UPGRADE_BMO_KUSTOMIZATION_FROM")
+			bmoKustomizationName := filepath.Base(bmoKustomization)
+			By(fmt.Sprintf("Installing BMO from %s on the upgrade cluster", bmoKustomization))
 			err := BuildAndApplyKustomize(ctx, &BuildAndApplyKustomizeInput{
-				Kustomization:       e2eConfig.GetVariable("UPGRADE_BMO_KUSTOMIZATION_FROM"),
+				Kustomization:       bmoKustomization,
 				ClusterProxy:        upgradeClusterProxy,
 				WaitForDeployment:   true,
 				WatchDeploymentLogs: true,
 				DeploymentName:      "baremetal-operator-controller-manager",
 				DeploymentNamespace: bmoIronicNamespace,
-				LogPath:             filepath.Join(artifactFolder, "logs", fmt.Sprintf("%s-%s", bmoIronicNamespace, specName)),
+				LogPath:             filepath.Join(artifactFolder, "logs", fmt.Sprintf("%s-%s", bmoIronicNamespace, specName), fmt.Sprintf("bmo-%s", bmoKustomizationName)),
 				WaitIntervals:       e2eConfig.GetIntervals("default", "wait-deployment"),
 			})
 			Expect(err).NotTo(HaveOccurred())
@@ -269,7 +271,9 @@ var _ = Describe("BMO Upgrade", func() {
 				Name:      specName,
 				Namespace: namespace.Name,
 				Annotations: map[string]string{
-					metal3api.InspectAnnotationPrefix:   "disabled",
+					metal3api.InspectAnnotationPrefix: "disabled",
+					// hardwareDetails of release0.4 is compatible to release0.3 and release0.5 as well
+					// This can be changed to the new hardwareDetails once we no longer test release0.4
 					metal3api.HardwareDetailsAnnotation: hardwareDetailsRelease04,
 				},
 			},
@@ -298,9 +302,17 @@ var _ = Describe("BMO Upgrade", func() {
 		bmoDeployName := "baremetal-operator-controller-manager"
 		deploy, err := clientSet.AppsV1().Deployments(bmoIronicNamespace).Get(ctx, bmoDeployName, metav1.GetOptions{})
 		Expect(err).NotTo(HaveOccurred())
+		bmoKustomization := e2eConfig.GetVariable("BMO_KUSTOMIZATION")
+		bmoKustomizationName := filepath.Base(bmoKustomization)
 		err = BuildAndApplyKustomize(ctx, &BuildAndApplyKustomizeInput{
-			Kustomization: e2eConfig.GetVariable("BMO_KUSTOMIZATION"),
-			ClusterProxy:  upgradeClusterProxy,
+			Kustomization:       bmoKustomization,
+			ClusterProxy:        upgradeClusterProxy,
+			WaitForDeployment:   false,
+			WatchDeploymentLogs: true,
+			DeploymentName:      "baremetal-operator-controller-manager",
+			DeploymentNamespace: bmoIronicNamespace,
+			LogPath:             filepath.Join(artifactFolder, "logs", fmt.Sprintf("%s-%s", bmoIronicNamespace, specName), fmt.Sprintf("bmo-%s", bmoKustomizationName)),
+			WaitIntervals:       e2eConfig.GetIntervals("default", "wait-deployment"),
 		})
 		Expect(err).NotTo(HaveOccurred())
 		By("Waiting for BMO update to rollout")