diff --git a/ci-operator/config/redhat-appstudio/tssc-cli/redhat-appstudio-tssc-cli-main.yaml b/ci-operator/config/redhat-appstudio/tssc-cli/redhat-appstudio-tssc-cli-main.yaml index 740d0ddee1a7e..20ef2ea56b8c6 100644 --- a/ci-operator/config/redhat-appstudio/tssc-cli/redhat-appstudio-tssc-cli-main.yaml +++ b/ci-operator/config/redhat-appstudio/tssc-cli/redhat-appstudio-tssc-cli-main.yaml @@ -1,114 +1,19 @@ -base_images: - cli: - name: "4.15" - namespace: ocp - tag: cli - rhtap-installer: - name: redhat-appstudio - namespace: ci - tag: rhtap-installer build_root: - project_image: - dockerfile_path: ci/Dockerfile -images: -- dockerfile_path: ci/Dockerfile - from: src - to: rhtap-cli -- dockerfile_literal: | - FROM src - COPY oc /usr/bin/oc - from: src - inputs: - cli: - paths: - - destination_dir: . - source_path: /usr/bin/oc - to: src-oc -- dockerfile_literal: |- - FROM src - SHELL ["/bin/bash", "-c"] - RUN yum install -y skopeo - RUN curl -Lso /usr/local/bin/jq https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64 && chmod +x /usr/local/bin/jq - from: src - to: rhdh-prerelease-install -promotion: - to: - - name: redhat-appstudio - namespace: ci -releases: - latest: - release: - architecture: amd64 - channel: fast - version: "4.15" + image_stream_tag: + name: release + namespace: openshift + tag: golang-1.22 resources: '*': - limits: - memory: 4Gi requests: cpu: 100m memory: 200Mi tests: -- as: rhtap-cli-gitops-prerelease - cluster_claim: - architecture: amd64 - cloud: aws - labels: - region: us-east-2 - owner: konflux - product: ocp - timeout: 1h0m0s - version: "4.15" - cron: 0 0 30 7 * - steps: - env: - NEW_OPERATOR_CHANNEL: latest - NEW_SOURCE: gitops-iib - PRODUCT: gitops - RHTAP_ENABLE_TPA: "true" - test: - - ref: redhat-appstudio-rhtap-installer-e2e-test - workflow: redhat-appstudio-rhtap-cli-gitops-prerelease -- as: rhtap-cli-pipelines-prerelease - cluster_claim: - architecture: amd64 - cloud: aws - labels: - region: us-east-2 - owner: konflux - product: ocp - timeout: 1h0m0s - version: "4.15" - cron: 0 2 * * 1 - steps: - env: - NEW_OPERATOR_CHANNEL: latest - NEW_SOURCE: pipelines-iib - PRODUCT: pipelines - RHTAP_ENABLE_TPA: "true" - test: - - ref: redhat-appstudio-rhtap-installer-e2e-test - workflow: redhat-appstudio-rhtap-cli-pipelines-prerelease -- as: rhtap-cli-rhdh-prerelease - cluster_claim: - architecture: amd64 - cloud: aws - labels: - region: us-east-2 - owner: konflux - product: ocp - timeout: 1h0m0s - version: "4.15" - cron: 0 4 * * 1 - steps: - env: - NEW_OPERATOR_CHANNEL: fast - NEW_SOURCE: rhdh-fast - PRODUCT: rhdh - RHTAP_ENABLE_TPA: "true" - test: - - ref: redhat-appstudio-rhtap-installer-e2e-test - workflow: redhat-appstudio-rhtap-cli-rhdh-prerelease +- as: test + commands: echo "Hello, World!" + container: + from: src + cron: 0 6 1 1 * zz_generated_metadata: branch: main org: redhat-appstudio diff --git a/ci-operator/jobs/redhat-appstudio/tssc-cli/redhat-appstudio-tssc-cli-main-periodics.yaml b/ci-operator/jobs/redhat-appstudio/tssc-cli/redhat-appstudio-tssc-cli-main-periodics.yaml index fc733a31cce06..29052a039bd20 100644 --- a/ci-operator/jobs/redhat-appstudio/tssc-cli/redhat-appstudio-tssc-cli-main-periodics.yaml +++ b/ci-operator/jobs/redhat-appstudio/tssc-cli/redhat-appstudio-tssc-cli-main-periodics.yaml @@ -1,7 +1,7 @@ periodics: - agent: kubernetes cluster: build06 - cron: 0 0 30 7 * + cron: 0 6 1 1 * decorate: true decoration_config: skip_cloning: true @@ -12,16 +12,14 @@ periodics: labels: ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-redhat-appstudio-tssc-cli-main-rhtap-cli-gitops-prerelease + name: periodic-ci-redhat-appstudio-tssc-cli-main-test spec: 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 - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --target=rhtap-cli-gitops-prerelease + - --target=test command: - ci-operator image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest @@ -31,149 +29,9 @@ periodics: 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/hive-hive-credentials - name: hive-hive-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: hive-hive-credentials - secret: - secretName: hive-hive-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: build06 - cron: 0 2 * * 1 - decorate: true - decoration_config: - skip_cloning: true - extra_refs: - - base_ref: main - org: redhat-appstudio - repo: tssc-cli - labels: - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-redhat-appstudio-tssc-cli-main-rhtap-cli-pipelines-prerelease - spec: - 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 - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --target=rhtap-cli-pipelines-prerelease - command: - - ci-operator - image: quay-proxy.ci.openshift.org/openshift/ci:ci_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/hive-hive-credentials - name: hive-hive-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: hive-hive-credentials - secret: - secretName: hive-hive-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: build06 - cron: 0 4 * * 1 - decorate: true - decoration_config: - skip_cloning: true - extra_refs: - - base_ref: main - org: redhat-appstudio - repo: tssc-cli - labels: - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-redhat-appstudio-tssc-cli-main-rhtap-cli-rhdh-prerelease - spec: - 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 - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --target=rhtap-cli-rhdh-prerelease - command: - - ci-operator - image: quay-proxy.ci.openshift.org/openshift/ci:ci_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/hive-hive-credentials - name: hive-hive-credentials - readOnly: true - mountPath: /secrets/manifest-tool name: manifest-tool-local-pusher readOnly: true @@ -185,12 +43,6 @@ periodics: readOnly: true serviceAccountName: ci-operator volumes: - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: hive-hive-credentials - secret: - secretName: hive-hive-credentials - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher diff --git a/ci-operator/jobs/redhat-appstudio/tssc-cli/redhat-appstudio-tssc-cli-main-postsubmits.yaml b/ci-operator/jobs/redhat-appstudio/tssc-cli/redhat-appstudio-tssc-cli-main-postsubmits.yaml deleted file mode 100644 index 3eb27f9f9c705..0000000000000 --- a/ci-operator/jobs/redhat-appstudio/tssc-cli/redhat-appstudio-tssc-cli-main-postsubmits.yaml +++ /dev/null @@ -1,62 +0,0 @@ -postsubmits: - redhat-appstudio/tssc-cli: - - agent: kubernetes - always_run: true - branches: - - ^main$ - cluster: build04 - decorate: true - decoration_config: - skip_cloning: true - labels: - ci-operator.openshift.io/is-promotion: "true" - ci.openshift.io/generator: prowgen - max_concurrency: 1 - name: branch-ci-redhat-appstudio-tssc-cli-main-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] - command: - - ci-operator - image: quay-proxy.ci.openshift.org/openshift/ci:ci_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/redhat-appstudio/tssc-cli/redhat-appstudio-tssc-cli-main-presubmits.yaml b/ci-operator/jobs/redhat-appstudio/tssc-cli/redhat-appstudio-tssc-cli-main-presubmits.yaml deleted file mode 100644 index 64d777c415978..0000000000000 --- a/ci-operator/jobs/redhat-appstudio/tssc-cli/redhat-appstudio-tssc-cli-main-presubmits.yaml +++ /dev/null @@ -1,57 +0,0 @@ -presubmits: - redhat-appstudio/tssc-cli: - - agent: kubernetes - always_run: true - branches: - - ^main$ - - ^main- - cluster: build04 - context: ci/prow/images - decorate: true - decoration_config: - skip_cloning: true - labels: - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-redhat-appstudio-tssc-cli-main-images - rerun_command: /test 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] - command: - - ci-operator - image: quay-proxy.ci.openshift.org/openshift/ci:ci_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( | .* )images,?($|\s.*)