Switch to release branch for prior installation

Installing last release from last release branch instead of main branch
openshift · Apr 8, 2024 · 47b1b5c · 47b1b5c
1 parent e7ded48
commit 47b1b5c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/.../config/medik8s/fence-agents-remediation/medik8s-fence-agents-remediation-main__4.16.yaml b/.../config/medik8s/fence-agents-remediation/medik8s-fence-agents-remediation-main__4.16.yaml
@@ -1,8 +1,4 @@
 base_images:
-  cli-operator-sdk:
-    name: cli-operator-sdk
-    namespace: ocp
-    tag: v1.30.0
   os:
     name: centos
     namespace: origin

diff --git a/...onfig/medik8s/node-maintenance-operator/medik8s-node-maintenance-operator-main__4.16.yaml b/...onfig/medik8s/node-maintenance-operator/medik8s-node-maintenance-operator-main__4.16.yaml
@@ -52,7 +52,10 @@ tests:
         oc label --overwrite ns "$INSTALL_NAMESPACE" security.openshift.io/scc.podSecurityLabelSync=false
         oc label --overwrite ns "$INSTALL_NAMESPACE" pod-security.kubernetes.io/enforce=privileged
 
-        OPERATOR_NAMESPACE="$INSTALL_NAMESPACE" VERSION=0.17.0 make bundle-run
+        # switch to the last release branch
+        git checkout release-0.17
+
+        OPERATOR_NAMESPACE="$INSTALL_NAMESPACE" PREVIOUS_VERSION=0.16.1 VERSION=0.17.0 make bundle-community bundle-run
       env:
       - name: INSTALL_NAMESPACE
       from: src
@@ -62,8 +65,12 @@ tests:
           memory: 200Mi
     - as: e2e-upgrade-operator
       cli: latest
-      commands: OPERATOR_NAMESPACE="$INSTALL_NAMESPACE" BUNDLE_IMG="$OO_BUNDLE" make
-        bundle-run-update
+      commands: |
+        # switch to the latest branch
+        git stash
+        git checkout main
+
+        OPERATOR_NAMESPACE="$INSTALL_NAMESPACE" PREVIOUS_VERSION=0.17.0 VERSION=0.18.0 BUNDLE_IMG="$OO_BUNDLE" make bundle-community bundle-run-update
       dependencies:
       - env: OO_BUNDLE
         name: my-bundle