diff --git a/ci-operator/config/openshift/loki/openshift-loki-upstream-v3.7.2.yaml b/ci-operator/config/openshift/loki/openshift-loki-upstream-v3.7.2.yaml new file mode 100644 index 0000000000000..15d2c8d1732be --- /dev/null +++ b/ci-operator/config/openshift/loki/openshift-loki-upstream-v3.7.2.yaml @@ -0,0 +1,46 @@ +base_images: + base: + name: "4.21" + namespace: ocp + tag: base-rhel9 +build_root: + image_stream_tag: + name: builder + namespace: ocp + tag: rhel-9-golang-1.26-openshift-5.0 +images: + items: + - additional_architectures: + - arm64 + dockerfile_path: Dockerfile.ocp + from: base + to: loki +promotion: + to: + - namespace: logging + tag: v3.7.2 +releases: + latest: + release: + channel: stable + version: "4.21" +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-v3.7.2 + org: openshift + repo: loki diff --git a/ci-operator/jobs/openshift/loki/openshift-loki-upstream-v3.7.2-postsubmits.yaml b/ci-operator/jobs/openshift/loki/openshift-loki-upstream-v3.7.2-postsubmits.yaml new file mode 100644 index 0000000000000..7420eb87a9148 --- /dev/null +++ b/ci-operator/jobs/openshift/loki/openshift-loki-upstream-v3.7.2-postsubmits.yaml @@ -0,0 +1,64 @@ +postsubmits: + openshift/loki: + - agent: kubernetes + always_run: true + branches: + - ^upstream-v3\.7\.2$ + cluster: build05 + decorate: true + decoration_config: + sparse_checkout_files: + - Dockerfile.ocp + labels: + capability/arm64: arm64 + ci-operator.openshift.io/is-promotion: "true" + ci.openshift.io/generator: prowgen + max_concurrency: 1 + name: branch-ci-openshift-loki-upstream-v3.7.2-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/openshift/loki/openshift-loki-upstream-v3.7.2-presubmits.yaml b/ci-operator/jobs/openshift/loki/openshift-loki-upstream-v3.7.2-presubmits.yaml new file mode 100644 index 0000000000000..88cdefe4cd5f2 --- /dev/null +++ b/ci-operator/jobs/openshift/loki/openshift-loki-upstream-v3.7.2-presubmits.yaml @@ -0,0 +1,140 @@ +presubmits: + openshift/loki: + - agent: kubernetes + always_run: true + branches: + - ^upstream-v3\.7\.2$ + - ^upstream-v3\.7\.2- + cluster: build03 + context: ci/prow/images + decorate: true + decoration_config: + sparse_checkout_files: + - Dockerfile.ocp + labels: + capability/arm64: arm64 + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-loki-upstream-v3.7.2-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.*) + - agent: kubernetes + always_run: true + branches: + - ^upstream-v3\.7\.2$ + - ^upstream-v3\.7\.2- + cluster: build13 + context: ci/prow/test + decorate: true + decoration_config: + sparse_checkout_files: + - Dockerfile.ocp + labels: + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-loki-upstream-v3.7.2-test + rerun_command: /test test + 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 + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=test + 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 + trigger: (?m)^/test( | .* )test,?($|\s.*) diff --git a/core-services/image-mirroring/openshift-logging/mapping_logging_loki_quay b/core-services/image-mirroring/openshift-logging/mapping_logging_loki_quay index 89b937a7b5ab1..d59f1ba5ec84f 100644 --- a/core-services/image-mirroring/openshift-logging/mapping_logging_loki_quay +++ b/core-services/image-mirroring/openshift-logging/mapping_logging_loki_quay @@ -2,5 +2,6 @@ quay-proxy.ci.openshift.org/openshift/ci:logging_loki_v3.4.3 quay.io/openshift-l quay-proxy.ci.openshift.org/openshift/ci:logging_promtail_v3.4.3 quay.io/openshift-logging/promtail:v3.4.3 quay-proxy.ci.openshift.org/openshift/ci:logging_loki_v3.5.7 quay.io/openshift-logging/loki:v3.5.7 quay-proxy.ci.openshift.org/openshift/ci:logging_promtail_v3.5.7 quay.io/openshift-logging/promtail:v3.5.7 -quay-proxy.ci.openshift.org/openshift/ci:logging_loki_v3.6.5 quay.io/openshift-logging/loki:v3.6.5 quay.io/openshift-logging/loki:latest +quay-proxy.ci.openshift.org/openshift/ci:logging_loki_v3.6.5 quay.io/openshift-logging/loki:v3.6.5 quay-proxy.ci.openshift.org/openshift/ci:logging_promtail_v3.6.5 quay.io/openshift-logging/promtail:v3.6.5 quay.io/openshift-logging/promtail:latest +quay-proxy.ci.openshift.org/openshift/ci:logging_loki_v3.7.2 quay.io/openshift-logging/loki:v3.7.2 quay.io/openshift-logging/loki:latest