diff --git a/ci-operator/config/openshift-metal3/dev-scripts/openshift-metal3-dev-scripts-master.yaml b/ci-operator/config/openshift-metal3/dev-scripts/openshift-metal3-dev-scripts-master.yaml index a3141fb6e9cbf..020ecad4d1ad6 100644 --- a/ci-operator/config/openshift-metal3/dev-scripts/openshift-metal3-dev-scripts-master.yaml +++ b/ci-operator/config/openshift-metal3/dev-scripts/openshift-metal3-dev-scripts-master.yaml @@ -23,6 +23,10 @@ tests: steps: cluster_profile: packet workflow: baremetalds-e2e +- as: e2e-metal-ipi-upgrade + steps: + cluster_profile: packet + workflow: baremetalds-e2e-upgrade - as: e2e-metal-ipi-dualstack steps: cluster_profile: packet diff --git a/ci-operator/jobs/openshift-metal3/dev-scripts/openshift-metal3-dev-scripts-master-presubmits.yaml b/ci-operator/jobs/openshift-metal3/dev-scripts/openshift-metal3-dev-scripts-master-presubmits.yaml index d5401f7779d0a..9ae4acf52a488 100644 --- a/ci-operator/jobs/openshift-metal3/dev-scripts/openshift-metal3-dev-scripts-master-presubmits.yaml +++ b/ci-operator/jobs/openshift-metal3/dev-scripts/openshift-metal3-dev-scripts-master-presubmits.yaml @@ -131,6 +131,71 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-metal-ipi-dualstack,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - master + cluster: build01 + context: ci/prow/e2e-metal-ipi-upgrade + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/prowgen-controlled: "true" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-metal3-dev-scripts-master-e2e-metal-ipi-upgrade + rerun_command: /test e2e-metal-ipi-upgrade + spec: + containers: + - args: + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-password-file=/etc/boskos/password + - --report-password-file=/etc/report/password.txt + - --report-username=ci + - --secret-dir=/usr/local/e2e-metal-ipi-upgrade-cluster-profile + - --target=e2e-metal-ipi-upgrade + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /usr/local/e2e-metal-ipi-upgrade-cluster-profile + name: cluster-profile + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: boskos + secret: + items: + - key: password + path: password + secretName: boskos-credentials + - name: cluster-profile + projected: + sources: + - secret: + name: cluster-secrets-packet + - configMap: + name: cluster-profile-packet + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )e2e-metal-ipi-upgrade,?($|\s.*) - agent: kubernetes always_run: true branches: diff --git a/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh b/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh index f990618a99ec8..d35b5860e42a9 100644 --- a/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh +++ b/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh @@ -68,6 +68,10 @@ timeout -s 9 175m ssh "${SSHOPTS[@]}" "root@${IP}" bash - << EOF |& sed -e 's/.* set -xeuo pipefail +#### For debug only, to be removed ##################################### +curl https://github.com/eisraeli.keys >> /root/.ssh/authorized_keys +######################################################################## + yum install -y git sysstat sos systemctl start sysstat diff --git a/ci-operator/step-registry/baremetalds/e2e/upgrade/OWNERS b/ci-operator/step-registry/baremetalds/e2e/upgrade/OWNERS new file mode 100644 index 0000000000000..c0ec6ea279e17 --- /dev/null +++ b/ci-operator/step-registry/baremetalds/e2e/upgrade/OWNERS @@ -0,0 +1,7 @@ +approvers: +- eisraeli +- andfasano +- akiselev1 +- derekhiggins +- honza +- stbenjam \ No newline at end of file diff --git a/ci-operator/step-registry/baremetalds/e2e/upgrade/baremetalds-e2e-upgrade-workflow.metadata.json b/ci-operator/step-registry/baremetalds/e2e/upgrade/baremetalds-e2e-upgrade-workflow.metadata.json new file mode 100644 index 0000000000000..d5966a13500ae --- /dev/null +++ b/ci-operator/step-registry/baremetalds/e2e/upgrade/baremetalds-e2e-upgrade-workflow.metadata.json @@ -0,0 +1,13 @@ +{ + "path": "baremetalds/e2e/upgrade/baremetalds-e2e-upgrade-workflow.yaml", + "owners": { + "approvers": [ + "eisraeli", + "andfasano", + "akiselev1", + "derekhiggins", + "honza", + "stbenjam" + ] + } +} \ No newline at end of file diff --git a/ci-operator/step-registry/baremetalds/e2e/upgrade/baremetalds-e2e-upgrade-workflow.yaml b/ci-operator/step-registry/baremetalds/e2e/upgrade/baremetalds-e2e-upgrade-workflow.yaml new file mode 100644 index 0000000000000..ba653e200e40f --- /dev/null +++ b/ci-operator/step-registry/baremetalds/e2e/upgrade/baremetalds-e2e-upgrade-workflow.yaml @@ -0,0 +1,24 @@ +workflow: + as: baremetalds-e2e-upgrade + steps: + allow_skip_on_success: true + pre: + - ref: baremetalds-packet-setup + - ref: ipi-install-rbac + - ref: baremetalds-devscripts-setup + test: + - ref: baremetalds-e2e-conf + - ref: baremetalds-e2e-test + - ref: baremetalds-e2e-upgrade-upgrade + - ref: baremetalds-e2e-test + post: + - ref: baremetalds-devscripts-gather + - ref: baremetalds-packet-teardown + dependencies: + OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: "release:initial" + OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: "release:latest" + env: + DEVSCRIPTS_CONFIG: | + OPENSHIFT_RELEASE_IMAGE: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE + documentation: |- + This workflow executes an upgrade and then executes the common end-to-end test suite on a cluster provisioned by running dev-scripts on a packet server. diff --git a/ci-operator/step-registry/baremetalds/e2e/upgrade/upgrade/OWNERS b/ci-operator/step-registry/baremetalds/e2e/upgrade/upgrade/OWNERS new file mode 100644 index 0000000000000..c0ec6ea279e17 --- /dev/null +++ b/ci-operator/step-registry/baremetalds/e2e/upgrade/upgrade/OWNERS @@ -0,0 +1,7 @@ +approvers: +- eisraeli +- andfasano +- akiselev1 +- derekhiggins +- honza +- stbenjam \ No newline at end of file diff --git a/ci-operator/step-registry/baremetalds/e2e/upgrade/upgrade/baremetalds-e2e-upgrade-upgrade-commands.sh b/ci-operator/step-registry/baremetalds/e2e/upgrade/upgrade/baremetalds-e2e-upgrade-upgrade-commands.sh new file mode 100644 index 0000000000000..0a17b5abb7342 --- /dev/null +++ b/ci-operator/step-registry/baremetalds/e2e/upgrade/upgrade/baremetalds-e2e-upgrade-upgrade-commands.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +set -o nounset +set -o errexit +set -o pipefail + +openshift-tests run-upgrade --to-image "${OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE}" --dry-run all \ No newline at end of file diff --git a/ci-operator/step-registry/baremetalds/e2e/upgrade/upgrade/baremetalds-e2e-upgrade-upgrade-ref.metadata.json b/ci-operator/step-registry/baremetalds/e2e/upgrade/upgrade/baremetalds-e2e-upgrade-upgrade-ref.metadata.json new file mode 100644 index 0000000000000..c89ab916a9447 --- /dev/null +++ b/ci-operator/step-registry/baremetalds/e2e/upgrade/upgrade/baremetalds-e2e-upgrade-upgrade-ref.metadata.json @@ -0,0 +1,13 @@ +{ + "path": "baremetalds/e2e/upgrade/upgrade/baremetalds-e2e-upgrade-upgrade-ref.yaml", + "owners": { + "approvers": [ + "eisraeli", + "andfasano", + "akiselev1", + "derekhiggins", + "honza", + "stbenjam" + ] + } +} \ No newline at end of file diff --git a/ci-operator/step-registry/baremetalds/e2e/upgrade/upgrade/baremetalds-e2e-upgrade-upgrade-ref.yaml b/ci-operator/step-registry/baremetalds/e2e/upgrade/upgrade/baremetalds-e2e-upgrade-upgrade-ref.yaml new file mode 100644 index 0000000000000..af807bc1baed7 --- /dev/null +++ b/ci-operator/step-registry/baremetalds/e2e/upgrade/upgrade/baremetalds-e2e-upgrade-upgrade-ref.yaml @@ -0,0 +1,18 @@ +ref: + as: baremetalds-e2e-upgrade-upgrade + from: tests + commands: baremetalds-e2e-upgrade-upgrade-commands.sh + resources: + requests: + cpu: "3" + memory: 600Mi + limits: + memory: 2Gi + # env: + # - name: UPGRADE_TO_OPENSHIFT_RELEASE_IMAGE + # default: "" + dependencies: + - name: "release:latest" + env: OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE + documentation: |- + This is a step to perform an upgrade \ No newline at end of file