From b61229ca3eae229e790635e023dc9fd5fa25922e Mon Sep 17 00:00:00 2001 From: David Simansky Date: Thu, 30 Sep 2021 13:58:06 +0200 Subject: [PATCH 1/2] [knative-client] Add CI setup for release v0.25.1 --- ...nshift-knative-client-release-v0.25.1.yaml | 122 ++++++++++++++++++ ...ve-client-release-v0.25.1-postsubmits.yaml | 56 ++++++++ ...ive-client-release-v0.25.1-presubmits.yaml | 116 +++++++++++++++++ .../knative/mapping_knative_v0_25_quay | 8 +- 4 files changed, 301 insertions(+), 1 deletion(-) create mode 100644 ci-operator/config/openshift/knative-client/openshift-knative-client-release-v0.25.1.yaml create mode 100644 ci-operator/jobs/openshift/knative-client/openshift-knative-client-release-v0.25.1-postsubmits.yaml create mode 100644 ci-operator/jobs/openshift/knative-client/openshift-knative-client-release-v0.25.1-presubmits.yaml diff --git a/ci-operator/config/openshift/knative-client/openshift-knative-client-release-v0.25.1.yaml b/ci-operator/config/openshift/knative-client/openshift-knative-client-release-v0.25.1.yaml new file mode 100644 index 0000000000000..68661e75a845d --- /dev/null +++ b/ci-operator/config/openshift/knative-client/openshift-knative-client-release-v0.25.1.yaml @@ -0,0 +1,122 @@ +base_images: + base: + name: ubi-minimal + namespace: ocp + tag: "8" +binary_build_commands: | + TAG=v0.25.1 make install + TAG=v0.25.1 make build-cross +build_root: + project_image: + dockerfile_path: openshift/ci-operator/build-image/Dockerfile +canonical_go_repository: github.com/knative/client +images: +- dockerfile_path: openshift/ci-operator/knative-images/client/Dockerfile + from: base + inputs: + bin: + paths: + - destination_dir: . + source_path: /go/bin/kn + to: knative-client +- dockerfile_path: openshift/ci-operator/knative-images/client/Dockerfile.cliartifacts + inputs: + bin: + paths: + - destination_dir: . + source_path: /go/src/github.com/knative/client/kn-linux-amd64 + - destination_dir: . + source_path: /go/src/github.com/knative/client/kn-linux-ppc64le + - destination_dir: . + source_path: /go/src/github.com/knative/client/kn-linux-s390x + - destination_dir: . + source_path: /go/src/github.com/knative/client/kn-linux-arm64 + - destination_dir: . + source_path: /go/src/github.com/knative/client/kn-darwin-amd64 + - destination_dir: . + source_path: /go/src/github.com/knative/client/kn-windows-amd64.exe + - destination_dir: . + source_path: /go/src/github.com/knative/client/LICENSE + - destination_dir: . + source_path: /go/src/github.com/knative/client/package_cliartifacts.sh + to: kn-cli-artifacts +- dockerfile_path: openshift/ci-operator/knative-test-images/helloworld/Dockerfile + from: base + inputs: + test-bin: + paths: + - destination_dir: . + source_path: /go/bin/helloworld + to: knative-client-test-helloworld +- dockerfile_path: openshift/ci-operator/knative-test-images/grpc-ping/Dockerfile + from: base + inputs: + test-bin: + paths: + - destination_dir: . + source_path: /go/bin/grpc-ping + to: knative-client-test-grpc-ping +- dockerfile_path: openshift/ci-operator/knative-test-images/servingcontainer/Dockerfile + from: base + inputs: + test-bin: + paths: + - destination_dir: . + source_path: /go/bin/servingcontainer + to: knative-client-test-servingcontainer +- dockerfile_path: openshift/ci-operator/knative-test-images/sidecarcontainer/Dockerfile + from: base + inputs: + test-bin: + paths: + - destination_dir: . + source_path: /go/bin/sidecarcontainer + to: knative-client-test-sidecarcontainer +promotion: + name: knative-v0.25.1 + namespace: openshift +releases: + initial: + integration: + name: "4.8" + namespace: ocp + latest: + integration: + include_built_images: true + name: "4.8" + namespace: ocp +resources: + '*': + requests: + memory: 2Gi +test_binary_build_commands: make test-install +tests: +- as: e2e-aws-ocp-48 + cluster_claim: + architecture: amd64 + cloud: aws + owner: openshift-ci + product: ocp + timeout: 4h0m0s + version: "4.8" + steps: + allow_skip_on_success: true + test: + - as: test + cli: latest + commands: make test-e2e + dependencies: + - env: KNATIVE_CLIENT_TEST_HELLOWORLD + name: knative-client-test-helloworld + - env: KNATIVE_CLIENT_TEST_GRPC_PING + name: knative-client-test-grpc-ping + from: src + resources: + requests: + cpu: 100m + memory: 200Mi + workflow: generic-claim +zz_generated_metadata: + branch: release-v0.25.1 + org: openshift + repo: knative-client diff --git a/ci-operator/jobs/openshift/knative-client/openshift-knative-client-release-v0.25.1-postsubmits.yaml b/ci-operator/jobs/openshift/knative-client/openshift-knative-client-release-v0.25.1-postsubmits.yaml new file mode 100644 index 0000000000000..78f67bd838542 --- /dev/null +++ b/ci-operator/jobs/openshift/knative-client/openshift-knative-client-release-v0.25.1-postsubmits.yaml @@ -0,0 +1,56 @@ +postsubmits: + openshift/knative-client: + - agent: kubernetes + branches: + - ^release-v0\.25\.1$ + cluster: build02 + 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-knative-client-release-v0.25.1-images + path_alias: github.com/knative/client + 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/knative-client/openshift-knative-client-release-v0.25.1-presubmits.yaml b/ci-operator/jobs/openshift/knative-client/openshift-knative-client-release-v0.25.1-presubmits.yaml new file mode 100644 index 0000000000000..318270d969999 --- /dev/null +++ b/ci-operator/jobs/openshift/knative-client/openshift-knative-client-release-v0.25.1-presubmits.yaml @@ -0,0 +1,116 @@ +presubmits: + openshift/knative-client: + - agent: kubernetes + always_run: true + branches: + - ^release-v0\.25\.1$ + - ^release-v0\.25\.1- + cluster: build01 + context: ci/prow/e2e-aws-ocp-48 + 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-knative-client-release-v0.25.1-e2e-aws-ocp-48 + path_alias: github.com/knative/client + rerun_command: /test e2e-aws-ocp-48 + 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=e2e-aws-ocp-48 + 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/hive-hive-credentials + name: hive-hive-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: hive-hive-credentials + secret: + secretName: hive-hive-credentials + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )e2e-aws-ocp-48,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - ^release-v0\.25\.1$ + - ^release-v0\.25\.1- + 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-knative-client-release-v0.25.1-images + path_alias: github.com/knative/client + 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.*) diff --git a/core-services/image-mirroring/knative/mapping_knative_v0_25_quay b/core-services/image-mirroring/knative/mapping_knative_v0_25_quay index 71c633e4d15c0..2af64aae6eb63 100644 --- a/core-services/image-mirroring/knative/mapping_knative_v0_25_quay +++ b/core-services/image-mirroring/knative/mapping_knative_v0_25_quay @@ -28,4 +28,10 @@ registry.ci.openshift.org/openshift/knative-v0.25.1:knative-serving-test-sidecar registry.ci.openshift.org/openshift/knative-v0.25.1:knative-serving-test-hellohttp2 quay.io/openshift-knative/hellohttp2:v0.25 registry.ci.openshift.org/openshift/knative-v0.25.1:knative-serving-test-hellovolume quay.io/openshift-knative/hellovolume:v0.25 registry.ci.openshift.org/openshift/knative-v0.25.1:knative-serving-test-readiness quay.io/openshift-knative/readiness:v0.25 -registry.ci.openshift.org/openshift/knative-v0.25.1:knative-serving-test-emptydir quay.io/openshift-knative/emptydir:v0.25 \ No newline at end of file +registry.ci.openshift.org/openshift/knative-v0.25.1:knative-serving-test-emptydir quay.io/openshift-knative/emptydir:v0.25 +registry.ci.openshift.org/openshift/knative-v0.25.1:knative-client quay.io/openshift-knative/kn:v0.25 +registry.ci.openshift.org/openshift/knative-v0.25.1:kn-cli-artifacts quay.io/openshift-knative/kn-cli-artifacts:v0.25 +registry.ci.openshift.org/openshift/knative-v0.25.1:knative-client-test-helloworld quay.io/openshift-knative/knative-client-test-helloworld:v0.25 +registry.ci.openshift.org/openshift/knative-v0.25.1:knative-client-test-helloworld quay.io/openshift-knative/knative-client-test-grpc-ping:v0.25 +registry.ci.openshift.org/openshift/knative-v0.25.1:knative-client-test-servingcontainer quay.io/openshift-knative/knative-client-test-servingcontainer:v0.25 +registry.ci.openshift.org/openshift/knative-v0.25.1:knative-client-test-sidecarcontainer quay.io/openshift-knative/knative-client-test-sidecarcontainer:v0.25 From a627c01d567ad00ddec24d56184fa1f1dbaacf1e Mon Sep 17 00:00:00 2001 From: David Simansky Date: Thu, 30 Sep 2021 14:58:53 +0200 Subject: [PATCH 2/2] Add new test images to dependencies --- .../openshift-knative-client-release-v0.25.1.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ci-operator/config/openshift/knative-client/openshift-knative-client-release-v0.25.1.yaml b/ci-operator/config/openshift/knative-client/openshift-knative-client-release-v0.25.1.yaml index 68661e75a845d..9970fe3e8c9a0 100644 --- a/ci-operator/config/openshift/knative-client/openshift-knative-client-release-v0.25.1.yaml +++ b/ci-operator/config/openshift/knative-client/openshift-knative-client-release-v0.25.1.yaml @@ -110,6 +110,10 @@ tests: name: knative-client-test-helloworld - env: KNATIVE_CLIENT_TEST_GRPC_PING name: knative-client-test-grpc-ping + - env: KNATIVE_CLIENT_TEST_SERVINGCONTAINER + name: knative-client-test-servingcontainer + - env: KNATIVE_CLIENT_TEST_SIDECARCONTAINER + name: knative-client-test-sidecarcontainer from: src resources: requests: