From b2c469bb4b34583ca2ccb59e7777c2fdf10be2db Mon Sep 17 00:00:00 2001 From: oraz Date: Tue, 30 Apr 2024 15:41:14 +0300 Subject: [PATCH 1/3] Include NMO upgrade installation test in OCP-e2e cluster test for OCP 4.12-4.15 Make the OCP-e2e cluster test a three-step test- installing the old version, updating to the latest, and testing the E2E test --- ...-node-maintenance-operator-main__4.12.yaml | 46 +++++++++++++++---- ...-node-maintenance-operator-main__4.13.yaml | 46 +++++++++++++++---- ...-node-maintenance-operator-main__4.14.yaml | 46 +++++++++++++++---- ...-node-maintenance-operator-main__4.15.yaml | 46 +++++++++++++++---- 4 files changed, 144 insertions(+), 40 deletions(-) diff --git a/ci-operator/config/medik8s/node-maintenance-operator/medik8s-node-maintenance-operator-main__4.12.yaml b/ci-operator/config/medik8s/node-maintenance-operator/medik8s-node-maintenance-operator-main__4.12.yaml index 33aa1181c521..82484322b163 100644 --- a/ci-operator/config/medik8s/node-maintenance-operator/medik8s-node-maintenance-operator-main__4.12.yaml +++ b/ci-operator/config/medik8s/node-maintenance-operator/medik8s-node-maintenance-operator-main__4.12.yaml @@ -3,10 +3,6 @@ base_images: name: "4.12" namespace: ocp tag: base - cli-operator-sdk: - name: cli-operator-sdk - namespace: ocp - tag: v1.30.0 binary_build_commands: make build build_root: from_repository: true @@ -43,22 +39,52 @@ tests: skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: medik8s-aws - dependencies: - OO_BUNDLE: my-bundle env: BASE_DOMAIN: medik8s-ci.projects.ecosystem.sysdeseng.com - OO_INSTALL_NAMESPACE: nmo-install + OPERATOR_NAMESPACE: nmo-install test: + - as: e2e-install-operator-last-version + cli: latest + commands: | + oc create namespace "$OPERATOR_NAMESPACE" + + # workaround for OLM pod not running with restricted PSA + oc label --overwrite ns "$OPERATOR_NAMESPACE" security.openshift.io/scc.podSecurityLabelSync=false + oc label --overwrite ns "$OPERATOR_NAMESPACE" pod-security.kubernetes.io/enforce=privileged + + # OPERATOR_NAMESPACE variable is used by bundle-run and bundle-run-update + BUNDLE_IMG=quay.io/medik8s/node-maintenance-operator-bundle:v0.17.0 make bundle-run + env: + - name: OPERATOR_NAMESPACE + from: src + resources: + requests: + cpu: 100m + memory: 200Mi + - as: e2e-upgrade-operator-latest + cli: latest + commands: BUNDLE_IMG="$OO_BUNDLE" make bundle-run-update + dependencies: + - env: OO_BUNDLE + name: my-bundle + env: + - name: OPERATOR_NAMESPACE + from: src + resources: + requests: + cpu: 100m + memory: 200Mi - as: e2e-test - commands: export OPERATOR_NS="$OO_INSTALL_NAMESPACE" && make cluster-functest + cli: latest + commands: export OPERATOR_NS="$OPERATOR_NAMESPACE" && make cluster-functest env: - - name: OO_INSTALL_NAMESPACE + - name: OPERATOR_NAMESPACE from: src resources: requests: cpu: 100m memory: 200Mi - workflow: optional-operators-ci-operator-sdk-aws + workflow: ipi-aws zz_generated_metadata: branch: main org: medik8s diff --git a/ci-operator/config/medik8s/node-maintenance-operator/medik8s-node-maintenance-operator-main__4.13.yaml b/ci-operator/config/medik8s/node-maintenance-operator/medik8s-node-maintenance-operator-main__4.13.yaml index 7af5fcabd50a..68cbf756bf87 100644 --- a/ci-operator/config/medik8s/node-maintenance-operator/medik8s-node-maintenance-operator-main__4.13.yaml +++ b/ci-operator/config/medik8s/node-maintenance-operator/medik8s-node-maintenance-operator-main__4.13.yaml @@ -3,10 +3,6 @@ base_images: name: "4.13" namespace: ocp tag: base - cli-operator-sdk: - name: cli-operator-sdk - namespace: ocp - tag: v1.30.0 binary_build_commands: make build build_root: from_repository: true @@ -43,22 +39,52 @@ tests: skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: medik8s-aws - dependencies: - OO_BUNDLE: my-bundle env: BASE_DOMAIN: medik8s-ci.projects.ecosystem.sysdeseng.com - OO_INSTALL_NAMESPACE: nmo-install + OPERATOR_NAMESPACE: nmo-install test: + - as: e2e-install-operator-last-version + cli: latest + commands: | + oc create namespace "$OPERATOR_NAMESPACE" + + # workaround for OLM pod not running with restricted PSA + oc label --overwrite ns "$OPERATOR_NAMESPACE" security.openshift.io/scc.podSecurityLabelSync=false + oc label --overwrite ns "$OPERATOR_NAMESPACE" pod-security.kubernetes.io/enforce=privileged + + # OPERATOR_NAMESPACE variable is used by bundle-run and bundle-run-update + BUNDLE_IMG=quay.io/medik8s/node-maintenance-operator-bundle:v0.17.0 make bundle-run + env: + - name: OPERATOR_NAMESPACE + from: src + resources: + requests: + cpu: 100m + memory: 200Mi + - as: e2e-upgrade-operator-latest + cli: latest + commands: BUNDLE_IMG="$OO_BUNDLE" make bundle-run-update + dependencies: + - env: OO_BUNDLE + name: my-bundle + env: + - name: OPERATOR_NAMESPACE + from: src + resources: + requests: + cpu: 100m + memory: 200Mi - as: e2e-test - commands: export OPERATOR_NS="$OO_INSTALL_NAMESPACE" && make cluster-functest + cli: latest + commands: export OPERATOR_NS="$OPERATOR_NAMESPACE" && make cluster-functest env: - - name: OO_INSTALL_NAMESPACE + - name: OPERATOR_NAMESPACE from: src resources: requests: cpu: 100m memory: 200Mi - workflow: optional-operators-ci-operator-sdk-aws + workflow: ipi-aws zz_generated_metadata: branch: main org: medik8s diff --git a/ci-operator/config/medik8s/node-maintenance-operator/medik8s-node-maintenance-operator-main__4.14.yaml b/ci-operator/config/medik8s/node-maintenance-operator/medik8s-node-maintenance-operator-main__4.14.yaml index 311231dc6184..117e949a789b 100644 --- a/ci-operator/config/medik8s/node-maintenance-operator/medik8s-node-maintenance-operator-main__4.14.yaml +++ b/ci-operator/config/medik8s/node-maintenance-operator/medik8s-node-maintenance-operator-main__4.14.yaml @@ -3,10 +3,6 @@ base_images: name: "4.14" namespace: ocp tag: base - cli-operator-sdk: - name: cli-operator-sdk - namespace: ocp - tag: v1.30.0 binary_build_commands: make build build_root: from_repository: true @@ -43,22 +39,52 @@ tests: skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: medik8s-aws - dependencies: - OO_BUNDLE: my-bundle env: BASE_DOMAIN: medik8s-ci.projects.ecosystem.sysdeseng.com - OO_INSTALL_NAMESPACE: nmo-install + OPERATOR_NAMESPACE: nmo-install test: + - as: e2e-install-operator-last-version + cli: latest + commands: | + oc create namespace "$OPERATOR_NAMESPACE" + + # workaround for OLM pod not running with restricted PSA + oc label --overwrite ns "$OPERATOR_NAMESPACE" security.openshift.io/scc.podSecurityLabelSync=false + oc label --overwrite ns "$OPERATOR_NAMESPACE" pod-security.kubernetes.io/enforce=privileged + + # OPERATOR_NAMESPACE variable is used by bundle-run and bundle-run-update + BUNDLE_IMG=quay.io/medik8s/node-maintenance-operator-bundle:v0.17.0 make bundle-run + env: + - name: OPERATOR_NAMESPACE + from: src + resources: + requests: + cpu: 100m + memory: 200Mi + - as: e2e-upgrade-operator-latest + cli: latest + commands: BUNDLE_IMG="$OO_BUNDLE" make bundle-run-update + dependencies: + - env: OO_BUNDLE + name: my-bundle + env: + - name: OPERATOR_NAMESPACE + from: src + resources: + requests: + cpu: 100m + memory: 200Mi - as: e2e-test - commands: export OPERATOR_NS="$OO_INSTALL_NAMESPACE" && make cluster-functest + cli: latest + commands: export OPERATOR_NS="$OPERATOR_NAMESPACE" && make cluster-functest env: - - name: OO_INSTALL_NAMESPACE + - name: OPERATOR_NAMESPACE from: src resources: requests: cpu: 100m memory: 200Mi - workflow: optional-operators-ci-operator-sdk-aws + workflow: ipi-aws zz_generated_metadata: branch: main org: medik8s diff --git a/ci-operator/config/medik8s/node-maintenance-operator/medik8s-node-maintenance-operator-main__4.15.yaml b/ci-operator/config/medik8s/node-maintenance-operator/medik8s-node-maintenance-operator-main__4.15.yaml index addc048773ef..8a2c9bf565d2 100644 --- a/ci-operator/config/medik8s/node-maintenance-operator/medik8s-node-maintenance-operator-main__4.15.yaml +++ b/ci-operator/config/medik8s/node-maintenance-operator/medik8s-node-maintenance-operator-main__4.15.yaml @@ -3,10 +3,6 @@ base_images: name: "4.15" namespace: ocp tag: base - cli-operator-sdk: - name: cli-operator-sdk - namespace: ocp - tag: v1.30.0 binary_build_commands: make build build_root: from_repository: true @@ -43,22 +39,52 @@ tests: skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: medik8s-aws - dependencies: - OO_BUNDLE: my-bundle env: BASE_DOMAIN: medik8s-ci.projects.ecosystem.sysdeseng.com - OO_INSTALL_NAMESPACE: nmo-install + OPERATOR_NAMESPACE: nmo-install test: + - as: e2e-install-operator-last-version + cli: latest + commands: | + oc create namespace "$OPERATOR_NAMESPACE" + + # workaround for OLM pod not running with restricted PSA + oc label --overwrite ns "$OPERATOR_NAMESPACE" security.openshift.io/scc.podSecurityLabelSync=false + oc label --overwrite ns "$OPERATOR_NAMESPACE" pod-security.kubernetes.io/enforce=privileged + + # OPERATOR_NAMESPACE variable is used by bundle-run and bundle-run-update + BUNDLE_IMG=quay.io/medik8s/node-maintenance-operator-bundle:v0.17.0 make bundle-run + env: + - name: OPERATOR_NAMESPACE + from: src + resources: + requests: + cpu: 100m + memory: 200Mi + - as: e2e-upgrade-operator-latest + cli: latest + commands: BUNDLE_IMG="$OO_BUNDLE" make bundle-run-update + dependencies: + - env: OO_BUNDLE + name: my-bundle + env: + - name: OPERATOR_NAMESPACE + from: src + resources: + requests: + cpu: 100m + memory: 200Mi - as: e2e-test - commands: export OPERATOR_NS="$OO_INSTALL_NAMESPACE" && make cluster-functest + cli: latest + commands: export OPERATOR_NS="$OPERATOR_NAMESPACE" && make cluster-functest env: - - name: OO_INSTALL_NAMESPACE + - name: OPERATOR_NAMESPACE from: src resources: requests: cpu: 100m memory: 200Mi - workflow: optional-operators-ci-operator-sdk-aws + workflow: ipi-aws zz_generated_metadata: branch: main org: medik8s From 726bfb606fdf41c495a2a6778aed1c55f01fcc24 Mon Sep 17 00:00:00 2001 From: oraz Date: Tue, 30 Apr 2024 15:41:38 +0300 Subject: [PATCH 2/3] Include FAR upgrade installation test in OCP-e2e cluster test Make the OCP-e2e cluster test a three-step test- installing the old version, updating to the latest, and testing the E2E test --- ...s-fence-agents-remediation-main__4.12.yaml | 47 ++++++++++++++----- ...s-fence-agents-remediation-main__4.13.yaml | 45 ++++++++++++++---- ...s-fence-agents-remediation-main__4.14.yaml | 45 ++++++++++++++---- ...s-fence-agents-remediation-main__4.15.yaml | 45 ++++++++++++++---- ...s-fence-agents-remediation-main__4.16.yaml | 45 ++++++++++++++---- 5 files changed, 176 insertions(+), 51 deletions(-) diff --git a/ci-operator/config/medik8s/fence-agents-remediation/medik8s-fence-agents-remediation-main__4.12.yaml b/ci-operator/config/medik8s/fence-agents-remediation/medik8s-fence-agents-remediation-main__4.12.yaml index 037ca6e0ff8a..21d40bf17f37 100644 --- a/ci-operator/config/medik8s/fence-agents-remediation/medik8s-fence-agents-remediation-main__4.12.yaml +++ b/ci-operator/config/medik8s/fence-agents-remediation/medik8s-fence-agents-remediation-main__4.12.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 @@ -43,24 +39,53 @@ tests: skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: medik8s-aws - dependencies: - OO_BUNDLE: my-bundle env: BASE_DOMAIN: medik8s-ci.projects.ecosystem.sysdeseng.com - OO_INSTALL_NAMESPACE: far-install + OPERATOR_NAMESPACE: far-install test: + - as: e2e-install-operator-last-version + cli: latest + commands: | + make create-ns + + # workaround for OLM pod not running with restricted PSA + oc label --overwrite ns "$OPERATOR_NAMESPACE" security.openshift.io/scc.podSecurityLabelSync=false + oc label --overwrite ns "$OPERATOR_NAMESPACE" pod-security.kubernetes.io/enforce=privileged + + # OPERATOR_NAMESPACE variable is used by bundle-run and bundle-run-update + BUNDLE_IMG=quay.io/medik8s/fence-agents-remediation-operator-bundle:v0.3.0 make bundle-run + env: + - name: OPERATOR_NAMESPACE + from: src + resources: + requests: + cpu: 100m + memory: 200Mi + - as: e2e-upgrade-operator-latest + cli: latest + commands: BUNDLE_IMG="$OO_BUNDLE" make bundle-run-update + dependencies: + - env: OO_BUNDLE + name: my-bundle + env: + - name: OPERATOR_NAMESPACE + from: src + resources: + requests: + cpu: 100m + memory: 200Mi - as: e2e-test cli: latest - commands: export OPERATOR_NS="$OO_INSTALL_NAMESPACE" SKIP_OOST_REMEDIATION_VERIFICATION="true" - && make ocp-aws-credentials test-e2e + commands: export OPERATOR_NS="$OPERATOR_NAMESPACE" && make ocp-aws-credentials + test-e2e env: - - name: OO_INSTALL_NAMESPACE + - name: OPERATOR_NAMESPACE from: src resources: requests: cpu: 100m memory: 200Mi - workflow: optional-operators-ci-operator-sdk-aws + workflow: ipi-aws zz_generated_metadata: branch: main org: medik8s diff --git a/ci-operator/config/medik8s/fence-agents-remediation/medik8s-fence-agents-remediation-main__4.13.yaml b/ci-operator/config/medik8s/fence-agents-remediation/medik8s-fence-agents-remediation-main__4.13.yaml index 406d6a5a80ea..0233fd511355 100644 --- a/ci-operator/config/medik8s/fence-agents-remediation/medik8s-fence-agents-remediation-main__4.13.yaml +++ b/ci-operator/config/medik8s/fence-agents-remediation/medik8s-fence-agents-remediation-main__4.13.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 @@ -43,24 +39,53 @@ tests: skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: medik8s-aws - dependencies: - OO_BUNDLE: my-bundle env: BASE_DOMAIN: medik8s-ci.projects.ecosystem.sysdeseng.com - OO_INSTALL_NAMESPACE: far-install + OPERATOR_NAMESPACE: far-install test: + - as: e2e-install-operator-last-version + cli: latest + commands: | + make create-ns + + # workaround for OLM pod not running with restricted PSA + oc label --overwrite ns "$OPERATOR_NAMESPACE" security.openshift.io/scc.podSecurityLabelSync=false + oc label --overwrite ns "$OPERATOR_NAMESPACE" pod-security.kubernetes.io/enforce=privileged + + # OPERATOR_NAMESPACE variable is used by bundle-run and bundle-run-update + BUNDLE_IMG=quay.io/medik8s/fence-agents-remediation-operator-bundle:v0.3.0 make bundle-run + env: + - name: OPERATOR_NAMESPACE + from: src + resources: + requests: + cpu: 100m + memory: 200Mi + - as: e2e-upgrade-operator-latest + cli: latest + commands: BUNDLE_IMG="$OO_BUNDLE" make bundle-run-update + dependencies: + - env: OO_BUNDLE + name: my-bundle + env: + - name: OPERATOR_NAMESPACE + from: src + resources: + requests: + cpu: 100m + memory: 200Mi - as: e2e-test cli: latest - commands: export OPERATOR_NS="$OO_INSTALL_NAMESPACE" && make ocp-aws-credentials + commands: export OPERATOR_NS="$OPERATOR_NAMESPACE" && make ocp-aws-credentials test-e2e env: - - name: OO_INSTALL_NAMESPACE + - name: OPERATOR_NAMESPACE from: src resources: requests: cpu: 100m memory: 200Mi - workflow: optional-operators-ci-operator-sdk-aws + workflow: ipi-aws zz_generated_metadata: branch: main org: medik8s diff --git a/ci-operator/config/medik8s/fence-agents-remediation/medik8s-fence-agents-remediation-main__4.14.yaml b/ci-operator/config/medik8s/fence-agents-remediation/medik8s-fence-agents-remediation-main__4.14.yaml index f4361c0ab070..95af78312cf7 100644 --- a/ci-operator/config/medik8s/fence-agents-remediation/medik8s-fence-agents-remediation-main__4.14.yaml +++ b/ci-operator/config/medik8s/fence-agents-remediation/medik8s-fence-agents-remediation-main__4.14.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 @@ -43,24 +39,53 @@ tests: skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: medik8s-aws - dependencies: - OO_BUNDLE: my-bundle env: BASE_DOMAIN: medik8s-ci.projects.ecosystem.sysdeseng.com - OO_INSTALL_NAMESPACE: far-install + OPERATOR_NAMESPACE: far-install test: + - as: e2e-install-operator-last-version + cli: latest + commands: | + make create-ns + + # workaround for OLM pod not running with restricted PSA + oc label --overwrite ns "$OPERATOR_NAMESPACE" security.openshift.io/scc.podSecurityLabelSync=false + oc label --overwrite ns "$OPERATOR_NAMESPACE" pod-security.kubernetes.io/enforce=privileged + + # OPERATOR_NAMESPACE variable is used by bundle-run and bundle-run-update + BUNDLE_IMG=quay.io/medik8s/fence-agents-remediation-operator-bundle:v0.3.0 make bundle-run + env: + - name: OPERATOR_NAMESPACE + from: src + resources: + requests: + cpu: 100m + memory: 200Mi + - as: e2e-upgrade-operator-latest + cli: latest + commands: BUNDLE_IMG="$OO_BUNDLE" make bundle-run-update + dependencies: + - env: OO_BUNDLE + name: my-bundle + env: + - name: OPERATOR_NAMESPACE + from: src + resources: + requests: + cpu: 100m + memory: 200Mi - as: e2e-test cli: latest - commands: export OPERATOR_NS="$OO_INSTALL_NAMESPACE" && make ocp-aws-credentials + commands: export OPERATOR_NS="$OPERATOR_NAMESPACE" && make ocp-aws-credentials test-e2e env: - - name: OO_INSTALL_NAMESPACE + - name: OPERATOR_NAMESPACE from: src resources: requests: cpu: 100m memory: 200Mi - workflow: optional-operators-ci-operator-sdk-aws + workflow: ipi-aws zz_generated_metadata: branch: main org: medik8s diff --git a/ci-operator/config/medik8s/fence-agents-remediation/medik8s-fence-agents-remediation-main__4.15.yaml b/ci-operator/config/medik8s/fence-agents-remediation/medik8s-fence-agents-remediation-main__4.15.yaml index 5b867a460190..d9fadb8f42c5 100644 --- a/ci-operator/config/medik8s/fence-agents-remediation/medik8s-fence-agents-remediation-main__4.15.yaml +++ b/ci-operator/config/medik8s/fence-agents-remediation/medik8s-fence-agents-remediation-main__4.15.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 @@ -43,24 +39,53 @@ tests: skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: medik8s-aws - dependencies: - OO_BUNDLE: my-bundle env: BASE_DOMAIN: medik8s-ci.projects.ecosystem.sysdeseng.com - OO_INSTALL_NAMESPACE: far-install + OPERATOR_NAMESPACE: far-install test: + - as: e2e-install-operator-last-version + cli: latest + commands: | + make create-ns + + # workaround for OLM pod not running with restricted PSA + oc label --overwrite ns "$OPERATOR_NAMESPACE" security.openshift.io/scc.podSecurityLabelSync=false + oc label --overwrite ns "$OPERATOR_NAMESPACE" pod-security.kubernetes.io/enforce=privileged + + # OPERATOR_NAMESPACE variable is used by bundle-run and bundle-run-update + BUNDLE_IMG=quay.io/medik8s/fence-agents-remediation-operator-bundle:v0.3.0 make bundle-run + env: + - name: OPERATOR_NAMESPACE + from: src + resources: + requests: + cpu: 100m + memory: 200Mi + - as: e2e-upgrade-operator-latest + cli: latest + commands: BUNDLE_IMG="$OO_BUNDLE" make bundle-run-update + dependencies: + - env: OO_BUNDLE + name: my-bundle + env: + - name: OPERATOR_NAMESPACE + from: src + resources: + requests: + cpu: 100m + memory: 200Mi - as: e2e-test cli: latest - commands: export OPERATOR_NS="$OO_INSTALL_NAMESPACE" && make ocp-aws-credentials + commands: export OPERATOR_NS="$OPERATOR_NAMESPACE" && make ocp-aws-credentials test-e2e env: - - name: OO_INSTALL_NAMESPACE + - name: OPERATOR_NAMESPACE from: src resources: requests: cpu: 100m memory: 200Mi - workflow: optional-operators-ci-operator-sdk-aws + workflow: ipi-aws zz_generated_metadata: branch: main org: medik8s diff --git a/ci-operator/config/medik8s/fence-agents-remediation/medik8s-fence-agents-remediation-main__4.16.yaml b/ci-operator/config/medik8s/fence-agents-remediation/medik8s-fence-agents-remediation-main__4.16.yaml index 24a8b60a96af..35d44bd32b99 100644 --- a/ci-operator/config/medik8s/fence-agents-remediation/medik8s-fence-agents-remediation-main__4.16.yaml +++ b/ci-operator/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 @@ -43,24 +39,53 @@ tests: skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: medik8s-aws - dependencies: - OO_BUNDLE: my-bundle env: BASE_DOMAIN: medik8s-ci.projects.ecosystem.sysdeseng.com - OO_INSTALL_NAMESPACE: far-install + OPERATOR_NAMESPACE: far-install test: + - as: e2e-install-operator-last-version + cli: latest + commands: | + make create-ns + + # workaround for OLM pod not running with restricted PSA + oc label --overwrite ns "$OPERATOR_NAMESPACE" security.openshift.io/scc.podSecurityLabelSync=false + oc label --overwrite ns "$OPERATOR_NAMESPACE" pod-security.kubernetes.io/enforce=privileged + + # OPERATOR_NAMESPACE variable is used by bundle-run and bundle-run-update + BUNDLE_IMG=quay.io/medik8s/fence-agents-remediation-operator-bundle:v0.3.0 make bundle-run + env: + - name: OPERATOR_NAMESPACE + from: src + resources: + requests: + cpu: 100m + memory: 200Mi + - as: e2e-upgrade-operator-latest + cli: latest + commands: BUNDLE_IMG="$OO_BUNDLE" make bundle-run-update + dependencies: + - env: OO_BUNDLE + name: my-bundle + env: + - name: OPERATOR_NAMESPACE + from: src + resources: + requests: + cpu: 100m + memory: 200Mi - as: e2e-test cli: latest - commands: export OPERATOR_NS="$OO_INSTALL_NAMESPACE" && make ocp-aws-credentials + commands: export OPERATOR_NS="$OPERATOR_NAMESPACE" && make ocp-aws-credentials test-e2e env: - - name: OO_INSTALL_NAMESPACE + - name: OPERATOR_NAMESPACE from: src resources: requests: cpu: 100m memory: 200Mi - workflow: optional-operators-ci-operator-sdk-aws + workflow: ipi-aws zz_generated_metadata: branch: main org: medik8s From f41fed43f14f8ca4158bee39c7f54159af94e573 Mon Sep 17 00:00:00 2001 From: oraz Date: Wed, 1 May 2024 08:52:40 +0300 Subject: [PATCH 3/3] Skip out-of-service test on OCP 4.12 and FAR E2E test of FAR 4.12 was expecting to run the out-of-service tests but it isn't supported on OCP 4.12 --- .../medik8s-fence-agents-remediation-main__4.12.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci-operator/config/medik8s/fence-agents-remediation/medik8s-fence-agents-remediation-main__4.12.yaml b/ci-operator/config/medik8s/fence-agents-remediation/medik8s-fence-agents-remediation-main__4.12.yaml index 21d40bf17f37..d2ac3d99da21 100644 --- a/ci-operator/config/medik8s/fence-agents-remediation/medik8s-fence-agents-remediation-main__4.12.yaml +++ b/ci-operator/config/medik8s/fence-agents-remediation/medik8s-fence-agents-remediation-main__4.12.yaml @@ -76,8 +76,8 @@ tests: memory: 200Mi - as: e2e-test cli: latest - commands: export OPERATOR_NS="$OPERATOR_NAMESPACE" && make ocp-aws-credentials - test-e2e + commands: export OPERATOR_NS="$OPERATOR_NAMESPACE" SKIP_OOST_REMEDIATION_VERIFICATION="true" + && make ocp-aws-credentials test-e2e env: - name: OPERATOR_NAMESPACE from: src