diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.22__periodics.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.22__periodics.yaml index b1c6a613f41bb..56e54de51a0aa 100644 --- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.22__periodics.yaml +++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.22__periodics.yaml @@ -409,6 +409,22 @@ tests: test: - chain: mco-e2e-test workflow: openshift-e2e-aws-proxy +- always_run: false + as: e2e-aws-mco-disconnected-longduration + cron: 17 6 * * 6 + shard_count: 3 + steps: + cluster_profile: aws-mco-qe + env: + BASE_DOMAIN: ocp-mco-qe.devcluster.openshift.com + COMPUTE_NODE_REPLICAS: "2" + FEATURE_SET: TechPreviewNoUpgrade + TEST_ARGS: --disable-monitor=audit-log-analyzer + TEST_SKIPS: \[Skipped:Disconnected\] + TEST_SUITE: openshift/machine-config-operator/longduration + test: + - chain: mco-e2e-test + workflow: ocp-mco-e2e-aws-disconnected - always_run: false as: e2e-aws-ovn-day1-ocl capabilities: diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.23__periodics.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.23__periodics.yaml index 01d00d3d578d4..1ead1cd18a9a7 100644 --- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.23__periodics.yaml +++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.23__periodics.yaml @@ -409,6 +409,22 @@ tests: test: - chain: mco-e2e-test workflow: openshift-e2e-aws-proxy +- always_run: false + as: e2e-aws-mco-disconnected-longduration + cron: 17 6 * * 6 + shard_count: 3 + steps: + cluster_profile: aws-mco-qe + env: + BASE_DOMAIN: ocp-mco-qe.devcluster.openshift.com + COMPUTE_NODE_REPLICAS: "2" + FEATURE_SET: TechPreviewNoUpgrade + TEST_ARGS: --disable-monitor=audit-log-analyzer + TEST_SKIPS: \[Skipped:Disconnected\] + TEST_SUITE: openshift/machine-config-operator/longduration + test: + - chain: mco-e2e-test + workflow: ocp-mco-e2e-aws-disconnected - always_run: false as: e2e-aws-ovn-day1-ocl capabilities: diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-5.0__periodics.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-5.0__periodics.yaml index e7fba61f23a47..8b5baefa3d0b6 100644 --- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-5.0__periodics.yaml +++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-5.0__periodics.yaml @@ -436,6 +436,22 @@ tests: test: - chain: mco-e2e-test workflow: openshift-e2e-aws-proxy +- always_run: false + as: e2e-aws-mco-disconnected-longduration + cron: 17 6 * * 6 + shard_count: 3 + steps: + cluster_profile: aws-mco-qe + env: + BASE_DOMAIN: ocp-mco-qe.devcluster.openshift.com + COMPUTE_NODE_REPLICAS: "2" + FEATURE_SET: TechPreviewNoUpgrade + TEST_ARGS: --disable-monitor=audit-log-analyzer + TEST_SKIPS: \[Skipped:Disconnected\] + TEST_SUITE: openshift/machine-config-operator/longduration + test: + - chain: mco-e2e-test + workflow: ocp-mco-e2e-aws-disconnected - always_run: false as: e2e-aws-ovn-day1-ocl capabilities: diff --git a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.22-periodics.yaml b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.22-periodics.yaml index c18b209e44eb6..7eedaac0ec3f5 100644 --- a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.22-periodics.yaml +++ b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.22-periodics.yaml @@ -484,6 +484,273 @@ periodics: - name: result-aggregator secret: secretName: result-aggregator +- agent: kubernetes + cluster: build09 + cron: 17 6 * * 6 + decorate: true + decoration_config: + sparse_checkout_files: + - .ci-operator.yaml + - Dockerfile.rhel7 + extra_refs: + - base_ref: release-4.22 + org: openshift + repo: machine-config-operator + sparse_checkout_files: + - .ci-operator.yaml + - Dockerfile.rhel7 + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: aws-mco-qe + ci-operator.openshift.io/variant: periodics + ci.openshift.io/generator: prowgen + job-release: "4.22" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-openshift-machine-config-operator-release-4.22-periodics-e2e-aws-mco-disconnected-longduration-1of3 + 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 + - --multi-stage-param=SHARD_ARGS="--shard-count 3 --shard-id 1" + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=e2e-aws-mco-disconnected-longduration + - --variant=periodics + command: + - ci-operator + env: + - name: HTTP_SERVER_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + ports: + - containerPort: 8080 + name: http + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - 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: boskos + secret: + items: + - key: credentials + path: credentials + secretName: boskos-credentials + - 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: build09 + cron: 17 6 * * 6 + decorate: true + decoration_config: + sparse_checkout_files: + - .ci-operator.yaml + - Dockerfile.rhel7 + extra_refs: + - base_ref: release-4.22 + org: openshift + repo: machine-config-operator + sparse_checkout_files: + - .ci-operator.yaml + - Dockerfile.rhel7 + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: aws-mco-qe + ci-operator.openshift.io/variant: periodics + ci.openshift.io/generator: prowgen + job-release: "4.22" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-openshift-machine-config-operator-release-4.22-periodics-e2e-aws-mco-disconnected-longduration-2of3 + 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 + - --multi-stage-param=SHARD_ARGS="--shard-count 3 --shard-id 2" + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=e2e-aws-mco-disconnected-longduration + - --variant=periodics + command: + - ci-operator + env: + - name: HTTP_SERVER_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + ports: + - containerPort: 8080 + name: http + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - 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: boskos + secret: + items: + - key: credentials + path: credentials + secretName: boskos-credentials + - 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: build09 + cron: 17 6 * * 6 + decorate: true + decoration_config: + sparse_checkout_files: + - .ci-operator.yaml + - Dockerfile.rhel7 + extra_refs: + - base_ref: release-4.22 + org: openshift + repo: machine-config-operator + sparse_checkout_files: + - .ci-operator.yaml + - Dockerfile.rhel7 + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: aws-mco-qe + ci-operator.openshift.io/variant: periodics + ci.openshift.io/generator: prowgen + job-release: "4.22" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-openshift-machine-config-operator-release-4.22-periodics-e2e-aws-mco-disconnected-longduration-3of3 + 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 + - --multi-stage-param=SHARD_ARGS="--shard-count 3 --shard-id 3" + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=e2e-aws-mco-disconnected-longduration + - --variant=periodics + command: + - ci-operator + env: + - name: HTTP_SERVER_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + ports: + - containerPort: 8080 + name: http + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - 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: boskos + secret: + items: + - key: credentials + path: credentials + secretName: boskos-credentials + - 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: build09 decorate: true diff --git a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.23-periodics.yaml b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.23-periodics.yaml index faa7053bea0c2..db899ee23b32b 100644 --- a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.23-periodics.yaml +++ b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.23-periodics.yaml @@ -484,6 +484,273 @@ periodics: - name: result-aggregator secret: secretName: result-aggregator +- agent: kubernetes + cluster: build09 + cron: 17 6 * * 6 + decorate: true + decoration_config: + sparse_checkout_files: + - .ci-operator.yaml + - Dockerfile.rhel7 + extra_refs: + - base_ref: release-4.23 + org: openshift + repo: machine-config-operator + sparse_checkout_files: + - .ci-operator.yaml + - Dockerfile.rhel7 + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: aws-mco-qe + ci-operator.openshift.io/variant: periodics + ci.openshift.io/generator: prowgen + job-release: "4.23" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-openshift-machine-config-operator-release-4.23-periodics-e2e-aws-mco-disconnected-longduration-1of3 + 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 + - --multi-stage-param=SHARD_ARGS="--shard-count 3 --shard-id 1" + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=e2e-aws-mco-disconnected-longduration + - --variant=periodics + command: + - ci-operator + env: + - name: HTTP_SERVER_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + ports: + - containerPort: 8080 + name: http + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - 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: boskos + secret: + items: + - key: credentials + path: credentials + secretName: boskos-credentials + - 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: build09 + cron: 17 6 * * 6 + decorate: true + decoration_config: + sparse_checkout_files: + - .ci-operator.yaml + - Dockerfile.rhel7 + extra_refs: + - base_ref: release-4.23 + org: openshift + repo: machine-config-operator + sparse_checkout_files: + - .ci-operator.yaml + - Dockerfile.rhel7 + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: aws-mco-qe + ci-operator.openshift.io/variant: periodics + ci.openshift.io/generator: prowgen + job-release: "4.23" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-openshift-machine-config-operator-release-4.23-periodics-e2e-aws-mco-disconnected-longduration-2of3 + 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 + - --multi-stage-param=SHARD_ARGS="--shard-count 3 --shard-id 2" + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=e2e-aws-mco-disconnected-longduration + - --variant=periodics + command: + - ci-operator + env: + - name: HTTP_SERVER_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + ports: + - containerPort: 8080 + name: http + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - 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: boskos + secret: + items: + - key: credentials + path: credentials + secretName: boskos-credentials + - 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: build09 + cron: 17 6 * * 6 + decorate: true + decoration_config: + sparse_checkout_files: + - .ci-operator.yaml + - Dockerfile.rhel7 + extra_refs: + - base_ref: release-4.23 + org: openshift + repo: machine-config-operator + sparse_checkout_files: + - .ci-operator.yaml + - Dockerfile.rhel7 + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: aws-mco-qe + ci-operator.openshift.io/variant: periodics + ci.openshift.io/generator: prowgen + job-release: "4.23" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-openshift-machine-config-operator-release-4.23-periodics-e2e-aws-mco-disconnected-longduration-3of3 + 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 + - --multi-stage-param=SHARD_ARGS="--shard-count 3 --shard-id 3" + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=e2e-aws-mco-disconnected-longduration + - --variant=periodics + command: + - ci-operator + env: + - name: HTTP_SERVER_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + ports: + - containerPort: 8080 + name: http + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - 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: boskos + secret: + items: + - key: credentials + path: credentials + secretName: boskos-credentials + - 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: build09 decorate: true diff --git a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-5.0-periodics.yaml b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-5.0-periodics.yaml index aca32d82bb9a0..cf3ff71cc1a3e 100644 --- a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-5.0-periodics.yaml +++ b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-5.0-periodics.yaml @@ -484,6 +484,273 @@ periodics: - name: result-aggregator secret: secretName: result-aggregator +- agent: kubernetes + cluster: build07 + cron: 17 6 * * 6 + decorate: true + decoration_config: + sparse_checkout_files: + - .ci-operator.yaml + - Dockerfile.rhel7 + extra_refs: + - base_ref: release-5.0 + org: openshift + repo: machine-config-operator + sparse_checkout_files: + - .ci-operator.yaml + - Dockerfile.rhel7 + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: aws-mco-qe + ci-operator.openshift.io/variant: periodics + ci.openshift.io/generator: prowgen + job-release: "5.0" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-openshift-machine-config-operator-release-5.0-periodics-e2e-aws-mco-disconnected-longduration-1of3 + 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 + - --multi-stage-param=SHARD_ARGS="--shard-count 3 --shard-id 1" + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=e2e-aws-mco-disconnected-longduration + - --variant=periodics + command: + - ci-operator + env: + - name: HTTP_SERVER_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + ports: + - containerPort: 8080 + name: http + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - 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: boskos + secret: + items: + - key: credentials + path: credentials + secretName: boskos-credentials + - 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: build07 + cron: 17 6 * * 6 + decorate: true + decoration_config: + sparse_checkout_files: + - .ci-operator.yaml + - Dockerfile.rhel7 + extra_refs: + - base_ref: release-5.0 + org: openshift + repo: machine-config-operator + sparse_checkout_files: + - .ci-operator.yaml + - Dockerfile.rhel7 + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: aws-mco-qe + ci-operator.openshift.io/variant: periodics + ci.openshift.io/generator: prowgen + job-release: "5.0" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-openshift-machine-config-operator-release-5.0-periodics-e2e-aws-mco-disconnected-longduration-2of3 + 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 + - --multi-stage-param=SHARD_ARGS="--shard-count 3 --shard-id 2" + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=e2e-aws-mco-disconnected-longduration + - --variant=periodics + command: + - ci-operator + env: + - name: HTTP_SERVER_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + ports: + - containerPort: 8080 + name: http + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - 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: boskos + secret: + items: + - key: credentials + path: credentials + secretName: boskos-credentials + - 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: build07 + cron: 17 6 * * 6 + decorate: true + decoration_config: + sparse_checkout_files: + - .ci-operator.yaml + - Dockerfile.rhel7 + extra_refs: + - base_ref: release-5.0 + org: openshift + repo: machine-config-operator + sparse_checkout_files: + - .ci-operator.yaml + - Dockerfile.rhel7 + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: aws-mco-qe + ci-operator.openshift.io/variant: periodics + ci.openshift.io/generator: prowgen + job-release: "5.0" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-openshift-machine-config-operator-release-5.0-periodics-e2e-aws-mco-disconnected-longduration-3of3 + 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 + - --multi-stage-param=SHARD_ARGS="--shard-count 3 --shard-id 3" + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=e2e-aws-mco-disconnected-longduration + - --variant=periodics + command: + - ci-operator + env: + - name: HTTP_SERVER_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + ports: + - containerPort: 8080 + name: http + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - 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: boskos + secret: + items: + - key: credentials + path: credentials + secretName: boskos-credentials + - 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: build07 decorate: true diff --git a/ci-operator/step-registry/mco/conf/day2/add-mcoqe-robot-to-pull-secret/mco-conf-day2-add-mcoqe-robot-to-pull-secret-commands.sh b/ci-operator/step-registry/mco/conf/day2/add-mcoqe-robot-to-pull-secret/mco-conf-day2-add-mcoqe-robot-to-pull-secret-commands.sh index 97178112804aa..a533d3994352e 100644 --- a/ci-operator/step-registry/mco/conf/day2/add-mcoqe-robot-to-pull-secret/mco-conf-day2-add-mcoqe-robot-to-pull-secret-commands.sh +++ b/ci-operator/step-registry/mco/conf/day2/add-mcoqe-robot-to-pull-secret/mco-conf-day2-add-mcoqe-robot-to-pull-secret-commands.sh @@ -9,6 +9,12 @@ cluster_pull_secret_file="$TMP_DIR/cluster-pull-secret.json" mcoqe_pull_secret_file="$TMP_DIR/mcoqe-pull-secret.json" merged_pull_secret_file="$TMP_DIR/merged-pull-secret.json" +# setup proxy for disconnected environments +if test -f "${SHARED_DIR}/proxy-conf.sh" +then + source "${SHARED_DIR}/proxy-conf.sh" +fi + if oc get secret pull-secret -n openshift-config; then echo "Adding mcoqe robot account to the global clutser pull secret" else diff --git a/ci-operator/step-registry/mco/conf/day2/disconnected-setup/OWNERS b/ci-operator/step-registry/mco/conf/day2/disconnected-setup/OWNERS new file mode 100644 index 0000000000000..9f21db30b5920 --- /dev/null +++ b/ci-operator/step-registry/mco/conf/day2/disconnected-setup/OWNERS @@ -0,0 +1,20 @@ +approvers: + - djoshy + - dkhater-redhat + - yuqi-zhang + - cheesesashimi + - umohnani8 + - isabella-janssen + - pablintino + - sergiordlr + - ptalgulk01 +reviewers: + - djoshy + - dkhater-redhat + - yuqi-zhang + - cheesesashimi + - umohnani8 + - isabella-janssen + - pablintino + - sergiordlr + - ptalgulk01 diff --git a/ci-operator/step-registry/mco/conf/day2/disconnected-setup/mco-conf-day2-disconnected-setup-commands.sh b/ci-operator/step-registry/mco/conf/day2/disconnected-setup/mco-conf-day2-disconnected-setup-commands.sh new file mode 100755 index 0000000000000..e17ede77195c5 --- /dev/null +++ b/ci-operator/step-registry/mco/conf/day2/disconnected-setup/mco-conf-day2-disconnected-setup-commands.sh @@ -0,0 +1,111 @@ +#!/bin/bash + +set -euo pipefail + +if test -f "${SHARED_DIR}/proxy-conf.sh"; then + source "${SHARED_DIR}/proxy-conf.sh" +fi + +MIRROR_REGISTRY_HOST=$(head -n 1 "${SHARED_DIR}/mirror_registry_url") +MIRROR_PROXY_REGISTRY_QUAY=$(echo "${MIRROR_REGISTRY_HOST}" | sed 's/5000/6001/g') + +echo "Mirror registry host: ${MIRROR_REGISTRY_HOST}" +echo "Quay proxy registry: ${MIRROR_PROXY_REGISTRY_QUAY}" + +# --- Add mirror registry auth to cluster pull-secret --- + +echo "Adding mirror registry auth to cluster pull-secret" +oc extract secret/pull-secret -n openshift-config --confirm --to /tmp + +[[ $- == *x* ]] && WAS_TRACING=true || WAS_TRACING=false +set +x +registry_cred=$(head -n 1 "/var/run/vault/mirror-registry/registry_creds" | base64 -w 0) +jq --argjson a \ + "{\"${MIRROR_PROXY_REGISTRY_QUAY}\": {\"auth\": \"${registry_cred}\"}}" \ + '.auths |= . + $a' /tmp/.dockerconfigjson > /tmp/new-dockerconfigjson +$WAS_TRACING && set -x + +oc set data secret/pull-secret -n openshift-config \ + --from-file=.dockerconfigjson=/tmp/new-dockerconfigjson +echo "Mirror registry auth added to pull-secret" + +# --- Add mirror registry CA to cluster trust --- + +echo "Adding mirror registry CA to cluster trust" +QE_ADDITIONAL_CA_FILE="/var/run/vault/mirror-registry/client_ca.crt" +REGISTRY_HOST=$(echo "${MIRROR_PROXY_REGISTRY_QUAY}" | cut -d: -f1) + +oc create configmap registry-config \ + --from-file="${REGISTRY_HOST}..5000=${QE_ADDITIONAL_CA_FILE}" \ + --from-file="${REGISTRY_HOST}..6001=${QE_ADDITIONAL_CA_FILE}" \ + -n openshift-config + +oc patch image.config.openshift.io/cluster \ + --patch '{"spec":{"additionalTrustedCA":{"name":"registry-config"}}}' \ + --type=merge +echo "Mirror registry CA configured" + +# --- Create ICSP or IDMS+ITMS for quay.io/openshifttest --- + +echo "Creating image mirror policy for quay.io/openshifttest" +icsp_num=$(oc get ImageContentSourcePolicy -o name 2>/dev/null | wc -l) +kube_minor=$(oc version -o json | jq -r '.serverVersion.minor' | sed 's/+$//') + +if [[ ${icsp_num} -gt 0 || ${kube_minor} -lt 26 ]]; then + cat <