From 1761e6b46c401fb4066be8bf1459fa595b0e03cd Mon Sep 17 00:00:00 2001 From: Liangquan Li Date: Wed, 12 Jun 2024 16:03:42 +0800 Subject: [PATCH] HyperShift: Enable MCE 2.6 agent CI (#52882) --- ...ft-hypershift-release-4.16__periodics.yaml | 99 +++- ...ift-hypershift-release-4.16-periodics.yaml | 491 ++++++++++++++---- ...mce-agent-create-hostedcluster-commands.sh | 7 +- 3 files changed, 480 insertions(+), 117 deletions(-) diff --git a/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.16__periodics.yaml b/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.16__periodics.yaml index 3722bf548981..6aff8d818499 100644 --- a/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.16__periodics.yaml +++ b/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.16__periodics.yaml @@ -1,28 +1,4 @@ base_images: - assisted-image-service: - name: ocm-2.11 - namespace: edge-infrastructure - tag: assisted-image-service - assisted-installer: - name: ocm-2.11 - namespace: edge-infrastructure - tag: assisted-installer - assisted-installer-agent: - name: ocm-2.11 - namespace: edge-infrastructure - tag: assisted-installer-agent - assisted-installer-controller: - name: ocm-2.11 - namespace: edge-infrastructure - tag: assisted-installer-controller - assisted-service: - name: ocm-2.11 - namespace: edge-infrastructure - tag: assisted-service - assisted-service-index: - name: assisted-service-index - namespace: edge-infrastructure - tag: latest assisted-service-scripts: name: ocm-2.11 namespace: edge-infrastructure @@ -123,13 +99,80 @@ tests: env: MCE_VERSION: "2.6" workflow: hypershift-mce-aws-conformance -- as: e2e-agent-ovn-conformance +- as: e2e-mce-agent-connected-ovn-ipv4-manual-conformance + cluster: build05 + cron: 0 0 * * * + steps: + cluster_profile: equinix-ocp-metal + env: + LVM_OPERATOR_SUB_CHANNEL: stable-4.16 + MCE_VERSION: "2.6" + workflow: hypershift-mce-agent-manual-conformance +- as: e2e-mce-agent-connected-ovn-dualstack-manual-conformance + cluster: build05 cron: 0 4 * * * steps: cluster_profile: equinix-ocp-metal - dependencies: - INDEX_IMAGE: assisted-service-index - workflow: hypershift-agent-conformance + env: + DEVSCRIPTS_CONFIG: | + IP_STACK=v4v6 + NETWORK_TYPE=OVNKubernetes + WORKER_MEMORY=14336 + VM_EXTRADISKS=true + VM_EXTRADISKS_LIST=vda + VM_EXTRADISKS_SIZE=500G + NUM_EXTRA_WORKERS=3 + IP_STACK: v4v6 + LVM_OPERATOR_SUB_CHANNEL: stable-4.16 + MCE_VERSION: "2.6" + workflow: hypershift-mce-agent-manual-conformance +- as: e2e-mce-agent-connected-ovn-ipv4-metal3-conformance + cluster: build05 + cron: 0 8 * * * + steps: + cluster_profile: equinix-ocp-metal + env: + LVM_OPERATOR_SUB_CHANNEL: stable-4.16 + MCE_VERSION: "2.6" + workflow: hypershift-mce-agent-metal3-conformance +- as: e2e-mce-agent-connected-ovn-dualstack-metal3-conformance + cluster: build05 + cron: 0 12 * * * + steps: + cluster_profile: equinix-ocp-metal + env: + DEVSCRIPTS_CONFIG: | + IP_STACK=v4v6 + NETWORK_TYPE=OVNKubernetes + WORKER_MEMORY=14336 + VM_EXTRADISKS=true + VM_EXTRADISKS_LIST=vda + VM_EXTRADISKS_SIZE=500G + NUM_EXTRA_WORKERS=3 + IP_STACK: v4v6 + LVM_OPERATOR_SUB_CHANNEL: stable-4.16 + MCE_VERSION: "2.6" + workflow: hypershift-mce-agent-metal3-conformance +- as: e2e-mce-agent-connected-ovn-ipv4-metal3-compact-conformance + cluster: build05 + cron: 0 16 * * * + steps: + cluster_profile: equinix-ocp-metal + env: + DEVSCRIPTS_CONFIG: | + IP_STACK=v4 + NUM_WORKERS=0 + NUM_MASTERS=3 + MASTER_VCPU=16 + MASTER_MEMORY=32768 + NETWORK_TYPE=OVNKubernetes + VM_EXTRADISKS=true + VM_EXTRADISKS_LIST=vda + VM_EXTRADISKS_SIZE=500G + NUM_EXTRA_WORKERS=2 + LVM_OPERATOR_SUB_CHANNEL: stable-4.16 + MCE_VERSION: "2.6" + workflow: hypershift-mce-agent-metal3-conformance - as: e2e-kubevirt-metal-ovn cron: 0 4 * * * steps: diff --git a/ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.16-periodics.yaml b/ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.16-periodics.yaml index 4fd962ec2e95..effdf6d339b7 100644 --- a/ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.16-periodics.yaml +++ b/ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.16-periodics.yaml @@ -1,7 +1,7 @@ periodics: - agent: kubernetes - cluster: build03 - cron: 0 4 * * * + cluster: build02 + cron: 0 */6 * * * decorate: true decoration_config: skip_cloning: true @@ -10,13 +10,13 @@ periodics: org: openshift repo: hypershift labels: - ci-operator.openshift.io/cloud: equinix-ocp-metal - ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal + ci-operator.openshift.io/cloud: hypershift + ci-operator.openshift.io/cloud-cluster-profile: hypershift ci-operator.openshift.io/variant: periodics ci.openshift.io/generator: prowgen job-release: "4.16" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-hypershift-release-4.16-periodics-e2e-agent-ovn-conformance + name: periodic-ci-openshift-hypershift-release-4.16-periodics-e2e-aws-ovn spec: containers: - args: @@ -25,8 +25,8 @@ periodics: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-agent-ovn-conformance-cluster-profile - - --target=e2e-agent-ovn-conformance + - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile + - --target=e2e-aws-ovn - --variant=periodics command: - ci-operator @@ -43,7 +43,7 @@ periodics: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-agent-ovn-conformance-cluster-profile + - mountPath: /usr/local/e2e-aws-ovn-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -70,7 +70,7 @@ periodics: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-equinix-ocp-metal + secretName: cluster-secrets-hypershift - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher @@ -82,7 +82,7 @@ periodics: secretName: result-aggregator - agent: kubernetes cluster: build02 - cron: 0 */6 * * * + cron: 0 2 * * * decorate: true decoration_config: skip_cloning: true @@ -97,7 +97,7 @@ periodics: ci.openshift.io/generator: prowgen job-release: "4.16" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-hypershift-release-4.16-periodics-e2e-aws-ovn + name: periodic-ci-openshift-hypershift-release-4.16-periodics-e2e-aws-ovn-conformance spec: containers: - args: @@ -106,8 +106,8 @@ periodics: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile - - --target=e2e-aws-ovn + - --secret-dir=/usr/local/e2e-aws-ovn-conformance-cluster-profile + - --target=e2e-aws-ovn-conformance - --variant=periodics command: - ci-operator @@ -124,7 +124,7 @@ periodics: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-aws-ovn-cluster-profile + - mountPath: /usr/local/e2e-aws-ovn-conformance-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -163,7 +163,7 @@ periodics: secretName: result-aggregator - agent: kubernetes cluster: build02 - cron: 0 2 * * * + cron: 0 1 * * * decorate: true decoration_config: skip_cloning: true @@ -178,7 +178,7 @@ periodics: ci.openshift.io/generator: prowgen job-release: "4.16" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-hypershift-release-4.16-periodics-e2e-aws-ovn-conformance + name: periodic-ci-openshift-hypershift-release-4.16-periodics-e2e-aws-ovn-conformance-serial spec: containers: - args: @@ -187,8 +187,8 @@ periodics: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-aws-ovn-conformance-cluster-profile - - --target=e2e-aws-ovn-conformance + - --secret-dir=/usr/local/e2e-aws-ovn-conformance-serial-cluster-profile + - --target=e2e-aws-ovn-conformance-serial - --variant=periodics command: - ci-operator @@ -205,7 +205,169 @@ periodics: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-aws-ovn-conformance-cluster-profile + - mountPath: /usr/local/e2e-aws-ovn-conformance-serial-cluster-profile + name: cluster-profile + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + 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 + secret: + secretName: cluster-secrets-hypershift + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator +- agent: kubernetes + cluster: build03 + cron: 0 4 * * * + decorate: true + decoration_config: + skip_cloning: true + extra_refs: + - base_ref: release-4.16 + org: openshift + repo: hypershift + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/variant: periodics + ci.openshift.io/generator: prowgen + job-release: "4.16" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-openshift-hypershift-release-4.16-periodics-e2e-aws-ovn-mce-conformance + 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-aws-ovn-mce-conformance-cluster-profile + - --target=e2e-aws-ovn-mce-conformance + - --variant=periodics + 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-aws-ovn-mce-conformance-cluster-profile + name: cluster-profile + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + 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 + secret: + secretName: cluster-secrets-aws + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator +- agent: kubernetes + cluster: build02 + cron: 0 3 * * * + decorate: true + decoration_config: + skip_cloning: true + extra_refs: + - base_ref: release-4.16 + org: openshift + repo: hypershift + labels: + ci-operator.openshift.io/cloud: hypershift + ci-operator.openshift.io/cloud-cluster-profile: hypershift + ci-operator.openshift.io/variant: periodics + ci.openshift.io/generator: prowgen + job-release: "4.16" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-openshift-hypershift-release-4.16-periodics-e2e-aws-ovn-proxy-conformance + 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-aws-ovn-proxy-conformance-cluster-profile + - --target=e2e-aws-ovn-proxy-conformance + - --variant=periodics + 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-aws-ovn-proxy-conformance-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -244,7 +406,7 @@ periodics: secretName: result-aggregator - agent: kubernetes cluster: build02 - cron: 0 1 * * * + cron: 0 2 * * * decorate: true decoration_config: skip_cloning: true @@ -259,7 +421,7 @@ periodics: ci.openshift.io/generator: prowgen job-release: "4.16" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-hypershift-release-4.16-periodics-e2e-aws-ovn-conformance-serial + name: periodic-ci-openshift-hypershift-release-4.16-periodics-e2e-azure-conformance spec: containers: - args: @@ -268,8 +430,8 @@ periodics: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-aws-ovn-conformance-serial-cluster-profile - - --target=e2e-aws-ovn-conformance-serial + - --secret-dir=/usr/local/e2e-azure-conformance-cluster-profile + - --target=e2e-azure-conformance - --variant=periodics command: - ci-operator @@ -286,7 +448,7 @@ periodics: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-aws-ovn-conformance-serial-cluster-profile + - mountPath: /usr/local/e2e-azure-conformance-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -323,6 +485,132 @@ periodics: - name: result-aggregator secret: secretName: result-aggregator +- agent: kubernetes + cluster: build02 + cron: 0 4 * * * + decorate: true + decoration_config: + skip_cloning: true + extra_refs: + - base_ref: release-4.16 + org: openshift + repo: hypershift + labels: + ci-operator.openshift.io/variant: periodics + ci.openshift.io/generator: prowgen + job-release: "4.16" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-openshift-hypershift-release-4.16-periodics-e2e-ibmcloud-iks + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=e2e-ibmcloud-iks + - --variant=periodics + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator +- agent: kubernetes + cluster: build02 + cron: 0 4 * * * + decorate: true + decoration_config: + skip_cloning: true + extra_refs: + - base_ref: release-4.16 + org: openshift + repo: hypershift + labels: + ci-operator.openshift.io/variant: periodics + ci.openshift.io/generator: prowgen + job-release: "4.16" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-openshift-hypershift-release-4.16-periodics-e2e-ibmcloud-roks + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=e2e-ibmcloud-roks + - --variant=periodics + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator - agent: kubernetes cluster: build03 cron: 0 4 * * * @@ -340,7 +628,7 @@ periodics: ci.openshift.io/generator: prowgen job-release: "4.16" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-hypershift-release-4.16-periodics-e2e-aws-ovn-mce-conformance + name: periodic-ci-openshift-hypershift-release-4.16-periodics-e2e-kubevirt-aws-csi spec: containers: - args: @@ -349,8 +637,8 @@ periodics: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-aws-ovn-mce-conformance-cluster-profile - - --target=e2e-aws-ovn-mce-conformance + - --secret-dir=/usr/local/e2e-kubevirt-aws-csi-cluster-profile + - --target=e2e-kubevirt-aws-csi - --variant=periodics command: - ci-operator @@ -367,7 +655,7 @@ periodics: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-aws-ovn-mce-conformance-cluster-profile + - mountPath: /usr/local/e2e-kubevirt-aws-csi-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -405,8 +693,8 @@ periodics: secret: secretName: result-aggregator - agent: kubernetes - cluster: build02 - cron: 0 3 * * * + cluster: build03 + cron: 0 8 * * * decorate: true decoration_config: skip_cloning: true @@ -415,13 +703,13 @@ periodics: org: openshift repo: hypershift labels: - ci-operator.openshift.io/cloud: hypershift - ci-operator.openshift.io/cloud-cluster-profile: hypershift + ci-operator.openshift.io/cloud: equinix-ocp-metal + ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal ci-operator.openshift.io/variant: periodics ci.openshift.io/generator: prowgen job-release: "4.16" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-hypershift-release-4.16-periodics-e2e-aws-ovn-proxy-conformance + name: periodic-ci-openshift-hypershift-release-4.16-periodics-e2e-kubevirt-metal-disconnected spec: containers: - args: @@ -430,8 +718,8 @@ periodics: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-aws-ovn-proxy-conformance-cluster-profile - - --target=e2e-aws-ovn-proxy-conformance + - --secret-dir=/usr/local/e2e-kubevirt-metal-disconnected-cluster-profile + - --target=e2e-kubevirt-metal-disconnected - --variant=periodics command: - ci-operator @@ -448,7 +736,7 @@ periodics: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-aws-ovn-proxy-conformance-cluster-profile + - mountPath: /usr/local/e2e-kubevirt-metal-disconnected-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -475,7 +763,7 @@ periodics: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-hypershift + secretName: cluster-secrets-equinix-ocp-metal - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher @@ -486,8 +774,8 @@ periodics: secret: secretName: result-aggregator - agent: kubernetes - cluster: build02 - cron: 0 2 * * * + cluster: build03 + cron: 0 4 * * * decorate: true decoration_config: skip_cloning: true @@ -496,13 +784,13 @@ periodics: org: openshift repo: hypershift labels: - ci-operator.openshift.io/cloud: hypershift - ci-operator.openshift.io/cloud-cluster-profile: hypershift + ci-operator.openshift.io/cloud: equinix-ocp-metal + ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal ci-operator.openshift.io/variant: periodics ci.openshift.io/generator: prowgen job-release: "4.16" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-hypershift-release-4.16-periodics-e2e-azure-conformance + name: periodic-ci-openshift-hypershift-release-4.16-periodics-e2e-kubevirt-metal-ovn spec: containers: - args: @@ -511,8 +799,8 @@ periodics: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-azure-conformance-cluster-profile - - --target=e2e-azure-conformance + - --secret-dir=/usr/local/e2e-kubevirt-metal-ovn-cluster-profile + - --target=e2e-kubevirt-metal-ovn - --variant=periodics command: - ci-operator @@ -529,7 +817,7 @@ periodics: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-azure-conformance-cluster-profile + - mountPath: /usr/local/e2e-kubevirt-metal-ovn-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -556,7 +844,7 @@ periodics: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-hypershift + secretName: cluster-secrets-equinix-ocp-metal - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher @@ -567,7 +855,7 @@ periodics: secret: secretName: result-aggregator - agent: kubernetes - cluster: build02 + cluster: build05 cron: 0 4 * * * decorate: true decoration_config: @@ -577,19 +865,24 @@ periodics: org: openshift repo: hypershift labels: + ci-operator.openshift.io/cloud: equinix-ocp-metal + ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal + ci-operator.openshift.io/cluster: build05 ci-operator.openshift.io/variant: periodics ci.openshift.io/generator: prowgen job-release: "4.16" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-hypershift-release-4.16-periodics-e2e-ibmcloud-iks + name: periodic-ci-openshift-hypershift-release-4.16-periodics-e2e-mce-agent-connected-ovn-dualstack-manual-conformance 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 - - --target=e2e-ibmcloud-iks + - --secret-dir=/usr/local/e2e-mce-agent-connected-ovn-dualstack-manual-conformance-cluster-profile + - --target=e2e-mce-agent-connected-ovn-dualstack-manual-conformance - --variant=periodics command: - ci-operator @@ -600,9 +893,14 @@ periodics: 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-mce-agent-connected-ovn-dualstack-manual-conformance-cluster-profile + name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials readOnly: true @@ -617,9 +915,18 @@ periodics: 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 + secret: + secretName: cluster-secrets-equinix-ocp-metal - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher @@ -630,8 +937,8 @@ periodics: secret: secretName: result-aggregator - agent: kubernetes - cluster: build02 - cron: 0 4 * * * + cluster: build05 + cron: 0 12 * * * decorate: true decoration_config: skip_cloning: true @@ -640,19 +947,24 @@ periodics: org: openshift repo: hypershift labels: + ci-operator.openshift.io/cloud: equinix-ocp-metal + ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal + ci-operator.openshift.io/cluster: build05 ci-operator.openshift.io/variant: periodics ci.openshift.io/generator: prowgen job-release: "4.16" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-hypershift-release-4.16-periodics-e2e-ibmcloud-roks + name: periodic-ci-openshift-hypershift-release-4.16-periodics-e2e-mce-agent-connected-ovn-dualstack-metal3-conformance 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 - - --target=e2e-ibmcloud-roks + - --secret-dir=/usr/local/e2e-mce-agent-connected-ovn-dualstack-metal3-conformance-cluster-profile + - --target=e2e-mce-agent-connected-ovn-dualstack-metal3-conformance - --variant=periodics command: - ci-operator @@ -663,9 +975,14 @@ periodics: 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-mce-agent-connected-ovn-dualstack-metal3-conformance-cluster-profile + name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials readOnly: true @@ -680,9 +997,18 @@ periodics: 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 + secret: + secretName: cluster-secrets-equinix-ocp-metal - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher @@ -693,8 +1019,8 @@ periodics: secret: secretName: result-aggregator - agent: kubernetes - cluster: build03 - cron: 0 4 * * * + cluster: build05 + cron: 0 0 * * * decorate: true decoration_config: skip_cloning: true @@ -703,20 +1029,14 @@ periodics: org: openshift repo: hypershift labels: - ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/cloud: equinix-ocp-metal + ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal + ci-operator.openshift.io/cluster: build05 ci-operator.openshift.io/variant: periodics ci.openshift.io/generator: prowgen job-release: "4.16" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-hypershift-release-4.16-periodics-e2e-kubevirt-aws-csi - reporter_config: - slack: - channel: '#hypershift-kubevirt-platform' - job_states_to_report: - - failure - report_template: ':volcano: Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. - <{{.Status.URL}}|View logs> :volcano:' + name: periodic-ci-openshift-hypershift-release-4.16-periodics-e2e-mce-agent-connected-ovn-ipv4-manual-conformance spec: containers: - args: @@ -725,8 +1045,8 @@ periodics: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-kubevirt-aws-csi-cluster-profile - - --target=e2e-kubevirt-aws-csi + - --secret-dir=/usr/local/e2e-mce-agent-connected-ovn-ipv4-manual-conformance-cluster-profile + - --target=e2e-mce-agent-connected-ovn-ipv4-manual-conformance - --variant=periodics command: - ci-operator @@ -743,7 +1063,7 @@ periodics: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-kubevirt-aws-csi-cluster-profile + - mountPath: /usr/local/e2e-mce-agent-connected-ovn-ipv4-manual-conformance-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -770,7 +1090,7 @@ periodics: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-aws + secretName: cluster-secrets-equinix-ocp-metal - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher @@ -781,8 +1101,8 @@ periodics: secret: secretName: result-aggregator - agent: kubernetes - cluster: build03 - cron: 0 8 * * * + cluster: build05 + cron: 0 16 * * * decorate: true decoration_config: skip_cloning: true @@ -793,11 +1113,12 @@ periodics: labels: ci-operator.openshift.io/cloud: equinix-ocp-metal ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal + ci-operator.openshift.io/cluster: build05 ci-operator.openshift.io/variant: periodics ci.openshift.io/generator: prowgen job-release: "4.16" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-hypershift-release-4.16-periodics-e2e-kubevirt-metal-disconnected + name: periodic-ci-openshift-hypershift-release-4.16-periodics-e2e-mce-agent-connected-ovn-ipv4-metal3-compact-conformance spec: containers: - args: @@ -806,8 +1127,8 @@ periodics: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-kubevirt-metal-disconnected-cluster-profile - - --target=e2e-kubevirt-metal-disconnected + - --secret-dir=/usr/local/e2e-mce-agent-connected-ovn-ipv4-metal3-compact-conformance-cluster-profile + - --target=e2e-mce-agent-connected-ovn-ipv4-metal3-compact-conformance - --variant=periodics command: - ci-operator @@ -824,7 +1145,7 @@ periodics: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-kubevirt-metal-disconnected-cluster-profile + - mountPath: /usr/local/e2e-mce-agent-connected-ovn-ipv4-metal3-compact-conformance-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -862,8 +1183,8 @@ periodics: secret: secretName: result-aggregator - agent: kubernetes - cluster: build03 - cron: 0 4 * * * + cluster: build05 + cron: 0 8 * * * decorate: true decoration_config: skip_cloning: true @@ -874,18 +1195,12 @@ periodics: labels: ci-operator.openshift.io/cloud: equinix-ocp-metal ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal + ci-operator.openshift.io/cluster: build05 ci-operator.openshift.io/variant: periodics ci.openshift.io/generator: prowgen job-release: "4.16" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-hypershift-release-4.16-periodics-e2e-kubevirt-metal-ovn - reporter_config: - slack: - channel: '#hypershift-kubevirt-platform' - job_states_to_report: - - failure - report_template: ':volcano: Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. - <{{.Status.URL}}|View logs> :volcano:' + name: periodic-ci-openshift-hypershift-release-4.16-periodics-e2e-mce-agent-connected-ovn-ipv4-metal3-conformance spec: containers: - args: @@ -894,8 +1209,8 @@ periodics: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-kubevirt-metal-ovn-cluster-profile - - --target=e2e-kubevirt-metal-ovn + - --secret-dir=/usr/local/e2e-mce-agent-connected-ovn-ipv4-metal3-conformance-cluster-profile + - --target=e2e-mce-agent-connected-ovn-ipv4-metal3-conformance - --variant=periodics command: - ci-operator @@ -912,7 +1227,7 @@ periodics: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-kubevirt-metal-ovn-cluster-profile + - mountPath: /usr/local/e2e-mce-agent-connected-ovn-ipv4-metal3-conformance-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials diff --git a/ci-operator/step-registry/hypershift/mce/agent/create/hostedcluster/hypershift-mce-agent-create-hostedcluster-commands.sh b/ci-operator/step-registry/hypershift/mce/agent/create/hostedcluster/hypershift-mce-agent-create-hostedcluster-commands.sh index 6f9d0b399adb..08b166200334 100644 --- a/ci-operator/step-registry/hypershift/mce/agent/create/hostedcluster/hypershift-mce-agent-create-hostedcluster-commands.sh +++ b/ci-operator/step-registry/hypershift/mce/agent/create/hostedcluster/hypershift-mce-agent-create-hostedcluster-commands.sh @@ -7,6 +7,7 @@ trap 'FRC=$?; [[ $FRC != 0 ]] && debug' EXIT TERM debug() { oc get --namespace=local-cluster hostedcluster/${CLUSTER_NAME} -o yaml oc get pod -n local-cluster-${CLUSTER_NAME} -oyaml + oc logs -n hypershift -lapp=operator --tail=-1 -c operator | grep -v "info" > $ARTIFACT_DIR/hypershift-errorlog.txt } if [ -f "${SHARED_DIR}/proxy-conf.sh" ] ; then @@ -43,6 +44,7 @@ if [[ "${IP_STACK}" == "v4v6" ]]; then IP_STACK_COMMAND="--default-dual" fi +/tmp/${HYPERSHIFT_NAME} --version /tmp/${HYPERSHIFT_NAME} create cluster agent ${EXTRA_ARGS} ${IP_STACK_COMMAND} \ --name=${CLUSTER_NAME} \ --pull-secret=/tmp/.dockerconfigjson \ @@ -51,7 +53,10 @@ fi --base-domain=${BASEDOMAIN} \ --api-server-address=api.${CLUSTER_NAME}.${BASEDOMAIN} \ --image-content-sources "${SHARED_DIR}/mgmt_icsp.yaml" \ - --ssh-key="${SHARED_DIR}/id_rsa.pub" + --ssh-key="${SHARED_DIR}/id_rsa.pub" \ + --render > /tmp/cluster.yaml +cat /tmp/cluster.yaml +oc apply -f /tmp/cluster.yaml ### workaround for https://issues.redhat.com/browse/DPTP-4024 ### --release-image ${RELEASE_IMAGE} use default release-image