From 8d2f5b00464bb1853aba83fb71c07327aae38f8a Mon Sep 17 00:00:00 2001 From: Huy Mai Date: Wed, 18 Dec 2024 14:19:02 +0200 Subject: [PATCH] Add release 0.9 e2e tests and branch release-0.9 to README Signed-off-by: Huy Mai --- ...2e-test-optional-periodic-release-0.9.yml} | 4 +-- ....yml => e2e-test-periodic-release-0.9.yml} | 4 +-- README.md | 18 +++++------ config/overlays/e2e-release-0.9/ironic.env | 3 ++ .../e2e-release-0.9/kustomization.yaml | 32 +++++++++++++++++++ .../fixture-release-0.8/kustomization.yaml | 6 ++-- .../fixture-release-0.9/kustomization.yaml | 21 ++++++++++++ hack/ci-e2e.sh | 2 +- test/e2e/config/fixture.yaml | 10 ++++-- test/e2e/config/ironic.yaml | 18 +++++++---- 10 files changed, 91 insertions(+), 27 deletions(-) rename .github/workflows/{e2e-test-optional-periodic-release-0.5.yml => e2e-test-optional-periodic-release-0.9.yml} (88%) rename .github/workflows/{e2e-test-periodic-release-0.5.yml => e2e-test-periodic-release-0.9.yml} (89%) create mode 100644 config/overlays/e2e-release-0.9/ironic.env create mode 100644 config/overlays/e2e-release-0.9/kustomization.yaml create mode 100644 config/overlays/fixture-release-0.9/kustomization.yaml diff --git a/.github/workflows/e2e-test-optional-periodic-release-0.5.yml b/.github/workflows/e2e-test-optional-periodic-release-0.9.yml similarity index 88% rename from .github/workflows/e2e-test-optional-periodic-release-0.5.yml rename to .github/workflows/e2e-test-optional-periodic-release-0.9.yml index 920c48547f..6008ceed3d 100644 --- a/.github/workflows/e2e-test-optional-periodic-release-0.5.yml +++ b/.github/workflows/e2e-test-optional-periodic-release-0.9.yml @@ -1,4 +1,4 @@ -name: Periodic E2E Test Optional release-0.5 +name: Periodic E2E Test Optional release-0.9 on: schedule: @@ -21,6 +21,6 @@ jobs: with: bmc-protocol: ${{ matrix.bmc-protocol }} ginkgo-focus: upgrade - ref: release-0.5 + ref: release-0.9 permissions: contents: read diff --git a/.github/workflows/e2e-test-periodic-release-0.5.yml b/.github/workflows/e2e-test-periodic-release-0.9.yml similarity index 89% rename from .github/workflows/e2e-test-periodic-release-0.5.yml rename to .github/workflows/e2e-test-periodic-release-0.9.yml index f367a513be..8a3d5ca5ba 100644 --- a/.github/workflows/e2e-test-periodic-release-0.5.yml +++ b/.github/workflows/e2e-test-periodic-release-0.9.yml @@ -1,4 +1,4 @@ -name: Periodic E2E Test release-0.5 +name: Periodic E2E Test release-0.9 on: schedule: @@ -20,6 +20,6 @@ jobs: uses: ./.github/workflows/e2e-test.yml with: bmc-protocol: ${{ matrix.bmc-protocol }} - ref: release-0.5 + ref: release-0.9 permissions: contents: read diff --git a/README.md b/README.md index e54cb3e12b..c776156a79 100644 --- a/README.md +++ b/README.md @@ -57,6 +57,15 @@ For more details on the e2e tests, see [test/e2e/README.md](test/e2e/README.md). - **/test metal3-ubuntu-e2e-integration-test-main** runs ansible integration tests with CAPM3 main branch and BMO **main** branch on Ubuntu +**Release-0.9 branch:** + +- **/test metal3-centos-e2e-integration-test-release-1-9** runs CAPM3 e2e + integration tests with CAPM3 release-1.9 branch and BMO **release-0.9** + branch on Centos +- **/test metal3-ubuntu-e2e-integration-test-release-1-9** runs ansible + integration tests with CAPM3 release-1.9 branch and BMO **release-0.9** + branch on Ubuntu + **Release-0.8 branch:** - **/test metal3-centos-e2e-integration-test-release-1-8** runs CAPM3 e2e @@ -75,15 +84,6 @@ For more details on the e2e tests, see [test/e2e/README.md](test/e2e/README.md). integration tests with CAPM3 release-1.7 branch and BMO **release-0.6** branch on Ubuntu -**Release-0.5 branch:** - -- **/test metal3-centos-e2e-integration-test-release-1-6** runs CAPM3 e2e - integration tests with CAPM3 release-1.6 branch and BMO **release-0.5** - branch on Centos -- **/test metal3-ubuntu-e2e-integration-test-release-1-6** runs ansible - integration tests with CAPM3 release-1.6 branch and BMO **release-0.5** - branch on Ubuntu - ### Important Notes Whenever there is a change in `config/` directory, please remember to run the diff --git a/config/overlays/e2e-release-0.9/ironic.env b/config/overlays/e2e-release-0.9/ironic.env new file mode 100644 index 0000000000..0187ae15e4 --- /dev/null +++ b/config/overlays/e2e-release-0.9/ironic.env @@ -0,0 +1,3 @@ +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/ diff --git a/config/overlays/e2e-release-0.9/kustomization.yaml b/config/overlays/e2e-release-0.9/kustomization.yaml new file mode 100644 index 0000000000..0f4a8c3799 --- /dev/null +++ b/config/overlays/e2e-release-0.9/kustomization.yaml @@ -0,0 +1,32 @@ +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.9&timeout=120s +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.9 +# 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 diff --git a/config/overlays/fixture-release-0.8/kustomization.yaml b/config/overlays/fixture-release-0.8/kustomization.yaml index 79b6d52546..0ddf9b1404 100644 --- a/config/overlays/fixture-release-0.8/kustomization.yaml +++ b/config/overlays/fixture-release-0.8/kustomization.yaml @@ -1,8 +1,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -- https://github.com/metal3-io/baremetal-operator/config/namespace?ref=release-0.8 -- https://github.com/metal3-io/baremetal-operator/config/default?ref=release-0.8 +- https://github.com/metal3-io/baremetal-operator/config/namespace?ref=release-0.9 +- https://github.com/metal3-io/baremetal-operator/config/default?ref=release-0.9 patches: - patch: | # Enable test mode (fixture provider instead of ironic) @@ -18,4 +18,4 @@ patches: name: controller-manager images: - name: quay.io/metal3-io/baremetal-operator - newTag: release-0.8 + newTag: release-0.9 diff --git a/config/overlays/fixture-release-0.9/kustomization.yaml b/config/overlays/fixture-release-0.9/kustomization.yaml new file mode 100644 index 0000000000..0ddf9b1404 --- /dev/null +++ b/config/overlays/fixture-release-0.9/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.9 +- https://github.com/metal3-io/baremetal-operator/config/default?ref=release-0.9 +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.9 diff --git a/hack/ci-e2e.sh b/hack/ci-e2e.sh index 92957f1422..1a932231ba 100755 --- a/hack/ci-e2e.sh +++ b/hack/ci-e2e.sh @@ -171,9 +171,9 @@ popd # Generate credentials BMO_OVERLAYS=( "${REPO_ROOT}/config/overlays/e2e" - "${REPO_ROOT}/config/overlays/e2e-release-0.5" "${REPO_ROOT}/config/overlays/e2e-release-0.6" "${REPO_ROOT}/config/overlays/e2e-release-0.8" + "${REPO_ROOT}/config/overlays/e2e-release-0.9" ) IRONIC_OVERLAYS=( "${REPO_ROOT}/ironic-deployment/overlays/e2e" diff --git a/test/e2e/config/fixture.yaml b/test/e2e/config/fixture.yaml index e61b361fdf..bb3a17b1fb 100644 --- a/test/e2e/config/fixture.yaml +++ b/test/e2e/config/fixture.yaml @@ -3,8 +3,12 @@ images: - name: quay.io/metal3-io/baremetal-operator:e2e loadBehavior: tryLoad # Save some time and network by using cached images if available +- name: quay.io/metal3-io/baremetal-operator:release-0.6 + loadBehavior: tryLoad - name: quay.io/metal3-io/baremetal-operator:release-0.8 loadBehavior: tryLoad +- name: quay.io/metal3-io/baremetal-operator:release-0.9 + loadBehavior: tryLoad - name: quay.io/jetstack/cert-manager-cainjector:v1.13.1 loadBehavior: tryLoad - name: quay.io/jetstack/cert-manager-webhook:v1.13.1 @@ -52,16 +56,16 @@ intervals: bmoIronicUpgradeSpecs: - deployIronic: false deployBMO: true - initBMOKustomization: "../../config/overlays/fixture-release-0.5" + initBMOKustomization: "../../config/overlays/fixture-release-0.6" upgradeEntityKustomization: "../../config/overlays/fixture" upgradeEntityName: "bmo" - deployIronic: false deployBMO: true - initBMOKustomization: "../../config/overlays/fixture-release-0.6" + initBMOKustomization: "../../config/overlays/fixture-release-0.8" upgradeEntityKustomization: "../../config/overlays/fixture" upgradeEntityName: "bmo" - deployIronic: false deployBMO: true - initBMOKustomization: "../../config/overlays/fixture-release-0.8" + initBMOKustomization: "../../config/overlays/fixture-release-0.9" upgradeEntityKustomization: "../../config/overlays/fixture" upgradeEntityName: "bmo" diff --git a/test/e2e/config/ironic.yaml b/test/e2e/config/ironic.yaml index c3681d6e40..e0a7f336ee 100644 --- a/test/e2e/config/ironic.yaml +++ b/test/e2e/config/ironic.yaml @@ -3,8 +3,12 @@ images: - name: quay.io/metal3-io/baremetal-operator:e2e loadBehavior: tryLoad # Save some time and network by using cached images if available +- name: quay.io/metal3-io/baremetal-operator:release-0.6 + loadBehavior: tryLoad - name: quay.io/metal3-io/baremetal-operator:release-0.8 loadBehavior: tryLoad +- name: quay.io/metal3-io/baremetal-operator:release-0.9 + loadBehavior: tryLoad - name: quay.io/jetstack/cert-manager-cainjector:v1.13.1 loadBehavior: tryLoad - name: quay.io/jetstack/cert-manager-webhook:v1.13.1 @@ -59,43 +63,43 @@ intervals: bmoIronicUpgradeSpecs: - deployIronic: true deployBMO: true - initBMOKustomization: "../../config/overlays/e2e-release-0.5" + initBMOKustomization: "../../config/overlays/e2e-release-0.6" initIronicKustomization: "../../ironic-deployment/overlays/e2e" upgradeEntityKustomization: "../../config/overlays/e2e" upgradeEntityName: "bmo" - deployIronic: true deployBMO: true - initBMOKustomization: "../../config/overlays/e2e-release-0.6" + initBMOKustomization: "../../config/overlays/e2e-release-0.8" initIronicKustomization: "../../ironic-deployment/overlays/e2e" upgradeEntityKustomization: "../../config/overlays/e2e" upgradeEntityName: "bmo" - deployIronic: true deployBMO: true - initBMOKustomization: "../../config/overlays/e2e-release-0.8" + initBMOKustomization: "../../config/overlays/e2e-release-0.9" initIronicKustomization: "../../ironic-deployment/overlays/e2e" upgradeEntityKustomization: "../../config/overlays/e2e" upgradeEntityName: "bmo" - deployIronic: true deployBMO: true - initBMOKustomization: "../../config/overlays/e2e-release-0.8" + initBMOKustomization: "../../config/overlays/e2e-release-0.9" initIronicKustomization: "../../ironic-deployment/overlays/e2e-release-24.0-with-inspector" upgradeEntityKustomization: "../../ironic-deployment/overlays/e2e" upgradeEntityName: "ironic" - deployIronic: true deployBMO: true - initBMOKustomization: "../../config/overlays/e2e-release-0.8" + initBMOKustomization: "../../config/overlays/e2e-release-0.9" initIronicKustomization: "../../ironic-deployment/overlays/e2e-release-24.1" upgradeEntityKustomization: "../../ironic-deployment/overlays/e2e" upgradeEntityName: "ironic" - deployIronic: true deployBMO: true - initBMOKustomization: "../../config/overlays/e2e-release-0.8" + initBMOKustomization: "../../config/overlays/e2e-release-0.9" initIronicKustomization: "../../ironic-deployment/overlays/e2e-release-25.0" upgradeEntityKustomization: "../../ironic-deployment/overlays/e2e" upgradeEntityName: "ironic" - deployIronic: true deployBMO: true - initBMOKustomization: "../../config/overlays/e2e-release-0.8" + initBMOKustomization: "../../config/overlays/e2e-release-0.9" initIronicKustomization: "../../ironic-deployment/overlays/e2e-release-26.0" upgradeEntityKustomization: "../../ironic-deployment/overlays/e2e" upgradeEntityName: "ironic"