Skip to content

Commit

Permalink
Add release 0.9 e2e tests and branch release-0.9 to README
Browse files Browse the repository at this point in the history
Signed-off-by: Huy Mai <[email protected]>
  • Loading branch information
mquhuy committed Dec 18, 2024
1 parent 65af31a commit 9576a47
Show file tree
Hide file tree
Showing 10 changed files with 91 additions and 27 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Periodic E2E Test Optional release-0.5
name: Periodic E2E Test Optional release-0.9

on:
schedule:
Expand All @@ -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
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Periodic E2E Test release-0.5
name: Periodic E2E Test release-0.9

on:
schedule:
Expand All @@ -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
18 changes: 9 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.8 branch and BMO **release-0.8**
branch on Centos
- **/test metal3-ubuntu-e2e-integration-test-release-1-9** runs ansible
integration tests with CAPM3 release-1.8 branch and BMO **release-0.8**
branch on Ubuntu

**Release-0.8 branch:**

- **/test metal3-centos-e2e-integration-test-release-1-8** runs CAPM3 e2e
Expand All @@ -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
Expand Down
3 changes: 3 additions & 0 deletions config/overlays/e2e-release-0.9/ironic.env
Original file line number Diff line number Diff line change
@@ -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/
32 changes: 32 additions & 0 deletions config/overlays/e2e-release-0.9/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions config/overlays/fixture-release-0.8/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -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)
Expand All @@ -18,4 +18,4 @@ patches:
name: controller-manager
images:
- name: quay.io/metal3-io/baremetal-operator
newTag: release-0.8
newTag: release-0.9
21 changes: 21 additions & 0 deletions config/overlays/fixture-release-0.9/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion hack/ci-e2e.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
10 changes: 7 additions & 3 deletions test/e2e/config/fixture.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
18 changes: 11 additions & 7 deletions test/e2e/config/ironic.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"

0 comments on commit 9576a47

Please sign in to comment.