From 79d414dab54ceec77aceba25defee9049885336e Mon Sep 17 00:00:00 2001 From: omer Date: Wed, 1 May 2024 15:41:37 +0300 Subject: [PATCH] NO-ISSUE: removing okd-scos config file --- README.md | 1 + ...ift-assisted-service-master__okd-scos.yaml | 53 ---------------- ...t-assisted-service-master-postsubmits.yaml | 62 ------------------- ...ft-assisted-service-master-presubmits.yaml | 59 ------------------ 4 files changed, 1 insertion(+), 174 deletions(-) delete mode 100644 ci-operator/config/openshift/assisted-service/openshift-assisted-service-master__okd-scos.yaml diff --git a/README.md b/README.md index 826764801330..20e0f8aa0e0f 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ # OpenShift Release Tooling + This repository holds OpenShift cluster manifests, component build manifests and CI workflow configuration for OpenShift component repositories for both OKD and OCP. diff --git a/ci-operator/config/openshift/assisted-service/openshift-assisted-service-master__okd-scos.yaml b/ci-operator/config/openshift/assisted-service/openshift-assisted-service-master__okd-scos.yaml deleted file mode 100644 index fbaacd15897a..000000000000 --- a/ci-operator/config/openshift/assisted-service/openshift-assisted-service-master__okd-scos.yaml +++ /dev/null @@ -1,53 +0,0 @@ -base_images: - ocp_builder_rhel-8-golang-1.20-openshift-4.16: - name: builder - namespace: ocp - tag: rhel-8-golang-1.20-openshift-4.16 - origin_scos-4.16_base-stream8: - name: scos-4.16 - namespace: origin - tag: base-stream8 - origin_scos-4.16_cli: - name: scos-4.16 - namespace: origin - tag: cli -build_root: - image_stream_tag: - name: builder - namespace: ocp - tag: rhel-8-golang-1.21-openshift-4.16 -images: -- build_args: - - name: TAGS - value: scos - dockerfile_path: ./Dockerfile.assisted-service.ocp - from: origin_scos-4.16_base-stream8 - inputs: - ocp_builder_rhel-8-golang-1.20-openshift-4.16: - as: - - builder - - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15 - origin_scos-4.16_cli: - as: - - oc-image - - registry.ci.openshift.org/ocp/4.15:cli - to: agent-installer-api-server -promotion: - to: - - name: scos-4.16 - namespace: origin -releases: - latest: - integration: - name: scos-4.16 - namespace: origin -resources: - '*': - requests: - cpu: 100m - memory: 200Mi -zz_generated_metadata: - branch: master - org: openshift - repo: assisted-service - variant: okd-scos diff --git a/ci-operator/jobs/openshift/assisted-service/openshift-assisted-service-master-postsubmits.yaml b/ci-operator/jobs/openshift/assisted-service/openshift-assisted-service-master-postsubmits.yaml index ffb9aee792c5..a72e6f3b2d22 100644 --- a/ci-operator/jobs/openshift/assisted-service/openshift-assisted-service-master-postsubmits.yaml +++ b/ci-operator/jobs/openshift/assisted-service/openshift-assisted-service-master-postsubmits.yaml @@ -536,65 +536,3 @@ postsubmits: - name: result-aggregator secret: secretName: result-aggregator - - agent: kubernetes - always_run: true - branches: - - ^master$ - cluster: build03 - decorate: true - decoration_config: - skip_cloning: true - labels: - ci-operator.openshift.io/is-promotion: "true" - ci-operator.openshift.io/variant: okd-scos - ci.openshift.io/generator: prowgen - max_concurrency: 1 - name: branch-ci-openshift-assisted-service-master-okd-scos-images - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --image-mirror-push-secret=/etc/push-secret/.dockerconfigjson - - --promote - - --report-credentials-file=/etc/report/credentials - - --target=[images] - - --variant=okd-scos - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - 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/push-secret - name: push-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: push-secret - secret: - secretName: registry-push-credentials-ci-central - - name: result-aggregator - secret: - secretName: result-aggregator diff --git a/ci-operator/jobs/openshift/assisted-service/openshift-assisted-service-master-presubmits.yaml b/ci-operator/jobs/openshift/assisted-service/openshift-assisted-service-master-presubmits.yaml index 1293653664bc..83501ecf32fb 100644 --- a/ci-operator/jobs/openshift/assisted-service/openshift-assisted-service-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/assisted-service/openshift-assisted-service-master-presubmits.yaml @@ -5962,65 +5962,6 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )mce-images,?($|\s.*) - - agent: kubernetes - always_run: false - branches: - - ^master$ - - ^master- - cluster: build05 - context: ci/prow/okd-scos-images - decorate: true - decoration_config: - skip_cloning: true - labels: - ci-operator.openshift.io/variant: okd-scos - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-assisted-service-master-okd-scos-images - optional: true - rerun_command: /test okd-scos-images - 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 - - --target=[images] - - --target=[release:latest] - - --variant=okd-scos - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - 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: 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 - trigger: (?m)^/test( | .* )okd-scos-images,?($|\s.*) - agent: kubernetes always_run: false branches: