From 53523ee17dc680596488feceab976b69136ceecf Mon Sep 17 00:00:00 2001 From: Patryk Matuszak <305846+pmtk@users.noreply.github.com> Date: Sat, 11 Mar 2023 09:57:47 +0100 Subject: [PATCH 1/4] debug-cluster-info.sh in case of deploy.sh fail --- ...ift-microshift-e2e-loadbalancer-smoke-test-commands.sh | 8 +++----- ...openshift-microshift-e2e-router-smoke-test-commands.sh | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/ci-operator/step-registry/openshift/microshift/e2e/loadbalancer-smoke-test/openshift-microshift-e2e-loadbalancer-smoke-test-commands.sh b/ci-operator/step-registry/openshift/microshift/e2e/loadbalancer-smoke-test/openshift-microshift-e2e-loadbalancer-smoke-test-commands.sh index 28aaf9bf43063..caca02a5e32c3 100644 --- a/ci-operator/step-registry/openshift/microshift/e2e/loadbalancer-smoke-test/openshift-microshift-e2e-loadbalancer-smoke-test-commands.sh +++ b/ci-operator/step-registry/openshift/microshift/e2e/loadbalancer-smoke-test/openshift-microshift-e2e-loadbalancer-smoke-test-commands.sh @@ -53,7 +53,7 @@ metadata: labels: app: hello-microshift spec: - containers: + containers: - name: hello-microshift image: openshift/hello-openshift ports: @@ -81,19 +81,18 @@ LD_PRELOAD=/usr/lib64/libnss_wrapper.so gcloud compute scp \ --zone "${GOOGLE_COMPUTE_ZONE}" \ --recurse "${HOME}/deploy.sh" "rhel8user@${INSTANCE_PREFIX}:~/deploy.sh" +set +e LD_PRELOAD=/usr/lib64/libnss_wrapper.so gcloud compute ssh \ --project "${GOOGLE_PROJECT_ID}" \ --zone "${GOOGLE_COMPUTE_ZONE}" \ "rhel8user@${INSTANCE_PREFIX}" \ --command "bash ~/deploy.sh" - IP=$(LD_PRELOAD=/usr/lib64/libnss_wrapper.so gcloud compute instances describe "${INSTANCE_PREFIX}" --format='value(networkInterfaces.accessConfigs[0].natIP)') -set +ex +set +x retries=3 backoff=3s - for try in $(seq 1 "${retries}"); do echo "Attempt: ${try}" echo "Running: curl -vk ${IP}:5678" @@ -108,7 +107,6 @@ for try in $(seq 1 "${retries}"); do echo -e "Waiting ${backoff} before next retry\n\n" sleep "${backoff}" done - set -x LD_PRELOAD=/usr/lib64/libnss_wrapper.so gcloud compute scp \ diff --git a/ci-operator/step-registry/openshift/microshift/e2e/router-smoke-test/openshift-microshift-e2e-router-smoke-test-commands.sh b/ci-operator/step-registry/openshift/microshift/e2e/router-smoke-test/openshift-microshift-e2e-router-smoke-test-commands.sh index 6a312dca2d3c8..80d0b147319d5 100644 --- a/ci-operator/step-registry/openshift/microshift/e2e/router-smoke-test/openshift-microshift-e2e-router-smoke-test-commands.sh +++ b/ci-operator/step-registry/openshift/microshift/e2e/router-smoke-test/openshift-microshift-e2e-router-smoke-test-commands.sh @@ -53,7 +53,7 @@ metadata: labels: name: hello-microshift spec: - containers: + containers: - name: hello-microshift image: openshift/hello-openshift ports: @@ -82,19 +82,18 @@ LD_PRELOAD=/usr/lib64/libnss_wrapper.so gcloud compute scp \ --zone "${GOOGLE_COMPUTE_ZONE}" \ --recurse "${HOME}/deploy.sh" "rhel8user@${INSTANCE_PREFIX}:~/deploy.sh" +set +e LD_PRELOAD=/usr/lib64/libnss_wrapper.so gcloud compute ssh \ --project "${GOOGLE_PROJECT_ID}" \ --zone "${GOOGLE_COMPUTE_ZONE}" \ "rhel8user@${INSTANCE_PREFIX}" \ --command "bash ~/deploy.sh" - IP=$(LD_PRELOAD=/usr/lib64/libnss_wrapper.so gcloud compute instances describe "${INSTANCE_PREFIX}" --format='value(networkInterfaces.accessConfigs[0].natIP)') -set +ex +set +x retries=3 backoff=3s - for try in $(seq 1 "${retries}"); do echo "Attempt: ${try}" echo "Running: curl -vk http://hello-microshift.cluster.local --resolve \"hello-microshift.cluster.local:80:${IP}\"" @@ -109,7 +108,6 @@ for try in $(seq 1 "${retries}"); do echo -e "Waiting ${backoff} before next retry\n\n" sleep "${backoff}" done - set -x LD_PRELOAD=/usr/lib64/libnss_wrapper.so gcloud compute scp \ From a1a7d957e540f77626ce897bc76739a6ae91aee8 Mon Sep 17 00:00:00 2001 From: Patryk Matuszak <305846+pmtk@users.noreply.github.com> Date: Sat, 11 Mar 2023 11:01:57 +0100 Subject: [PATCH 2/4] change hello-openshift image hello-openshift is only amd64 --- ...shift-e2e-loadbalancer-smoke-test-commands.sh | 14 +++++++++----- ...-microshift-e2e-router-smoke-test-commands.sh | 16 ++++++++++------ 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/ci-operator/step-registry/openshift/microshift/e2e/loadbalancer-smoke-test/openshift-microshift-e2e-loadbalancer-smoke-test-commands.sh b/ci-operator/step-registry/openshift/microshift/e2e/loadbalancer-smoke-test/openshift-microshift-e2e-loadbalancer-smoke-test-commands.sh index caca02a5e32c3..b58b6d697f42d 100644 --- a/ci-operator/step-registry/openshift/microshift/e2e/loadbalancer-smoke-test/openshift-microshift-e2e-loadbalancer-smoke-test-commands.sh +++ b/ci-operator/step-registry/openshift/microshift/e2e/loadbalancer-smoke-test/openshift-microshift-e2e-loadbalancer-smoke-test-commands.sh @@ -7,9 +7,9 @@ set -x trap 'CHILDREN=$(jobs -p); if test -n "${CHILDREN}"; then kill ${CHILDREN} && wait; fi' TERM INSTANCE_PREFIX="${NAMESPACE}-${JOB_NAME_HASH}" -GOOGLE_PROJECT_ID=$(< "${CLUSTER_PROFILE_DIR}/openshift_gcp_project") +GOOGLE_PROJECT_ID=$(<"${CLUSTER_PROFILE_DIR}/openshift_gcp_project") GOOGLE_COMPUTE_REGION="${LEASED_RESOURCE}" -GOOGLE_COMPUTE_ZONE=$(< "${SHARED_DIR}/openshift_gcp_compute_zone") +GOOGLE_COMPUTE_ZONE=$(<"${SHARED_DIR}/openshift_gcp_compute_zone") if [[ -z "${GOOGLE_COMPUTE_ZONE}" ]]; then echo "Expected \${SHARED_DIR}/openshift_gcp_compute_zone to contain the GCP zone" exit 1 @@ -45,7 +45,7 @@ set -x mkdir -p ~/.kube sudo cat /var/lib/microshift/resources/kubeadmin/kubeconfig > ~/.kube/config -echo " +echo ' kind: Pod apiVersion: v1 metadata: @@ -55,7 +55,9 @@ metadata: spec: containers: - name: hello-microshift - image: openshift/hello-openshift + image: busybox:1.35 + command: ["/bin/sh"] + args: ["-c", "while true; do echo -ne \"HTTP/1.0 200 OK\r\nContent-Length: 16\r\n\r\nHello MicroShift\" | nc -l -p 8080 ; done"] ports: - containerPort: 8080 protocol: TCP @@ -65,8 +67,10 @@ spec: drop: - ALL runAsNonRoot: true + runAsUser: 1001 + runAsGroup: 1001 seccompProfile: - type: RuntimeDefault" | oc create -f - + type: RuntimeDefault' | oc create -f - oc create service loadbalancer hello-microshift --tcp=5678:8080 diff --git a/ci-operator/step-registry/openshift/microshift/e2e/router-smoke-test/openshift-microshift-e2e-router-smoke-test-commands.sh b/ci-operator/step-registry/openshift/microshift/e2e/router-smoke-test/openshift-microshift-e2e-router-smoke-test-commands.sh index 80d0b147319d5..dc47eb9b2c34b 100644 --- a/ci-operator/step-registry/openshift/microshift/e2e/router-smoke-test/openshift-microshift-e2e-router-smoke-test-commands.sh +++ b/ci-operator/step-registry/openshift/microshift/e2e/router-smoke-test/openshift-microshift-e2e-router-smoke-test-commands.sh @@ -7,9 +7,9 @@ set -x trap 'CHILDREN=$(jobs -p); if test -n "${CHILDREN}"; then kill ${CHILDREN} && wait; fi' TERM INSTANCE_PREFIX="${NAMESPACE}-${JOB_NAME_HASH}" -GOOGLE_PROJECT_ID=$(< "${CLUSTER_PROFILE_DIR}/openshift_gcp_project") +GOOGLE_PROJECT_ID=$(<"${CLUSTER_PROFILE_DIR}/openshift_gcp_project") GOOGLE_COMPUTE_REGION="${LEASED_RESOURCE}" -GOOGLE_COMPUTE_ZONE=$(< "${SHARED_DIR}/openshift_gcp_compute_zone") +GOOGLE_COMPUTE_ZONE=$(<"${SHARED_DIR}/openshift_gcp_compute_zone") if [[ -z "${GOOGLE_COMPUTE_ZONE}" ]]; then echo "Expected \${SHARED_DIR}/openshift_gcp_compute_zone to contain the GCP zone" exit 1 @@ -45,17 +45,19 @@ set -x mkdir -p ~/.kube sudo cat /var/lib/microshift/resources/kubeadmin/kubeconfig > ~/.kube/config -echo " +echo ' kind: Pod apiVersion: v1 metadata: name: hello-microshift labels: - name: hello-microshift + app: hello-microshift spec: containers: - name: hello-microshift - image: openshift/hello-openshift + image: busybox:1.35 + command: ["/bin/sh"] + args: ["-c", "while true; do echo -ne \"HTTP/1.0 200 OK\r\nContent-Length: 16\r\n\r\nHello MicroShift\" | nc -l -p 8080 ; done"] ports: - containerPort: 8080 protocol: TCP @@ -65,8 +67,10 @@ spec: drop: - ALL runAsNonRoot: true + runAsUser: 1001 + runAsGroup: 1001 seccompProfile: - type: RuntimeDefault" | oc create -f - + type: RuntimeDefault' | oc create -f - oc expose pod hello-microshift oc expose svc hello-microshift --hostname hello-microshift.cluster.local From df0de9979b076e26a1c8edb76e1f22bfb9803e5a Mon Sep 17 00:00:00 2001 From: Patryk Matuszak <305846+pmtk@users.noreply.github.com> Date: Fri, 10 Mar 2023 14:17:34 +0100 Subject: [PATCH 3/4] simplest, but not most efficient way to get MicroShift ARM ci jobs --- .../microshift/openshift-microshift-main.yaml | 39 +++ .../openshift-microshift-release-4.13.yaml | 39 +++ .../openshift-microshift-release-4.14.yaml | 39 +++ .../openshift-microshift-main-presubmits.yaml | 322 ++++++++++++++++++ ...ft-microshift-release-4.13-presubmits.yaml | 322 ++++++++++++++++++ ...ft-microshift-release-4.14-presubmits.yaml | 322 ++++++++++++++++++ ...microshift-e2e-pre-rpm-install-commands.sh | 2 +- ...oshift-e2e-wait-for-cluster-up-commands.sh | 2 - 8 files changed, 1084 insertions(+), 3 deletions(-) diff --git a/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml b/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml index cdd58784ba28b..822b798ce4a8c 100644 --- a/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml +++ b/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml @@ -39,6 +39,7 @@ images: rm -rf /var/cache/dnf/* RUN ls -lA RUN make rpm + RUN TARGET_ARCH=aarch64 make rpm FROM libvirt-installer USER root ENV HOME=/tmp/secret @@ -150,6 +151,15 @@ tests: env: GOOGLE_COMPUTE_IMAGE_NAME: rhel-9-v20230203 workflow: openshift-microshift-e2e-openshift-conformance-reduced +- as: e2e-openshift-conformance-reduced-arm + cluster: build02 + run_if_changed: ^(assets/.*|cmd/.*|pkg/.*|packaging/.*|vendor/.*|go\.sum|go\.mod|Makefile|.*\.sh) + steps: + cluster_profile: gcp + env: + GOOGLE_COMPUTE_IMAGE_NAME: rhel-9-arm64-v20230306 + GOOGLE_COMPUTE_MACHINE_TYPE: t2a-standard-4 + workflow: openshift-microshift-e2e-openshift-conformance-reduced - as: e2e-reboot cluster: build02 run_if_changed: ^(assets/.*|cmd/.*|pkg/.*|packaging/.*|vendor/.*|go\.sum|go\.mod|Makefile) @@ -158,6 +168,15 @@ tests: env: GOOGLE_COMPUTE_IMAGE_NAME: rhel-9-v20230203 workflow: openshift-microshift-e2e-reboot-tests +- as: e2e-reboot-arm + cluster: build02 + run_if_changed: ^(assets/.*|cmd/.*|pkg/.*|packaging/.*|vendor/.*|go\.sum|go\.mod|Makefile) + steps: + cluster_profile: gcp + env: + GOOGLE_COMPUTE_IMAGE_NAME: rhel-9-arm64-v20230306 + GOOGLE_COMPUTE_MACHINE_TYPE: t2a-standard-4 + workflow: openshift-microshift-e2e-reboot-tests - as: e2e-greenboot cluster: build02 optional: true @@ -176,6 +195,16 @@ tests: env: GOOGLE_COMPUTE_IMAGE_NAME: rhel-9-v20230203 workflow: openshift-microshift-e2e-router-smoke-test +- as: e2e-router-smoke-test-arm + cluster: build02 + optional: true + run_if_changed: ^(assets/.*|cmd/.*|pkg/.*|packaging/.*|vendor/.*|go\.sum|go\.mod|Makefile|.*\.sh) + steps: + cluster_profile: gcp + env: + GOOGLE_COMPUTE_IMAGE_NAME: rhel-9-arm64-v20230306 + GOOGLE_COMPUTE_MACHINE_TYPE: t2a-standard-4 + workflow: openshift-microshift-e2e-router-smoke-test - as: rebase-on-nightlies cron: 0 5 * * 1-5 steps: @@ -189,6 +218,16 @@ tests: env: GOOGLE_COMPUTE_IMAGE_NAME: rhel-9-v20230203 workflow: openshift-microshift-e2e-loadbalancer-smoke-test +- as: e2e-loadbalancer-smoke-test-arm + cluster: build02 + optional: true + run_if_changed: ^(assets/.*|cmd/.*|pkg/.*|packaging/.*|vendor/.*|go\.sum|go\.mod|Makefile|.*\.sh) + steps: + cluster_profile: gcp + env: + GOOGLE_COMPUTE_IMAGE_NAME: rhel-9-arm64-v20230306 + GOOGLE_COMPUTE_MACHINE_TYPE: t2a-standard-4 + workflow: openshift-microshift-e2e-loadbalancer-smoke-test zz_generated_metadata: branch: main org: openshift diff --git a/ci-operator/config/openshift/microshift/openshift-microshift-release-4.13.yaml b/ci-operator/config/openshift/microshift/openshift-microshift-release-4.13.yaml index e137367400b93..53c8663225969 100644 --- a/ci-operator/config/openshift/microshift/openshift-microshift-release-4.13.yaml +++ b/ci-operator/config/openshift/microshift/openshift-microshift-release-4.13.yaml @@ -39,6 +39,7 @@ images: rm -rf /var/cache/dnf/* RUN ls -lA RUN make rpm + RUN TARGET_ARCH=aarch64 make rpm FROM libvirt-installer USER root ENV HOME=/tmp/secret @@ -150,6 +151,15 @@ tests: env: GOOGLE_COMPUTE_IMAGE_NAME: rhel-9-v20230203 workflow: openshift-microshift-e2e-openshift-conformance-reduced +- as: e2e-openshift-conformance-reduced-arm + cluster: build02 + run_if_changed: ^(assets/.*|cmd/.*|pkg/.*|packaging/.*|vendor/.*|go\.sum|go\.mod|Makefile|.*\.sh) + steps: + cluster_profile: gcp + env: + GOOGLE_COMPUTE_IMAGE_NAME: rhel-9-arm64-v20230306 + GOOGLE_COMPUTE_MACHINE_TYPE: t2a-standard-4 + workflow: openshift-microshift-e2e-openshift-conformance-reduced - as: e2e-reboot cluster: build02 run_if_changed: ^(assets/.*|cmd/.*|pkg/.*|packaging/.*|vendor/.*|go\.sum|go\.mod|Makefile) @@ -158,6 +168,15 @@ tests: env: GOOGLE_COMPUTE_IMAGE_NAME: rhel-9-v20230203 workflow: openshift-microshift-e2e-reboot-tests +- as: e2e-reboot-arm + cluster: build02 + run_if_changed: ^(assets/.*|cmd/.*|pkg/.*|packaging/.*|vendor/.*|go\.sum|go\.mod|Makefile) + steps: + cluster_profile: gcp + env: + GOOGLE_COMPUTE_IMAGE_NAME: rhel-9-arm64-v20230306 + GOOGLE_COMPUTE_MACHINE_TYPE: t2a-standard-4 + workflow: openshift-microshift-e2e-reboot-tests - as: e2e-greenboot cluster: build02 optional: true @@ -176,6 +195,16 @@ tests: env: GOOGLE_COMPUTE_IMAGE_NAME: rhel-9-v20230203 workflow: openshift-microshift-e2e-router-smoke-test +- as: e2e-router-smoke-test-arm + cluster: build02 + optional: true + run_if_changed: ^(assets/.*|cmd/.*|pkg/.*|packaging/.*|vendor/.*|go\.sum|go\.mod|Makefile|.*\.sh) + steps: + cluster_profile: gcp + env: + GOOGLE_COMPUTE_IMAGE_NAME: rhel-9-arm64-v20230306 + GOOGLE_COMPUTE_MACHINE_TYPE: t2a-standard-4 + workflow: openshift-microshift-e2e-router-smoke-test - as: rebase-on-nightlies cron: 0 5 * * 1-5 steps: @@ -189,6 +218,16 @@ tests: env: GOOGLE_COMPUTE_IMAGE_NAME: rhel-9-v20230203 workflow: openshift-microshift-e2e-loadbalancer-smoke-test +- as: e2e-loadbalancer-smoke-test-arm + cluster: build02 + optional: true + run_if_changed: ^(assets/.*|cmd/.*|pkg/.*|packaging/.*|vendor/.*|go\.sum|go\.mod|Makefile|.*\.sh) + steps: + cluster_profile: gcp + env: + GOOGLE_COMPUTE_IMAGE_NAME: rhel-9-arm64-v20230306 + GOOGLE_COMPUTE_MACHINE_TYPE: t2a-standard-4 + workflow: openshift-microshift-e2e-loadbalancer-smoke-test zz_generated_metadata: branch: release-4.13 org: openshift diff --git a/ci-operator/config/openshift/microshift/openshift-microshift-release-4.14.yaml b/ci-operator/config/openshift/microshift/openshift-microshift-release-4.14.yaml index e7f34d7e20a78..c0aaad8eef6bc 100644 --- a/ci-operator/config/openshift/microshift/openshift-microshift-release-4.14.yaml +++ b/ci-operator/config/openshift/microshift/openshift-microshift-release-4.14.yaml @@ -39,6 +39,7 @@ images: rm -rf /var/cache/dnf/* RUN ls -lA RUN make rpm + RUN TARGET_ARCH=aarch64 make rpm FROM libvirt-installer USER root ENV HOME=/tmp/secret @@ -151,6 +152,15 @@ tests: env: GOOGLE_COMPUTE_IMAGE_NAME: rhel-9-v20230203 workflow: openshift-microshift-e2e-openshift-conformance-reduced +- as: e2e-openshift-conformance-reduced-arm + cluster: build02 + run_if_changed: ^(assets/.*|cmd/.*|pkg/.*|packaging/.*|vendor/.*|go\.sum|go\.mod|Makefile|.*\.sh) + steps: + cluster_profile: gcp + env: + GOOGLE_COMPUTE_IMAGE_NAME: rhel-9-arm64-v20230306 + GOOGLE_COMPUTE_MACHINE_TYPE: t2a-standard-4 + workflow: openshift-microshift-e2e-openshift-conformance-reduced - as: e2e-reboot cluster: build02 run_if_changed: ^(assets/.*|cmd/.*|pkg/.*|packaging/.*|vendor/.*|go\.sum|go\.mod|Makefile) @@ -159,6 +169,15 @@ tests: env: GOOGLE_COMPUTE_IMAGE_NAME: rhel-9-v20230203 workflow: openshift-microshift-e2e-reboot-tests +- as: e2e-reboot-arm + cluster: build02 + run_if_changed: ^(assets/.*|cmd/.*|pkg/.*|packaging/.*|vendor/.*|go\.sum|go\.mod|Makefile) + steps: + cluster_profile: gcp + env: + GOOGLE_COMPUTE_IMAGE_NAME: rhel-9-arm64-v20230306 + GOOGLE_COMPUTE_MACHINE_TYPE: t2a-standard-4 + workflow: openshift-microshift-e2e-reboot-tests - as: e2e-greenboot cluster: build02 optional: true @@ -177,6 +196,16 @@ tests: env: GOOGLE_COMPUTE_IMAGE_NAME: rhel-9-v20230203 workflow: openshift-microshift-e2e-router-smoke-test +- as: e2e-router-smoke-test-arm + cluster: build02 + optional: true + run_if_changed: ^(assets/.*|cmd/.*|pkg/.*|packaging/.*|vendor/.*|go\.sum|go\.mod|Makefile|.*\.sh) + steps: + cluster_profile: gcp + env: + GOOGLE_COMPUTE_IMAGE_NAME: rhel-9-arm64-v20230306 + GOOGLE_COMPUTE_MACHINE_TYPE: t2a-standard-4 + workflow: openshift-microshift-e2e-router-smoke-test - as: e2e-loadbalancer-smoke-test cluster: build02 optional: true @@ -186,6 +215,16 @@ tests: env: GOOGLE_COMPUTE_IMAGE_NAME: rhel-9-v20230203 workflow: openshift-microshift-e2e-loadbalancer-smoke-test +- as: e2e-loadbalancer-smoke-test-arm + cluster: build02 + optional: true + run_if_changed: ^(assets/.*|cmd/.*|pkg/.*|packaging/.*|vendor/.*|go\.sum|go\.mod|Makefile|.*\.sh) + steps: + cluster_profile: gcp + env: + GOOGLE_COMPUTE_IMAGE_NAME: rhel-9-arm64-v20230306 + GOOGLE_COMPUTE_MACHINE_TYPE: t2a-standard-4 + workflow: openshift-microshift-e2e-loadbalancer-smoke-test zz_generated_metadata: branch: release-4.14 org: openshift diff --git a/ci-operator/jobs/openshift/microshift/openshift-microshift-main-presubmits.yaml b/ci-operator/jobs/openshift/microshift/openshift-microshift-main-presubmits.yaml index 178f8214b7ade..6166363b59b20 100644 --- a/ci-operator/jobs/openshift/microshift/openshift-microshift-main-presubmits.yaml +++ b/ci-operator/jobs/openshift/microshift/openshift-microshift-main-presubmits.yaml @@ -162,6 +162,87 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-loadbalancer-smoke-test,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^main$ + - ^main- + cluster: build02 + context: ci/prow/e2e-loadbalancer-smoke-test-arm + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/cloud: gcp + ci-operator.openshift.io/cloud-cluster-profile: gcp + ci-operator.openshift.io/cluster: build02 + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-microshift-main-e2e-loadbalancer-smoke-test-arm + optional: true + rerun_command: /test e2e-loadbalancer-smoke-test-arm + run_if_changed: ^(assets/.*|cmd/.*|pkg/.*|packaging/.*|vendor/.*|go\.sum|go\.mod|Makefile|.*\.sh) + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-credentials-file=/etc/boskos/credentials + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --secret-dir=/usr/local/e2e-loadbalancer-smoke-test-arm-cluster-profile + - --target=e2e-loadbalancer-smoke-test-arm + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /usr/local/e2e-loadbalancer-smoke-test-arm-cluster-profile + name: cluster-profile + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - 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: credentials + path: credentials + secretName: boskos-credentials + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: cluster-profile + projected: + sources: + - secret: + name: cluster-secrets-gcp + - configMap: + name: cluster-profile-gcp + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )e2e-loadbalancer-smoke-test-arm,?($|\s.*) - agent: kubernetes always_run: false branches: @@ -242,6 +323,86 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-openshift-conformance-reduced,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^main$ + - ^main- + cluster: build02 + context: ci/prow/e2e-openshift-conformance-reduced-arm + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/cloud: gcp + ci-operator.openshift.io/cloud-cluster-profile: gcp + ci-operator.openshift.io/cluster: build02 + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-microshift-main-e2e-openshift-conformance-reduced-arm + rerun_command: /test e2e-openshift-conformance-reduced-arm + run_if_changed: ^(assets/.*|cmd/.*|pkg/.*|packaging/.*|vendor/.*|go\.sum|go\.mod|Makefile|.*\.sh) + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-credentials-file=/etc/boskos/credentials + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --secret-dir=/usr/local/e2e-openshift-conformance-reduced-arm-cluster-profile + - --target=e2e-openshift-conformance-reduced-arm + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /usr/local/e2e-openshift-conformance-reduced-arm-cluster-profile + name: cluster-profile + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - 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: credentials + path: credentials + secretName: boskos-credentials + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: cluster-profile + projected: + sources: + - secret: + name: cluster-secrets-gcp + - configMap: + name: cluster-profile-gcp + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )e2e-openshift-conformance-reduced-arm,?($|\s.*) - agent: kubernetes always_run: false branches: @@ -322,6 +483,86 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-reboot,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^main$ + - ^main- + cluster: build02 + context: ci/prow/e2e-reboot-arm + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/cloud: gcp + ci-operator.openshift.io/cloud-cluster-profile: gcp + ci-operator.openshift.io/cluster: build02 + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-microshift-main-e2e-reboot-arm + rerun_command: /test e2e-reboot-arm + run_if_changed: ^(assets/.*|cmd/.*|pkg/.*|packaging/.*|vendor/.*|go\.sum|go\.mod|Makefile) + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-credentials-file=/etc/boskos/credentials + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --secret-dir=/usr/local/e2e-reboot-arm-cluster-profile + - --target=e2e-reboot-arm + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /usr/local/e2e-reboot-arm-cluster-profile + name: cluster-profile + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - 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: credentials + path: credentials + secretName: boskos-credentials + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: cluster-profile + projected: + sources: + - secret: + name: cluster-secrets-gcp + - configMap: + name: cluster-profile-gcp + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )e2e-reboot-arm,?($|\s.*) - agent: kubernetes always_run: false branches: @@ -403,6 +644,87 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-router-smoke-test,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^main$ + - ^main- + cluster: build02 + context: ci/prow/e2e-router-smoke-test-arm + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/cloud: gcp + ci-operator.openshift.io/cloud-cluster-profile: gcp + ci-operator.openshift.io/cluster: build02 + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-microshift-main-e2e-router-smoke-test-arm + optional: true + rerun_command: /test e2e-router-smoke-test-arm + run_if_changed: ^(assets/.*|cmd/.*|pkg/.*|packaging/.*|vendor/.*|go\.sum|go\.mod|Makefile|.*\.sh) + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-credentials-file=/etc/boskos/credentials + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --secret-dir=/usr/local/e2e-router-smoke-test-arm-cluster-profile + - --target=e2e-router-smoke-test-arm + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /usr/local/e2e-router-smoke-test-arm-cluster-profile + name: cluster-profile + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - 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: credentials + path: credentials + secretName: boskos-credentials + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: cluster-profile + projected: + sources: + - secret: + name: cluster-secrets-gcp + - configMap: + name: cluster-profile-gcp + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )e2e-router-smoke-test-arm,?($|\s.*) - agent: kubernetes always_run: true branches: diff --git a/ci-operator/jobs/openshift/microshift/openshift-microshift-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift/microshift/openshift-microshift-release-4.13-presubmits.yaml index 455694c0f7072..e49d2da554aff 100644 --- a/ci-operator/jobs/openshift/microshift/openshift-microshift-release-4.13-presubmits.yaml +++ b/ci-operator/jobs/openshift/microshift/openshift-microshift-release-4.13-presubmits.yaml @@ -162,6 +162,87 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-loadbalancer-smoke-test,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^release-4\.13$ + - ^release-4\.13- + cluster: build02 + context: ci/prow/e2e-loadbalancer-smoke-test-arm + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/cloud: gcp + ci-operator.openshift.io/cloud-cluster-profile: gcp + ci-operator.openshift.io/cluster: build02 + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-microshift-release-4.13-e2e-loadbalancer-smoke-test-arm + optional: true + rerun_command: /test e2e-loadbalancer-smoke-test-arm + run_if_changed: ^(assets/.*|cmd/.*|pkg/.*|packaging/.*|vendor/.*|go\.sum|go\.mod|Makefile|.*\.sh) + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-credentials-file=/etc/boskos/credentials + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --secret-dir=/usr/local/e2e-loadbalancer-smoke-test-arm-cluster-profile + - --target=e2e-loadbalancer-smoke-test-arm + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /usr/local/e2e-loadbalancer-smoke-test-arm-cluster-profile + name: cluster-profile + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - 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: credentials + path: credentials + secretName: boskos-credentials + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: cluster-profile + projected: + sources: + - secret: + name: cluster-secrets-gcp + - configMap: + name: cluster-profile-gcp + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )e2e-loadbalancer-smoke-test-arm,?($|\s.*) - agent: kubernetes always_run: false branches: @@ -242,6 +323,86 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-openshift-conformance-reduced,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^release-4\.13$ + - ^release-4\.13- + cluster: build02 + context: ci/prow/e2e-openshift-conformance-reduced-arm + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/cloud: gcp + ci-operator.openshift.io/cloud-cluster-profile: gcp + ci-operator.openshift.io/cluster: build02 + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-microshift-release-4.13-e2e-openshift-conformance-reduced-arm + rerun_command: /test e2e-openshift-conformance-reduced-arm + run_if_changed: ^(assets/.*|cmd/.*|pkg/.*|packaging/.*|vendor/.*|go\.sum|go\.mod|Makefile|.*\.sh) + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-credentials-file=/etc/boskos/credentials + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --secret-dir=/usr/local/e2e-openshift-conformance-reduced-arm-cluster-profile + - --target=e2e-openshift-conformance-reduced-arm + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /usr/local/e2e-openshift-conformance-reduced-arm-cluster-profile + name: cluster-profile + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - 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: credentials + path: credentials + secretName: boskos-credentials + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: cluster-profile + projected: + sources: + - secret: + name: cluster-secrets-gcp + - configMap: + name: cluster-profile-gcp + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )e2e-openshift-conformance-reduced-arm,?($|\s.*) - agent: kubernetes always_run: false branches: @@ -322,6 +483,86 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-reboot,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^release-4\.13$ + - ^release-4\.13- + cluster: build02 + context: ci/prow/e2e-reboot-arm + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/cloud: gcp + ci-operator.openshift.io/cloud-cluster-profile: gcp + ci-operator.openshift.io/cluster: build02 + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-microshift-release-4.13-e2e-reboot-arm + rerun_command: /test e2e-reboot-arm + run_if_changed: ^(assets/.*|cmd/.*|pkg/.*|packaging/.*|vendor/.*|go\.sum|go\.mod|Makefile) + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-credentials-file=/etc/boskos/credentials + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --secret-dir=/usr/local/e2e-reboot-arm-cluster-profile + - --target=e2e-reboot-arm + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /usr/local/e2e-reboot-arm-cluster-profile + name: cluster-profile + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - 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: credentials + path: credentials + secretName: boskos-credentials + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: cluster-profile + projected: + sources: + - secret: + name: cluster-secrets-gcp + - configMap: + name: cluster-profile-gcp + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )e2e-reboot-arm,?($|\s.*) - agent: kubernetes always_run: false branches: @@ -403,6 +644,87 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-router-smoke-test,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^release-4\.13$ + - ^release-4\.13- + cluster: build02 + context: ci/prow/e2e-router-smoke-test-arm + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/cloud: gcp + ci-operator.openshift.io/cloud-cluster-profile: gcp + ci-operator.openshift.io/cluster: build02 + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-microshift-release-4.13-e2e-router-smoke-test-arm + optional: true + rerun_command: /test e2e-router-smoke-test-arm + run_if_changed: ^(assets/.*|cmd/.*|pkg/.*|packaging/.*|vendor/.*|go\.sum|go\.mod|Makefile|.*\.sh) + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-credentials-file=/etc/boskos/credentials + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --secret-dir=/usr/local/e2e-router-smoke-test-arm-cluster-profile + - --target=e2e-router-smoke-test-arm + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /usr/local/e2e-router-smoke-test-arm-cluster-profile + name: cluster-profile + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - 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: credentials + path: credentials + secretName: boskos-credentials + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: cluster-profile + projected: + sources: + - secret: + name: cluster-secrets-gcp + - configMap: + name: cluster-profile-gcp + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )e2e-router-smoke-test-arm,?($|\s.*) - agent: kubernetes always_run: true branches: diff --git a/ci-operator/jobs/openshift/microshift/openshift-microshift-release-4.14-presubmits.yaml b/ci-operator/jobs/openshift/microshift/openshift-microshift-release-4.14-presubmits.yaml index 01f0e5031d695..782b675223c88 100644 --- a/ci-operator/jobs/openshift/microshift/openshift-microshift-release-4.14-presubmits.yaml +++ b/ci-operator/jobs/openshift/microshift/openshift-microshift-release-4.14-presubmits.yaml @@ -162,6 +162,87 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-loadbalancer-smoke-test,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^release-4\.14$ + - ^release-4\.14- + cluster: build02 + context: ci/prow/e2e-loadbalancer-smoke-test-arm + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/cloud: gcp + ci-operator.openshift.io/cloud-cluster-profile: gcp + ci-operator.openshift.io/cluster: build02 + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-microshift-release-4.14-e2e-loadbalancer-smoke-test-arm + optional: true + rerun_command: /test e2e-loadbalancer-smoke-test-arm + run_if_changed: ^(assets/.*|cmd/.*|pkg/.*|packaging/.*|vendor/.*|go\.sum|go\.mod|Makefile|.*\.sh) + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-credentials-file=/etc/boskos/credentials + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --secret-dir=/usr/local/e2e-loadbalancer-smoke-test-arm-cluster-profile + - --target=e2e-loadbalancer-smoke-test-arm + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /usr/local/e2e-loadbalancer-smoke-test-arm-cluster-profile + name: cluster-profile + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - 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: credentials + path: credentials + secretName: boskos-credentials + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: cluster-profile + projected: + sources: + - secret: + name: cluster-secrets-gcp + - configMap: + name: cluster-profile-gcp + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )e2e-loadbalancer-smoke-test-arm,?($|\s.*) - agent: kubernetes always_run: false branches: @@ -242,6 +323,86 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-openshift-conformance-reduced,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^release-4\.14$ + - ^release-4\.14- + cluster: build02 + context: ci/prow/e2e-openshift-conformance-reduced-arm + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/cloud: gcp + ci-operator.openshift.io/cloud-cluster-profile: gcp + ci-operator.openshift.io/cluster: build02 + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-microshift-release-4.14-e2e-openshift-conformance-reduced-arm + rerun_command: /test e2e-openshift-conformance-reduced-arm + run_if_changed: ^(assets/.*|cmd/.*|pkg/.*|packaging/.*|vendor/.*|go\.sum|go\.mod|Makefile|.*\.sh) + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-credentials-file=/etc/boskos/credentials + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --secret-dir=/usr/local/e2e-openshift-conformance-reduced-arm-cluster-profile + - --target=e2e-openshift-conformance-reduced-arm + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /usr/local/e2e-openshift-conformance-reduced-arm-cluster-profile + name: cluster-profile + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - 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: credentials + path: credentials + secretName: boskos-credentials + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: cluster-profile + projected: + sources: + - secret: + name: cluster-secrets-gcp + - configMap: + name: cluster-profile-gcp + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )e2e-openshift-conformance-reduced-arm,?($|\s.*) - agent: kubernetes always_run: false branches: @@ -322,6 +483,86 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-reboot,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^release-4\.14$ + - ^release-4\.14- + cluster: build02 + context: ci/prow/e2e-reboot-arm + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/cloud: gcp + ci-operator.openshift.io/cloud-cluster-profile: gcp + ci-operator.openshift.io/cluster: build02 + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-microshift-release-4.14-e2e-reboot-arm + rerun_command: /test e2e-reboot-arm + run_if_changed: ^(assets/.*|cmd/.*|pkg/.*|packaging/.*|vendor/.*|go\.sum|go\.mod|Makefile) + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-credentials-file=/etc/boskos/credentials + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --secret-dir=/usr/local/e2e-reboot-arm-cluster-profile + - --target=e2e-reboot-arm + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /usr/local/e2e-reboot-arm-cluster-profile + name: cluster-profile + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - 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: credentials + path: credentials + secretName: boskos-credentials + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: cluster-profile + projected: + sources: + - secret: + name: cluster-secrets-gcp + - configMap: + name: cluster-profile-gcp + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )e2e-reboot-arm,?($|\s.*) - agent: kubernetes always_run: false branches: @@ -403,6 +644,87 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-router-smoke-test,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^release-4\.14$ + - ^release-4\.14- + cluster: build02 + context: ci/prow/e2e-router-smoke-test-arm + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/cloud: gcp + ci-operator.openshift.io/cloud-cluster-profile: gcp + ci-operator.openshift.io/cluster: build02 + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-microshift-release-4.14-e2e-router-smoke-test-arm + optional: true + rerun_command: /test e2e-router-smoke-test-arm + run_if_changed: ^(assets/.*|cmd/.*|pkg/.*|packaging/.*|vendor/.*|go\.sum|go\.mod|Makefile|.*\.sh) + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-credentials-file=/etc/boskos/credentials + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --secret-dir=/usr/local/e2e-router-smoke-test-arm-cluster-profile + - --target=e2e-router-smoke-test-arm + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /usr/local/e2e-router-smoke-test-arm-cluster-profile + name: cluster-profile + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - 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: credentials + path: credentials + secretName: boskos-credentials + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: cluster-profile + projected: + sources: + - secret: + name: cluster-secrets-gcp + - configMap: + name: cluster-profile-gcp + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )e2e-router-smoke-test-arm,?($|\s.*) - agent: kubernetes always_run: true branches: diff --git a/ci-operator/step-registry/openshift/microshift/e2e/pre-rpm-install/openshift-microshift-e2e-pre-rpm-install-commands.sh b/ci-operator/step-registry/openshift/microshift/e2e/pre-rpm-install/openshift-microshift-e2e-pre-rpm-install-commands.sh index 365b14a0470e0..400a770f547cb 100644 --- a/ci-operator/step-registry/openshift/microshift/e2e/pre-rpm-install/openshift-microshift-e2e-pre-rpm-install-commands.sh +++ b/ci-operator/step-registry/openshift/microshift/e2e/pre-rpm-install/openshift-microshift-e2e-pre-rpm-install-commands.sh @@ -49,7 +49,7 @@ sudo echo -e 'microshift\tALL=(ALL)\tNOPASSWD: ALL' > /etc/sudoers.d/microshift cd /home/microshift && sudo -nu microshift configure-vm.sh --no-build /etc/crio/openshift-pull-secret dnf install jq firewalld -y -dnf localinstall -y /packages/*.rpm +dnf localinstall -y \$(find /packages/ -iname "*\$(uname -p)*" -or -iname '*noarch*') EOF chmod +x usr/bin/pre_rpm_install.sh diff --git a/ci-operator/step-registry/openshift/microshift/e2e/wait-for-cluster-up/openshift-microshift-e2e-wait-for-cluster-up-commands.sh b/ci-operator/step-registry/openshift/microshift/e2e/wait-for-cluster-up/openshift-microshift-e2e-wait-for-cluster-up-commands.sh index 931f0e5c0d0fb..d562586656308 100644 --- a/ci-operator/step-registry/openshift/microshift/e2e/wait-for-cluster-up/openshift-microshift-e2e-wait-for-cluster-up-commands.sh +++ b/ci-operator/step-registry/openshift/microshift/e2e/wait-for-cluster-up/openshift-microshift-e2e-wait-for-cluster-up-commands.sh @@ -37,8 +37,6 @@ cat > "${HOME}"/start_microshift.sh <<'EOF' #!/bin/bash set -xeuo pipefail -trap "sudo journalctl -eu microshift" EXIT - sudo systemctl enable microshift --now # If condition is true there is podman, it's not a rpm install. From c1e1927a0f9e46c3f3d875854aa96bb3a16504ef Mon Sep 17 00:00:00 2001 From: Patryk Matuszak <305846+pmtk@users.noreply.github.com> Date: Wed, 15 Mar 2023 17:17:57 +0100 Subject: [PATCH 4/4] e2e-reboot: gather cluster-debug-info --- ...ft-microshift-e2e-reboot-tests-commands.sh | 23 +++++++++++++++---- ...shift-microshift-e2e-reboot-tests-ref.yaml | 2 +- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/ci-operator/step-registry/openshift/microshift/e2e/reboot-tests/openshift-microshift-e2e-reboot-tests-commands.sh b/ci-operator/step-registry/openshift/microshift/e2e/reboot-tests/openshift-microshift-e2e-reboot-tests-commands.sh index ad762b078c29b..a1df6c61bbeab 100644 --- a/ci-operator/step-registry/openshift/microshift/e2e/reboot-tests/openshift-microshift-e2e-reboot-tests-commands.sh +++ b/ci-operator/step-registry/openshift/microshift/e2e/reboot-tests/openshift-microshift-e2e-reboot-tests-commands.sh @@ -5,9 +5,9 @@ set -euo pipefail trap 'CHILDREN=$(jobs -p); if test -n "${CHILDREN}"; then kill ${CHILDREN} && wait; fi' TERM INSTANCE_PREFIX="${NAMESPACE}"-"${JOB_NAME_HASH}" -GOOGLE_PROJECT_ID="$(< ${CLUSTER_PROFILE_DIR}/openshift_gcp_project)" +GOOGLE_PROJECT_ID="$(<${CLUSTER_PROFILE_DIR}/openshift_gcp_project)" GOOGLE_COMPUTE_REGION="${LEASED_RESOURCE}" -GOOGLE_COMPUTE_ZONE="$(< ${SHARED_DIR}/openshift_gcp_compute_zone)" +GOOGLE_COMPUTE_ZONE="$(<${SHARED_DIR}/openshift_gcp_compute_zone)" if [[ -z "${GOOGLE_COMPUTE_ZONE}" ]]; then echo "Expected \${SHARED_DIR}/openshift_gcp_compute_zone to contain the GCP zone" exit 1 @@ -33,7 +33,7 @@ gcloud --quiet config set project "${GOOGLE_PROJECT_ID}" gcloud --quiet config set compute/zone "${GOOGLE_COMPUTE_ZONE}" gcloud --quiet config set compute/region "${GOOGLE_COMPUTE_REGION}" -cat > "${HOME}"/reboot-test.sh <<'EOF' +cat >"${HOME}"/reboot-test.sh <<'EOF' #!/bin/bash set -xeuo pipefail @@ -57,10 +57,23 @@ LD_PRELOAD=/usr/lib64/libnss_wrapper.so gcloud compute scp \ --zone "${GOOGLE_COMPUTE_ZONE}" \ --recurse "${HOME}"/reboot-test.sh rhel8user@"${INSTANCE_PREFIX}":~/reboot-test.sh -LD_PRELOAD=/usr/lib64/libnss_wrapper.so gcloud compute --project "${GOOGLE_PROJECT_ID}" ssh \ +LD_PRELOAD=/usr/lib64/libnss_wrapper.so gcloud compute scp \ + --quiet \ + --project "${GOOGLE_PROJECT_ID}" \ + --zone "${GOOGLE_COMPUTE_ZONE}" \ + --recurse /tmp/validate-microshift rhel8user@"${INSTANCE_PREFIX}":~/validate-microshift + +if ! LD_PRELOAD=/usr/lib64/libnss_wrapper.so gcloud compute --project "${GOOGLE_PROJECT_ID}" ssh \ --zone "${GOOGLE_COMPUTE_ZONE}" \ rhel8user@"${INSTANCE_PREFIX}" \ - --command 'sudo ~/reboot-test.sh' + --command 'sudo ~/reboot-test.sh'; then + + LD_PRELOAD=/usr/lib64/libnss_wrapper.so gcloud compute --project "${GOOGLE_PROJECT_ID}" ssh \ + --zone "${GOOGLE_COMPUTE_ZONE}" \ + rhel8user@"${INSTANCE_PREFIX}" \ + --command 'chmod +x ~/validate-microshift/cluster-debug-info.sh && sudo ~/validate-microshift/cluster-debug-info.sh' + exit 1 +fi # now reboot the machine LD_PRELOAD=/usr/lib64/libnss_wrapper.so gcloud compute instances stop "${INSTANCE_PREFIX}" --zone "${GOOGLE_COMPUTE_ZONE}" diff --git a/ci-operator/step-registry/openshift/microshift/e2e/reboot-tests/openshift-microshift-e2e-reboot-tests-ref.yaml b/ci-operator/step-registry/openshift/microshift/e2e/reboot-tests/openshift-microshift-e2e-reboot-tests-ref.yaml index dd2fe7de8784e..ff08dffee4308 100644 --- a/ci-operator/step-registry/openshift/microshift/e2e/reboot-tests/openshift-microshift-e2e-reboot-tests-ref.yaml +++ b/ci-operator/step-registry/openshift/microshift/e2e/reboot-tests/openshift-microshift-e2e-reboot-tests-ref.yaml @@ -1,6 +1,6 @@ ref: as: openshift-microshift-e2e-reboot-tests - from: libvirt-installer + from: microshift-validate grace_period: 10m commands: openshift-microshift-e2e-reboot-tests-commands.sh resources: