From 5a861edc924f1759eb71c46c4ee1045e7d492581 Mon Sep 17 00:00:00 2001 From: Periklis Tsirakidis Date: Tue, 4 Oct 2022 13:18:39 +0200 Subject: [PATCH] [openshift-loki] Add config for branch upstream-v2.7.0-pre-ec0bf70 --- ...hift-loki-upstream-v2.7.0-pre-ec0bf70.yaml | 57 ++++++++++ ...stream-v2.7.0-pre-ec0bf70-postsubmits.yaml | 56 +++++++++ ...pstream-v2.7.0-pre-ec0bf70-presubmits.yaml | 107 ++++++++++++++++++ 3 files changed, 220 insertions(+) create mode 100644 ci-operator/config/openshift/loki/openshift-loki-upstream-v2.7.0-pre-ec0bf70.yaml create mode 100644 ci-operator/jobs/openshift/loki/openshift-loki-upstream-v2.7.0-pre-ec0bf70-postsubmits.yaml create mode 100644 ci-operator/jobs/openshift/loki/openshift-loki-upstream-v2.7.0-pre-ec0bf70-presubmits.yaml diff --git a/ci-operator/config/openshift/loki/openshift-loki-upstream-v2.7.0-pre-ec0bf70.yaml b/ci-operator/config/openshift/loki/openshift-loki-upstream-v2.7.0-pre-ec0bf70.yaml new file mode 100644 index 000000000000..a65c92a68b79 --- /dev/null +++ b/ci-operator/config/openshift/loki/openshift-loki-upstream-v2.7.0-pre-ec0bf70.yaml @@ -0,0 +1,57 @@ +base_images: + base: + name: "4.11" + namespace: ocp + tag: base + ocp_builder_rhel-8-golang-1.18-openshift-4.11: + name: builder + namespace: ocp + tag: rhel-8-golang-1.18-openshift-4.11 +build_root: + image_stream_tag: + name: release + namespace: openshift + tag: golang-1.18 +images: +- dockerfile_path: Dockerfile.ocp + from: base + inputs: + ocp_builder_rhel-8-golang-1.18-openshift-4.11: + as: + - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11 + to: loki +- dockerfile_path: Dockerfile.promtail.ocp + from: base + inputs: + ocp_builder_rhel-8-golang-1.18-openshift-4.11: + as: + - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11 + to: promtail +promotion: + name: v2.7.0-pre + namespace: logging +releases: + latest: + release: + channel: stable + version: "4.11" +resources: + '*': + requests: + cpu: 100m + memory: 200Mi +tests: +- as: test + steps: + test: + - as: unit + commands: GOFLAGS="" make test + from: src + resources: + requests: + cpu: 100m + memory: 200Mi +zz_generated_metadata: + branch: upstream-v2.7.0-pre-ec0bf70 + org: openshift + repo: loki diff --git a/ci-operator/jobs/openshift/loki/openshift-loki-upstream-v2.7.0-pre-ec0bf70-postsubmits.yaml b/ci-operator/jobs/openshift/loki/openshift-loki-upstream-v2.7.0-pre-ec0bf70-postsubmits.yaml new file mode 100644 index 000000000000..c05fb68b2de5 --- /dev/null +++ b/ci-operator/jobs/openshift/loki/openshift-loki-upstream-v2.7.0-pre-ec0bf70-postsubmits.yaml @@ -0,0 +1,56 @@ +postsubmits: + openshift/loki: + - agent: kubernetes + always_run: true + branches: + - ^upstream-v2\.7\.0-pre-ec0bf70$ + cluster: build01 + 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-openshift-loki-upstream-v2.7.0-pre-ec0bf70-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: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /secrets/gcs + name: gcs-credentials + 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: 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/loki/openshift-loki-upstream-v2.7.0-pre-ec0bf70-presubmits.yaml b/ci-operator/jobs/openshift/loki/openshift-loki-upstream-v2.7.0-pre-ec0bf70-presubmits.yaml new file mode 100644 index 000000000000..3913c6a56b7b --- /dev/null +++ b/ci-operator/jobs/openshift/loki/openshift-loki-upstream-v2.7.0-pre-ec0bf70-presubmits.yaml @@ -0,0 +1,107 @@ +presubmits: + openshift/loki: + - agent: kubernetes + always_run: true + branches: + - ^upstream-v2\.7\.0-pre-ec0bf70$ + - ^upstream-v2\.7\.0-pre-ec0bf70- + cluster: build01 + 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-openshift-loki-upstream-v2.7.0-pre-ec0bf70-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: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )images,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - ^upstream-v2\.7\.0-pre-ec0bf70$ + - ^upstream-v2\.7\.0-pre-ec0bf70- + cluster: build01 + context: ci/prow/test + decorate: true + decoration_config: + skip_cloning: true + labels: + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-loki-upstream-v2.7.0-pre-ec0bf70-test + rerun_command: /test test + 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=test + 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: /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: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )test,?($|\s.*)