diff --git a/ci-operator/config/openshift-knative/serverless-operator/openshift-knative-serverless-operator-main__4.6.yaml b/ci-operator/config/openshift-knative/serverless-operator/openshift-knative-serverless-operator-main__4.6.yaml index baefb6b368be5..bc3d52864f0a7 100644 --- a/ci-operator/config/openshift-knative/serverless-operator/openshift-knative-serverless-operator-main__4.6.yaml +++ b/ci-operator/config/openshift-knative/serverless-operator/openshift-knative-serverless-operator-main__4.6.yaml @@ -185,9 +185,15 @@ resources: memory: 200Mi tests: - as: e2e-aws-ocp-46-continuous + cluster_claim: + architecture: amd64 + cloud: aws + owner: openshift-ci + product: ocp + timeout: 1h0m0s + version: "4.6" cron: 0 */12 * * 1-5 steps: - cluster_profile: aws test: - as: serverless-e2e commands: make test-e2e-with-kafka test-upstream-e2e-no-upgrade test-ui-e2e @@ -205,11 +211,17 @@ tests: requests: cpu: 100m memory: 200Mi - workflow: openshift-e2e-aws + workflow: generic-claim - as: upgrade-tests-aws-ocp-46-continuous + cluster_claim: + architecture: amd64 + cloud: aws + owner: openshift-ci + product: ocp + timeout: 1h0m0s + version: "4.6" cron: 0 */12 * * 1-5 steps: - cluster_profile: aws test: - as: serverless-e2e commands: make test-upgrade @@ -227,7 +239,7 @@ tests: requests: cpu: "2" memory: 4Gi - workflow: openshift-e2e-aws + workflow: generic-claim zz_generated_metadata: branch: main org: openshift-knative diff --git a/ci-operator/config/openshift-knative/serverless-operator/openshift-knative-serverless-operator-main__4.7.yaml b/ci-operator/config/openshift-knative/serverless-operator/openshift-knative-serverless-operator-main__4.7.yaml index fe258881ccd6e..64394b4fecc18 100644 --- a/ci-operator/config/openshift-knative/serverless-operator/openshift-knative-serverless-operator-main__4.7.yaml +++ b/ci-operator/config/openshift-knative/serverless-operator/openshift-knative-serverless-operator-main__4.7.yaml @@ -184,9 +184,15 @@ resources: memory: 200Mi tests: - as: operator-e2e-aws-ocp-47 + cluster_claim: + architecture: amd64 + cloud: aws + owner: openshift-ci + product: ocp + timeout: 1h0m0s + version: "4.7" steps: allow_skip_on_success: true - cluster_profile: aws test: - as: operator-e2e commands: make test-e2e-with-kafka @@ -204,11 +210,17 @@ tests: requests: cpu: 100m memory: 200Mi - workflow: openshift-e2e-aws + workflow: generic-claim - as: upstream-e2e-aws-ocp-47 + cluster_claim: + architecture: amd64 + cloud: aws + owner: openshift-ci + product: ocp + timeout: 1h0m0s + version: "4.7" steps: allow_skip_on_success: true - cluster_profile: aws test: - as: serverless-e2e commands: make test-upstream-e2e-no-upgrade @@ -226,11 +238,17 @@ tests: requests: cpu: 100m memory: 200Mi - workflow: openshift-e2e-aws + workflow: generic-claim - as: e2e-aws-ocp-47-continuous + cluster_claim: + architecture: amd64 + cloud: aws + owner: openshift-ci + product: ocp + timeout: 1h0m0s + version: "4.7" cron: 0 */12 * * 1-5 steps: - cluster_profile: aws test: - as: serverless-e2e commands: make test-e2e-with-kafka test-upstream-e2e-no-upgrade test-ui-e2e @@ -248,11 +266,17 @@ tests: requests: cpu: 100m memory: 200Mi - workflow: openshift-e2e-aws + workflow: generic-claim - as: upgrade-tests-aws-ocp-47-continuous + cluster_claim: + architecture: amd64 + cloud: aws + owner: openshift-ci + product: ocp + timeout: 1h0m0s + version: "4.7" cron: 0 */12 * * 1-5 steps: - cluster_profile: aws test: - as: serverless-e2e commands: make test-upgrade @@ -270,11 +294,17 @@ tests: requests: cpu: "2" memory: 4Gi - workflow: openshift-e2e-aws + workflow: generic-claim - as: upgrade-tests-aws-ocp-47 + cluster_claim: + architecture: amd64 + cloud: aws + owner: openshift-ci + product: ocp + timeout: 1h0m0s + version: "4.7" steps: allow_skip_on_success: true - cluster_profile: aws test: - as: serverless-e2e commands: make test-upgrade @@ -292,11 +322,17 @@ tests: requests: cpu: "2" memory: 4Gi - workflow: openshift-e2e-aws + workflow: generic-claim - as: e2e-mesh-ocp-47-continuous cron: 0 */12 * * 1-5 + cluster_claim: + architecture: amd64 + cloud: aws + owner: openshift-ci + product: ocp + timeout: 1h0m0s + version: "4.7" steps: - cluster_profile: aws test: - as: serverless-e2e commands: make test-upstream-e2e-mesh @@ -314,11 +350,17 @@ tests: requests: cpu: 100m memory: 200Mi - workflow: openshift-e2e-aws + workflow: generic-claim - as: upstream-e2e-mesh-aws-ocp-47 + cluster_claim: + architecture: amd64 + cloud: aws + owner: openshift-ci + product: ocp + timeout: 1h0m0s + version: "4.7" steps: allow_skip_on_success: true - cluster_profile: aws test: - as: serverless-e2e commands: make test-upstream-e2e-mesh @@ -336,7 +378,7 @@ tests: requests: cpu: "2" memory: 4Gi - workflow: openshift-e2e-aws + workflow: generic-claim zz_generated_metadata: branch: main org: openshift-knative diff --git a/ci-operator/config/openshift-knative/serverless-operator/openshift-knative-serverless-operator-main__4.8.yaml b/ci-operator/config/openshift-knative/serverless-operator/openshift-knative-serverless-operator-main__4.8.yaml index c3e097acf4fbf..c0d46a50dffb4 100644 --- a/ci-operator/config/openshift-knative/serverless-operator/openshift-knative-serverless-operator-main__4.8.yaml +++ b/ci-operator/config/openshift-knative/serverless-operator/openshift-knative-serverless-operator-main__4.8.yaml @@ -186,9 +186,15 @@ resources: memory: 200Mi tests: - as: e2e-aws-ocp-48-continuous + cluster_claim: + architecture: amd64 + cloud: aws + owner: openshift-ci + product: ocp + timeout: 1h0m0s + version: "4.8" cron: 0 */12 * * 1-5 steps: - cluster_profile: aws test: - as: serverless-e2e commands: make test-e2e-with-kafka test-upstream-e2e-no-upgrade test-ui-e2e @@ -206,11 +212,17 @@ tests: requests: cpu: 100m memory: 200Mi - workflow: openshift-e2e-aws + workflow: generic-claim - as: upgrade-tests-aws-ocp-48-continuous + cluster_claim: + architecture: amd64 + cloud: aws + owner: openshift-ci + product: ocp + timeout: 1h0m0s + version: "4.8" cron: 0 */12 * * 1-5 steps: - cluster_profile: aws test: - as: serverless-e2e commands: make test-upgrade @@ -228,7 +240,7 @@ tests: requests: cpu: "2" memory: 4Gi - workflow: openshift-e2e-aws + workflow: generic-claim zz_generated_metadata: branch: main org: openshift-knative diff --git a/ci-operator/jobs/openshift-knative/serverless-operator/openshift-knative-serverless-operator-main-periodics.yaml b/ci-operator/jobs/openshift-knative/serverless-operator/openshift-knative-serverless-operator-main-periodics.yaml index 3d78de85e9da4..50d3503ba1fd3 100644 --- a/ci-operator/jobs/openshift-knative/serverless-operator/openshift-knative-serverless-operator-main-periodics.yaml +++ b/ci-operator/jobs/openshift-knative/serverless-operator/openshift-knative-serverless-operator-main-periodics.yaml @@ -26,11 +26,10 @@ periodics: containers: - args: - --gcs-upload-secret=/secrets/gcs/service-account.json + - --hive-kubeconfig=/secrets/hive-hive-credentials/kubeconfig - --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-ocp-46-continuous-cluster-profile - --target=e2e-aws-ocp-46-continuous - --variant=4.6 command: @@ -42,17 +41,15 @@ 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-aws-ocp-46-continuous-cluster-profile - name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials readOnly: true + - mountPath: /secrets/hive-hive-credentials + name: hive-hive-credentials + readOnly: true - mountPath: /etc/pull-secret name: pull-secret readOnly: true @@ -61,20 +58,12 @@ 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 - projected: - sources: - - secret: - name: cluster-secrets-aws + - name: hive-hive-credentials + secret: + secretName: hive-hive-credentials - name: pull-secret secret: secretName: registry-pull-credentials @@ -108,11 +97,10 @@ periodics: containers: - args: - --gcs-upload-secret=/secrets/gcs/service-account.json + - --hive-kubeconfig=/secrets/hive-hive-credentials/kubeconfig - --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/upgrade-tests-aws-ocp-46-continuous-cluster-profile - --target=upgrade-tests-aws-ocp-46-continuous - --variant=4.6 command: @@ -124,17 +112,15 @@ 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/upgrade-tests-aws-ocp-46-continuous-cluster-profile - name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials readOnly: true + - mountPath: /secrets/hive-hive-credentials + name: hive-hive-credentials + readOnly: true - mountPath: /etc/pull-secret name: pull-secret readOnly: true @@ -143,20 +129,12 @@ 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 - projected: - sources: - - secret: - name: cluster-secrets-aws + - name: hive-hive-credentials + secret: + secretName: hive-hive-credentials - name: pull-secret secret: secretName: registry-pull-credentials @@ -357,11 +335,10 @@ periodics: containers: - args: - --gcs-upload-secret=/secrets/gcs/service-account.json + - --hive-kubeconfig=/secrets/hive-hive-credentials/kubeconfig - --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-ocp-47-continuous-cluster-profile - --target=e2e-aws-ocp-47-continuous - --variant=4.7 command: @@ -373,17 +350,15 @@ 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-aws-ocp-47-continuous-cluster-profile - name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials readOnly: true + - mountPath: /secrets/hive-hive-credentials + name: hive-hive-credentials + readOnly: true - mountPath: /etc/pull-secret name: pull-secret readOnly: true @@ -392,20 +367,12 @@ 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 - projected: - sources: - - secret: - name: cluster-secrets-aws + - name: hive-hive-credentials + secret: + secretName: hive-hive-credentials - name: pull-secret secret: secretName: registry-pull-credentials @@ -441,11 +408,10 @@ periodics: containers: - args: - --gcs-upload-secret=/secrets/gcs/service-account.json + - --hive-kubeconfig=/secrets/hive-hive-credentials/kubeconfig - --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-mesh-ocp-47-continuous-cluster-profile - --target=e2e-mesh-ocp-47-continuous - --variant=4.7 command: @@ -457,17 +423,15 @@ 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-mesh-ocp-47-continuous-cluster-profile - name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials readOnly: true + - mountPath: /secrets/hive-hive-credentials + name: hive-hive-credentials + readOnly: true - mountPath: /etc/pull-secret name: pull-secret readOnly: true @@ -476,20 +440,12 @@ 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 - projected: - sources: - - secret: - name: cluster-secrets-aws + - name: hive-hive-credentials + secret: + secretName: hive-hive-credentials - name: pull-secret secret: secretName: registry-pull-credentials @@ -610,11 +566,10 @@ periodics: containers: - args: - --gcs-upload-secret=/secrets/gcs/service-account.json + - --hive-kubeconfig=/secrets/hive-hive-credentials/kubeconfig - --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/upgrade-tests-aws-ocp-47-continuous-cluster-profile - --target=upgrade-tests-aws-ocp-47-continuous - --variant=4.7 command: @@ -626,17 +581,15 @@ 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/upgrade-tests-aws-ocp-47-continuous-cluster-profile - name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials readOnly: true + - mountPath: /secrets/hive-hive-credentials + name: hive-hive-credentials + readOnly: true - mountPath: /etc/pull-secret name: pull-secret readOnly: true @@ -645,20 +598,12 @@ 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 - projected: - sources: - - secret: - name: cluster-secrets-aws + - name: hive-hive-credentials + secret: + secretName: hive-hive-credentials - name: pull-secret secret: secretName: registry-pull-credentials @@ -778,11 +723,10 @@ periodics: containers: - args: - --gcs-upload-secret=/secrets/gcs/service-account.json + - --hive-kubeconfig=/secrets/hive-hive-credentials/kubeconfig - --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-ocp-48-continuous-cluster-profile - --target=e2e-aws-ocp-48-continuous - --variant=4.8 command: @@ -794,17 +738,15 @@ 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-aws-ocp-48-continuous-cluster-profile - name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials readOnly: true + - mountPath: /secrets/hive-hive-credentials + name: hive-hive-credentials + readOnly: true - mountPath: /etc/pull-secret name: pull-secret readOnly: true @@ -813,20 +755,12 @@ 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 - projected: - sources: - - secret: - name: cluster-secrets-aws + - name: hive-hive-credentials + secret: + secretName: hive-hive-credentials - name: pull-secret secret: secretName: registry-pull-credentials @@ -861,11 +795,10 @@ periodics: containers: - args: - --gcs-upload-secret=/secrets/gcs/service-account.json + - --hive-kubeconfig=/secrets/hive-hive-credentials/kubeconfig - --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/upgrade-tests-aws-ocp-48-continuous-cluster-profile - --target=upgrade-tests-aws-ocp-48-continuous - --variant=4.8 command: @@ -877,17 +810,15 @@ 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/upgrade-tests-aws-ocp-48-continuous-cluster-profile - name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials readOnly: true + - mountPath: /secrets/hive-hive-credentials + name: hive-hive-credentials + readOnly: true - mountPath: /etc/pull-secret name: pull-secret readOnly: true @@ -896,20 +827,12 @@ 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 - projected: - sources: - - secret: - name: cluster-secrets-aws + - name: hive-hive-credentials + secret: + secretName: hive-hive-credentials - name: pull-secret secret: secretName: registry-pull-credentials diff --git a/ci-operator/jobs/openshift-knative/serverless-operator/openshift-knative-serverless-operator-main-presubmits.yaml b/ci-operator/jobs/openshift-knative/serverless-operator/openshift-knative-serverless-operator-main-presubmits.yaml index dc4550f5d0cb7..5d0405e015ddf 100644 --- a/ci-operator/jobs/openshift-knative/serverless-operator/openshift-knative-serverless-operator-main-presubmits.yaml +++ b/ci-operator/jobs/openshift-knative/serverless-operator/openshift-knative-serverless-operator-main-presubmits.yaml @@ -275,11 +275,10 @@ presubmits: containers: - args: - --gcs-upload-secret=/secrets/gcs/service-account.json + - --hive-kubeconfig=/secrets/hive-hive-credentials/kubeconfig - --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/operator-e2e-aws-ocp-47-cluster-profile - --target=operator-e2e-aws-ocp-47 - --variant=4.7 command: @@ -291,17 +290,15 @@ presubmits: 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/operator-e2e-aws-ocp-47-cluster-profile - name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials readOnly: true + - mountPath: /secrets/hive-hive-credentials + name: hive-hive-credentials + readOnly: true - mountPath: /etc/pull-secret name: pull-secret readOnly: true @@ -310,20 +307,12 @@ presubmits: 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-aws + - name: hive-hive-credentials + secret: + secretName: hive-hive-credentials - name: pull-secret secret: secretName: registry-pull-credentials @@ -352,11 +341,10 @@ presubmits: containers: - args: - --gcs-upload-secret=/secrets/gcs/service-account.json + - --hive-kubeconfig=/secrets/hive-hive-credentials/kubeconfig - --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/upgrade-tests-aws-ocp-47-cluster-profile - --target=upgrade-tests-aws-ocp-47 - --variant=4.7 command: @@ -368,17 +356,15 @@ presubmits: 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/upgrade-tests-aws-ocp-47-cluster-profile - name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials readOnly: true + - mountPath: /secrets/hive-hive-credentials + name: hive-hive-credentials + readOnly: true - mountPath: /etc/pull-secret name: pull-secret readOnly: true @@ -387,20 +373,12 @@ presubmits: 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-aws + - name: hive-hive-credentials + secret: + secretName: hive-hive-credentials - name: pull-secret secret: secretName: registry-pull-credentials @@ -429,11 +407,10 @@ presubmits: containers: - args: - --gcs-upload-secret=/secrets/gcs/service-account.json + - --hive-kubeconfig=/secrets/hive-hive-credentials/kubeconfig - --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/upstream-e2e-aws-ocp-47-cluster-profile - --target=upstream-e2e-aws-ocp-47 - --variant=4.7 command: @@ -445,17 +422,15 @@ presubmits: 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/upstream-e2e-aws-ocp-47-cluster-profile - name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials readOnly: true + - mountPath: /secrets/hive-hive-credentials + name: hive-hive-credentials + readOnly: true - mountPath: /etc/pull-secret name: pull-secret readOnly: true @@ -464,20 +439,12 @@ presubmits: 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-aws + - name: hive-hive-credentials + secret: + secretName: hive-hive-credentials - name: pull-secret secret: secretName: registry-pull-credentials @@ -505,11 +472,10 @@ presubmits: containers: - args: - --gcs-upload-secret=/secrets/gcs/service-account.json + - --hive-kubeconfig=/secrets/hive-hive-credentials/kubeconfig - --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/upstream-e2e-mesh-aws-ocp-47-cluster-profile - --target=upstream-e2e-mesh-aws-ocp-47 - --variant=4.7 command: @@ -521,17 +487,15 @@ presubmits: 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/upstream-e2e-mesh-aws-ocp-47-cluster-profile - name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials readOnly: true + - mountPath: /secrets/hive-hive-credentials + name: hive-hive-credentials + readOnly: true - mountPath: /etc/pull-secret name: pull-secret readOnly: true @@ -540,20 +504,12 @@ presubmits: 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-aws + - name: hive-hive-credentials + secret: + secretName: hive-hive-credentials - name: pull-secret secret: secretName: registry-pull-credentials