-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
openshift-loki: Add ci config for branch upstream-v3.2.1 (#57972)
- Loading branch information
Showing
4 changed files
with
247 additions
and
2 deletions.
There are no files selected for viewing
60 changes: 60 additions & 0 deletions
60
ci-operator/config/openshift/loki/openshift-loki-upstream-v3.2.1.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| base_images: | ||
| base: | ||
| name: builder | ||
| namespace: ocp | ||
| tag: rhel-9-openshift-enterprise-base-4.16.multi | ||
| ocp_builder_rhel-9-golang-1.22-builder-multi-openshift-4.17: | ||
| name: builder | ||
| namespace: ocp | ||
| tag: rhel-9-golang-1.22-builder-multi-openshift-4.17 | ||
| build_root: | ||
| image_stream_tag: | ||
| name: builder | ||
| namespace: ocp | ||
| tag: rhel-9-golang-1.22-builder-multi-openshift-4.17 | ||
| images: | ||
| - dockerfile_path: Dockerfile.ocp | ||
| from: base | ||
| inputs: | ||
| ocp_builder_rhel-9-golang-1.22-builder-multi-openshift-4.17: | ||
| as: | ||
| - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 | ||
| multi_arch: true | ||
| to: loki | ||
| - dockerfile_path: Dockerfile.promtail.ocp | ||
| from: base | ||
| inputs: | ||
| ocp_builder_rhel-9-golang-1.22-builder-multi-openshift-4.17: | ||
| as: | ||
| - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 | ||
| multi_arch: true | ||
| to: promtail | ||
| promotion: | ||
| to: | ||
| - name: v3.2.1 | ||
| namespace: logging | ||
| releases: | ||
| latest: | ||
| release: | ||
| channel: stable | ||
| version: "4.16" | ||
| 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.2.1 | ||
| org: openshift | ||
| repo: loki |
63 changes: 63 additions & 0 deletions
63
ci-operator/jobs/openshift/loki/openshift-loki-upstream-v3.2.1-postsubmits.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| postsubmits: | ||
| openshift/loki: | ||
| - agent: kubernetes | ||
| always_run: true | ||
| branches: | ||
| - ^upstream-v3\.2\.1$ | ||
| cluster: build10 | ||
| decorate: true | ||
| decoration_config: | ||
| skip_cloning: true | ||
| labels: | ||
| ci-operator.openshift.io/cluster: build10 | ||
| ci-operator.openshift.io/is-promotion: "true" | ||
| ci.openshift.io/generator: prowgen | ||
| max_concurrency: 1 | ||
| name: branch-ci-openshift-loki-upstream-v3.2.1-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: /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 |
120 changes: 120 additions & 0 deletions
120
ci-operator/jobs/openshift/loki/openshift-loki-upstream-v3.2.1-presubmits.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,120 @@ | ||
| presubmits: | ||
| openshift/loki: | ||
| - agent: kubernetes | ||
| always_run: true | ||
| branches: | ||
| - ^upstream-v3\.2\.1$ | ||
| - ^upstream-v3\.2\.1- | ||
| cluster: build10 | ||
| context: ci/prow/images | ||
| decorate: true | ||
| decoration_config: | ||
| skip_cloning: true | ||
| labels: | ||
| ci-operator.openshift.io/cluster: build10 | ||
| ci.openshift.io/generator: prowgen | ||
| pj-rehearse.openshift.io/can-be-rehearsed: "true" | ||
| name: pull-ci-openshift-loki-upstream-v3.2.1-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: /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\.2\.1$ | ||
| - ^upstream-v3\.2\.1- | ||
| cluster: build03 | ||
| 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-v3.2.1-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: /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: 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.*) |
6 changes: 4 additions & 2 deletions
6
core-services/image-mirroring/openshift-logging/mapping_logging_loki_quay
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,4 @@ | ||
| registry.ci.openshift.org/logging/v3.2.0:loki quay.io/openshift-logging/loki:v3.2.0 quay.io/openshift-logging/loki:latest | ||
| registry.ci.openshift.org/logging/v3.2.0:promtail quay.io/openshift-logging/promtail:v3.2.0 quay.io/openshift-logging/promtail:latest | ||
| registry.ci.openshift.org/logging/v3.2.0:loki quay.io/openshift-logging/loki:v3.2.0 | ||
| registry.ci.openshift.org/logging/v3.2.0:promtail quay.io/openshift-logging/promtail:v3.2.0 | ||
| registry.ci.openshift.org/logging/v3.2.1:loki quay.io/openshift-logging/loki:v3.2.1 quay.io/openshift-logging/loki:latest | ||
| registry.ci.openshift.org/logging/v3.2.1:promtail quay.io/openshift-logging/promtail:v3.2.1 quay.io/openshift-logging/promtail:latest |