diff --git a/ci-operator/config/codeready-toolchain/api/codeready-toolchain-api-master.yaml b/ci-operator/config/codeready-toolchain/api/codeready-toolchain-api-master.yaml index 195dffb960f1d..160f45069499c 100644 --- a/ci-operator/config/codeready-toolchain/api/codeready-toolchain-api-master.yaml +++ b/ci-operator/config/codeready-toolchain/api/codeready-toolchain-api-master.yaml @@ -1,24 +1,28 @@ + base_images: os: - cluster: https://api.ci.openshift.org name: centos namespace: openshift - tag: "7" -binary_build_commands: make build -build_root: - project_image: - dockerfile_path: openshift-ci/Dockerfile.tools + tag: '7' + resources: '*': limits: memory: 3Gi requests: - cpu: 100m memory: 250Mi + cpu: 100m + +build_root: + project_image: + dockerfile_path: openshift-ci/Dockerfile.tools + +binary_build_commands: make build + tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp + tests: - as: build commands: make build diff --git a/ci-operator/config/codeready-toolchain/host-operator/codeready-toolchain-host-operator-master.yaml b/ci-operator/config/codeready-toolchain/host-operator/codeready-toolchain-host-operator-master.yaml index dc0d8d275df23..453aaff825c20 100644 --- a/ci-operator/config/codeready-toolchain/host-operator/codeready-toolchain-host-operator-master.yaml +++ b/ci-operator/config/codeready-toolchain/host-operator/codeready-toolchain-host-operator-master.yaml @@ -1,36 +1,41 @@ + base_images: os: - cluster: https://api.ci.openshift.org name: centos namespace: openshift - tag: "7" -binary_build_commands: make build -build_root: - project_image: - dockerfile_path: openshift-ci/Dockerfile.tools + tag: '7' + +resources: + '*': + limits: + memory: 3Gi + requests: + memory: 250Mi + cpu: 100m +promotion: + namespace: codeready-toolchain + name: host-operator-v0.1 images: -- dockerfile_path: openshift-ci/Dockerfile.deploy - from: os +- from: os inputs: bin: paths: - destination_dir: . source_path: /go/src/github.com/codeready-toolchain/host-operator/build/_output/bin/host-operator + dockerfile_path: openshift-ci/Dockerfile.deploy to: host-operator -promotion: - name: host-operator-v0.1 - namespace: codeready-toolchain -resources: - '*': - limits: - memory: 3Gi - requests: - cpu: 100m - memory: 250Mi + + +build_root: + project_image: + dockerfile_path: openshift-ci/Dockerfile.tools + +binary_build_commands: make build + tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp + tests: - as: build commands: make build diff --git a/ci-operator/config/codeready-toolchain/member-operator/codeready-toolchain-member-operator-master.yaml b/ci-operator/config/codeready-toolchain/member-operator/codeready-toolchain-member-operator-master.yaml index 29d2706457888..3cbd6474d1dd7 100644 --- a/ci-operator/config/codeready-toolchain/member-operator/codeready-toolchain-member-operator-master.yaml +++ b/ci-operator/config/codeready-toolchain/member-operator/codeready-toolchain-member-operator-master.yaml @@ -1,36 +1,40 @@ + base_images: os: - cluster: https://api.ci.openshift.org name: centos namespace: openshift - tag: "7" -binary_build_commands: make build -build_root: - project_image: - dockerfile_path: openshift-ci/Dockerfile.tools + tag: '7' + +resources: + '*': + limits: + memory: 3Gi + requests: + memory: 250Mi + cpu: 100m +promotion: + namespace: codeready-toolchain + name: member-operator-v0.1 images: -- dockerfile_path: openshift-ci/Dockerfile.deploy - from: os +- from: os inputs: bin: paths: - destination_dir: . source_path: /go/src/github.com/codeready-toolchain/member-operator/build/_output/bin/member-operator + dockerfile_path: openshift-ci/Dockerfile.deploy to: member-operator -promotion: - name: member-operator-v0.1 - namespace: codeready-toolchain -resources: - '*': - limits: - memory: 3Gi - requests: - cpu: 100m - memory: 250Mi + +build_root: + project_image: + dockerfile_path: openshift-ci/Dockerfile.tools + +binary_build_commands: make build + tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp + tests: - as: build commands: make build diff --git a/ci-operator/config/codeready-toolchain/registration-service/codeready-toolchain-registration-service-master.yaml b/ci-operator/config/codeready-toolchain/registration-service/codeready-toolchain-registration-service-master.yaml index 28e903ac3f80a..700930c359f49 100644 --- a/ci-operator/config/codeready-toolchain/registration-service/codeready-toolchain-registration-service-master.yaml +++ b/ci-operator/config/codeready-toolchain/registration-service/codeready-toolchain-registration-service-master.yaml @@ -1,36 +1,40 @@ + base_images: os: - cluster: https://api.ci.openshift.org name: centos namespace: openshift - tag: "7" -binary_build_commands: make build -build_root: - project_image: - dockerfile_path: openshift-ci/Dockerfile.tools + tag: '7' + +resources: + '*': + limits: + memory: 3Gi + requests: + memory: 250Mi + cpu: 100m +promotion: + namespace: codeready-toolchain + name: registration-service-v0.1 images: -- dockerfile_path: openshift-ci/Dockerfile.deploy - from: os +- from: os inputs: bin: paths: - destination_dir: . source_path: /go/src/github.com/codeready-toolchain/registration-service/build/_output/bin/registration-service + dockerfile_path: openshift-ci/Dockerfile.deploy to: registration-service -promotion: - name: registration-service-v0.1 - namespace: codeready-toolchain -resources: - '*': - limits: - memory: 3Gi - requests: - cpu: 100m - memory: 250Mi + +build_root: + project_image: + dockerfile_path: openshift-ci/Dockerfile.tools + +binary_build_commands: make build + tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp + tests: - as: build commands: make build diff --git a/ci-operator/config/codeready-toolchain/toolchain-common/codeready-toolchain-toolchain-common-master.yaml b/ci-operator/config/codeready-toolchain/toolchain-common/codeready-toolchain-toolchain-common-master.yaml index 49f2408729eb7..35e803e92c5fd 100644 --- a/ci-operator/config/codeready-toolchain/toolchain-common/codeready-toolchain-toolchain-common-master.yaml +++ b/ci-operator/config/codeready-toolchain/toolchain-common/codeready-toolchain-toolchain-common-master.yaml @@ -1,24 +1,28 @@ + base_images: os: - cluster: https://api.ci.openshift.org name: centos namespace: openshift - tag: "7" -binary_build_commands: make build -build_root: - project_image: - dockerfile_path: openshift-ci/Dockerfile.tools + tag: '7' + resources: '*': limits: memory: 3Gi requests: - cpu: 100m memory: 250Mi + cpu: 100m + +build_root: + project_image: + dockerfile_path: openshift-ci/Dockerfile.tools + +binary_build_commands: make build + tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp + tests: - as: build commands: make build diff --git a/ci-operator/config/codeready-toolchain/toolchain-e2e/codeready-toolchain-toolchain-e2e-master.yaml b/ci-operator/config/codeready-toolchain/toolchain-e2e/codeready-toolchain-toolchain-e2e-master.yaml index ce7fa53cb53ae..7a2992034000e 100644 --- a/ci-operator/config/codeready-toolchain/toolchain-e2e/codeready-toolchain-toolchain-e2e-master.yaml +++ b/ci-operator/config/codeready-toolchain/toolchain-e2e/codeready-toolchain-toolchain-e2e-master.yaml @@ -1,49 +1,54 @@ + base_images: os: - cluster: https://api.ci.openshift.org name: centos namespace: openshift - tag: "7" -binary_build_commands: make build-with-operators -build_root: - project_image: - dockerfile_path: openshift-ci/Dockerfile.tools + tag: '7' + +resources: + '*': + limits: + memory: 3Gi + requests: + memory: 250Mi + cpu: 100m + images: -- dockerfile_path: openshift-ci/Dockerfile.host.deploy - from: os +- from: os inputs: bin: paths: - destination_dir: . source_path: /go/src/github.com/codeready-toolchain/toolchain-e2e/build/_output/bin/host-operator + dockerfile_path: openshift-ci/Dockerfile.host.deploy to: host-operator -- dockerfile_path: openshift-ci/Dockerfile.member.deploy - from: os +- from: os inputs: bin: paths: - destination_dir: . source_path: /go/src/github.com/codeready-toolchain/toolchain-e2e/build/_output/bin/member-operator + dockerfile_path: openshift-ci/Dockerfile.member.deploy to: member-operator -- dockerfile_path: openshift-ci/Dockerfile.registration.deploy - from: os +- from: os inputs: bin: paths: - destination_dir: . source_path: /go/src/github.com/codeready-toolchain/toolchain-e2e/build/_output/bin/registration-service + dockerfile_path: openshift-ci/Dockerfile.registration.deploy to: registration-service -resources: - '*': - limits: - memory: 3Gi - requests: - cpu: 100m - memory: 250Mi + +build_root: + project_image: + dockerfile_path: openshift-ci/Dockerfile.tools + +binary_build_commands: make build-with-operators + tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp + tests: - as: build commands: make build diff --git a/ci-operator/config/codeready-toolchain/toolchain-operator/codeready-toolchain-toolchain-operator-master.yaml b/ci-operator/config/codeready-toolchain/toolchain-operator/codeready-toolchain-toolchain-operator-master.yaml index ff09541ee3824..835579401ae0d 100644 --- a/ci-operator/config/codeready-toolchain/toolchain-operator/codeready-toolchain-toolchain-operator-master.yaml +++ b/ci-operator/config/codeready-toolchain/toolchain-operator/codeready-toolchain-toolchain-operator-master.yaml @@ -1,36 +1,40 @@ + base_images: os: - cluster: https://api.ci.openshift.org name: centos namespace: openshift - tag: "7" -binary_build_commands: make build -build_root: - project_image: - dockerfile_path: openshift-ci/Dockerfile.tools + tag: '7' + +resources: + '*': + limits: + memory: 3Gi + requests: + memory: 250Mi + cpu: 100m +promotion: + namespace: codeready-toolchain + name: toolchain-operator-v0.1 images: -- dockerfile_path: openshift-ci/Dockerfile.deploy - from: os +- from: os inputs: bin: paths: - destination_dir: . source_path: /go/src/github.com/codeready-toolchain/toolchain-operator/build/_output/bin/toolchain-operator + dockerfile_path: openshift-ci/Dockerfile.deploy to: toolchain-operator -promotion: - name: toolchain-operator-v0.1 - namespace: codeready-toolchain -resources: - '*': - limits: - memory: 3Gi - requests: - cpu: 100m - memory: 250Mi + +build_root: + project_image: + dockerfile_path: openshift-ci/Dockerfile.tools + +binary_build_commands: make build + tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp + tests: - as: build commands: make build diff --git a/ci-operator/config/containers/libpod/containers-libpod-master.yaml b/ci-operator/config/containers/libpod/containers-libpod-master.yaml index 50ea6ac174ad0..9a4a36d9d50bd 100644 --- a/ci-operator/config/containers/libpod/containers-libpod-master.yaml +++ b/ci-operator/config/containers/libpod/containers-libpod-master.yaml @@ -1,43 +1,39 @@ +resources: + '*': + limits: + memory: 6Gi + requests: + cpu: 100m + memory: 200Mi +binary_build_commands: OS_TEST=1 make -f .copr/Makefile srpm outdir=rpms && make -f .copr/Makefile build_binary outdir=rpms +test_binary_build_commands: make install.tools +images: +- from: bin + to: fedora-install + dockerfile_path: test/install/Dockerfile.Fedora +- from: centos-bin + to: centos-install + dockerfile_path: test/install/Dockerfile.Centos +build_root: + image_stream_tag: + namespace: ci + name: libpod-build-root + tag: fedora base_images: centos-build-root: - cluster: https://api.ci.openshift.org name: libpod-build-root namespace: ci tag: centos -binary_build_commands: OS_TEST=1 make -f .copr/Makefile srpm outdir=rpms && make -f - .copr/Makefile build_binary outdir=rpms -build_root: - image_stream_tag: - cluster: https://api.ci.openshift.org - name: libpod-build-root - namespace: ci - tag: fedora -images: -- dockerfile_path: test/install/Dockerfile.Fedora - from: bin - to: fedora-install -- dockerfile_path: test/install/Dockerfile.Centos - from: centos-bin - to: centos-install raw_steps: - source_step: + from: centos-build-root + to: centos-src clonerefs_image: name: clonerefs namespace: ci tag: latest clonerefs_path: /app/prow/cmd/clonerefs/app.binary.runfiles/io_k8s_test_infra/prow/cmd/clonerefs/linux_amd64_pure_stripped/app.binary - from: centos-build-root - to: centos-src - pipeline_image_cache_step: - commands: OS_TEST=1 make -f .copr/Makefile srpm outdir=rpms && make -f .copr/Makefile - build_binary outdir=rpms + commands: OS_TEST=1 make -f .copr/Makefile srpm outdir=rpms && make -f .copr/Makefile build_binary outdir=rpms from: centos-src to: centos-bin -resources: - '*': - limits: - memory: 6Gi - requests: - cpu: 100m - memory: 200Mi -test_binary_build_commands: make install.tools diff --git a/ci-operator/config/coreos/rpm-ostree/coreos-rpm-ostree-master.yaml b/ci-operator/config/coreos/rpm-ostree/coreos-rpm-ostree-master.yaml index 0d1892f511640..4254e9c4cd1b4 100644 --- a/ci-operator/config/coreos/rpm-ostree/coreos-rpm-ostree-master.yaml +++ b/ci-operator/config/coreos/rpm-ostree/coreos-rpm-ostree-master.yaml @@ -1,10 +1,23 @@ -binary_build_commands: env SKIP_INSTALLDEPS=1 ./ci/build-check.sh build_root: image_stream_tag: - cluster: https://api.ci.openshift.org - name: cosa-buildroot namespace: coreos + name: cosa-buildroot tag: latest + +# With this we build a container image derived from cosa-buildroot +# that contains new rpm-ostree binaries. From there...since this +# cluster doesn't support recursive containerization or virt, +# we can't do much interesting to test it today. But hopefully +# that will soon change. +# https://github.com/openshift/release/issues/4892 +binary_build_commands: env SKIP_INSTALLDEPS=1 ./ci/build-check.sh + +tests: +- as: sanity + commands: rpm-ostree --version + container: + from: bin + resources: '*': limits: @@ -12,8 +25,3 @@ resources: requests: cpu: 1000m memory: 3Gi -tests: -- as: sanity - commands: rpm-ostree --version - container: - from: bin diff --git a/ci-operator/config/cri-o/cri-o/cri-o-cri-o-release-1.13.yaml b/ci-operator/config/cri-o/cri-o/cri-o-cri-o-release-1.13.yaml index 2e365534a2d2c..594cfba13a5f8 100644 --- a/ci-operator/config/cri-o/cri-o/cri-o-cri-o-release-1.13.yaml +++ b/ci-operator/config/cri-o/cri-o/cri-o-cri-o-release-1.13.yaml @@ -1,22 +1,18 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base base-machine: - cluster: https://api.ci.openshift.org name: fedora namespace: openshift tag: "29" machine-os-content-base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: machine-os-content build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.11 @@ -46,7 +42,6 @@ resources: memory: 4Gi rpm_build_commands: hack/build-rpms.sh tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/cri-o/cri-o/cri-o-cri-o-release-1.14.yaml b/ci-operator/config/cri-o/cri-o/cri-o-cri-o-release-1.14.yaml index bdb7dd4ae672d..37db6f28c272f 100644 --- a/ci-operator/config/cri-o/cri-o/cri-o-cri-o-release-1.14.yaml +++ b/ci-operator/config/cri-o/cri-o/cri-o-cri-o-release-1.14.yaml @@ -1,22 +1,18 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base base-machine: - cluster: https://api.ci.openshift.org name: fedora namespace: openshift tag: "29" machine-os-content-base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: machine-os-content build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.11 @@ -46,7 +42,6 @@ resources: memory: 4Gi rpm_build_commands: hack/build-rpms.sh tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/cri-o/cri-o/cri-o-cri-o-release-1.16.yaml b/ci-operator/config/cri-o/cri-o/cri-o-cri-o-release-1.16.yaml index b5628f9abdedb..33a38ee995002 100644 --- a/ci-operator/config/cri-o/cri-o/cri-o-cri-o-release-1.16.yaml +++ b/ci-operator/config/cri-o/cri-o/cri-o-cri-o-release-1.16.yaml @@ -1,6 +1,5 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base @@ -10,7 +9,6 @@ base_images: namespace: openshift tag: "29" machine-os-content-base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: machine-os-content @@ -46,7 +44,6 @@ resources: memory: 4Gi rpm_build_commands: hack/build-rpms.sh tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: @@ -54,7 +51,9 @@ tests: commands: TEST_SUITE=openshift/conformance/parallel run-tests openshift_installer: cluster_profile: aws + upgrade: false - as: launch-aws commands: sleep 7200 & wait openshift_installer: cluster_profile: aws + upgrade: false \ No newline at end of file diff --git a/ci-operator/config/fabric8-services/toolchain-operator/fabric8-services-toolchain-operator-master.yaml b/ci-operator/config/fabric8-services/toolchain-operator/fabric8-services-toolchain-operator-master.yaml index 770dc71ebef65..d60cd62a550ea 100644 --- a/ci-operator/config/fabric8-services/toolchain-operator/fabric8-services-toolchain-operator-master.yaml +++ b/ci-operator/config/fabric8-services/toolchain-operator/fabric8-services-toolchain-operator-master.yaml @@ -1,36 +1,41 @@ + base_images: os: - cluster: https://api.ci.openshift.org name: centos namespace: openshift - tag: "7" -binary_build_commands: make build -build_root: - project_image: - dockerfile_path: openshift-ci/Dockerfile.tools + tag: '7' + +resources: + '*': + limits: + memory: 3Gi + requests: + memory: 250Mi + cpu: 100m +promotion: + namespace: fabric8-services + name: toolchain-v0.0.1 images: -- dockerfile_path: openshift-ci/Dockerfile.deploy - from: os +- from: os inputs: bin: paths: - destination_dir: . source_path: /go/src/github.com/fabric8-services/toolchain-operator/out/operator + dockerfile_path: openshift-ci/Dockerfile.deploy to: toolchain-operator -promotion: - name: toolchain-v0.0.1 - namespace: fabric8-services -resources: - '*': - limits: - memory: 3Gi - requests: - cpu: 100m - memory: 250Mi + + +build_root: + project_image: + dockerfile_path: openshift-ci/Dockerfile.tools + +binary_build_commands: make build + tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp + tests: - as: build commands: make build diff --git a/ci-operator/config/heketi/heketi/heketi-heketi-master.yaml b/ci-operator/config/heketi/heketi/heketi-heketi-master.yaml index e686a9fe40ecc..6852c4b72d443 100644 --- a/ci-operator/config/heketi/heketi/heketi-heketi-master.yaml +++ b/ci-operator/config/heketi/heketi/heketi-heketi-master.yaml @@ -1,13 +1,23 @@ + + base_images: os: - cluster: https://api.ci.openshift.org name: centos namespace: openshift - tag: "7" -binary_build_commands: make CI=openshift + tag: '7' + build_root: project_image: dockerfile_path: extras/openshift-ci/build-image/Dockerfile + +binary_build_commands: make CI=openshift + +tests: +- as: simple + commands: make test CI=openshift TESTOPTIONS=-v + container: + from: src + resources: '*': limits: @@ -15,8 +25,3 @@ resources: requests: cpu: 100m memory: 200Mi -tests: -- as: simple - commands: make test CI=openshift TESTOPTIONS=-v - container: - from: src diff --git a/ci-operator/config/integr8ly/cloud-resource-operator/integr8ly-cloud-resource-operator-master.yaml b/ci-operator/config/integr8ly/cloud-resource-operator/integr8ly-cloud-resource-operator-master.yaml index 0f9ac74c7fe7b..034e02dbe9990 100644 --- a/ci-operator/config/integr8ly/cloud-resource-operator/integr8ly-cloud-resource-operator-master.yaml +++ b/ci-operator/config/integr8ly/cloud-resource-operator/integr8ly-cloud-resource-operator-master.yaml @@ -1,40 +1,43 @@ base_images: os: - cluster: https://api.ci.openshift.org name: centos namespace: openshift - tag: "7" -binary_build_commands: make build COMPILE_TARGET="./build/_output/bin/cloud-resource-operator" - GO111MODULE=on -build_root: - image_stream_tag: - cluster: https://api.ci.openshift.org - name: intly-base-image - namespace: integr8ly - tag: latest + tag: '7' + +resources: + '*': + limits: + memory: 6Gi + requests: + memory: 250Mi + cpu: 100m + images: -- dockerfile_path: build/Dockerfile - from: os +- from: os inputs: bin: paths: - destination_dir: . source_path: /go/src/github.com/integr8ly/cloud-resource-operator/build + dockerfile_path: build/Dockerfile to: cloud-resource-operator + +build_root: + image_stream_tag: + name: intly-base-image + namespace: integr8ly + tag: latest + +binary_build_commands: make build COMPILE_TARGET="./build/_output/bin/cloud-resource-operator" GO111MODULE=on + promotion: - name: cloud-resource-operator namespace: integr8ly -resources: - '*': - limits: - memory: 6Gi - requests: - cpu: 100m - memory: 250Mi + name: cloud-resource-operator + tag_specification: - cluster: https://api.ci.openshift.org - name: "4.1" + name: '4.1' namespace: ocp + tests: - as: format commands: make code/check diff --git a/ci-operator/config/integr8ly/integreatly-operator/integr8ly-integreatly-operator-master.yaml b/ci-operator/config/integr8ly/integreatly-operator/integr8ly-integreatly-operator-master.yaml index d48f22fca5fe5..1653a2642b627 100644 --- a/ci-operator/config/integr8ly/integreatly-operator/integr8ly-integreatly-operator-master.yaml +++ b/ci-operator/config/integr8ly/integreatly-operator/integr8ly-integreatly-operator-master.yaml @@ -1,39 +1,43 @@ base_images: os: - cluster: https://api.ci.openshift.org name: centos namespace: openshift - tag: "7" -binary_build_commands: make code/compile COMPILE_TARGET="./build/_output/bin/integreatly-operator" -build_root: - image_stream_tag: - cluster: https://api.ci.openshift.org - name: intly-base-image - namespace: integr8ly - tag: latest + tag: '7' + +resources: + '*': + limits: + memory: 6Gi + requests: + memory: 250Mi + cpu: 100m + images: -- dockerfile_path: build/Dockerfile - from: os +- from: os inputs: bin: paths: - destination_dir: . source_path: /go/src/github.com/integr8ly/integreatly-operator/build + dockerfile_path: build/Dockerfile to: integreatly-operator + +build_root: + image_stream_tag: + name: intly-base-image + namespace: integr8ly + tag: latest + +binary_build_commands: make code/compile COMPILE_TARGET="./build/_output/bin/integreatly-operator" + promotion: - name: integreatly-operator namespace: integr8ly -resources: - '*': - limits: - memory: 6Gi - requests: - cpu: 100m - memory: 250Mi + name: integreatly-operator + tag_specification: - cluster: https://api.ci.openshift.org - name: "4.2" + name: '4.2' namespace: ocp + tests: - as: unit commands: make test/unit diff --git a/ci-operator/config/kiegroup/kie-cloud-operator/kiegroup-kie-cloud-operator-master.yaml b/ci-operator/config/kiegroup/kie-cloud-operator/kiegroup-kie-cloud-operator-master.yaml index f420f9007bb30..b55cfbf9b36d4 100644 --- a/ci-operator/config/kiegroup/kie-cloud-operator/kiegroup-kie-cloud-operator-master.yaml +++ b/ci-operator/config/kiegroup/kie-cloud-operator/kiegroup-kie-cloud-operator-master.yaml @@ -1,16 +1,9 @@ base_images: os: - cluster: https://api.ci.openshift.org name: centos namespace: openshift - tag: "7" + tag: '7' binary_build_commands: CI=true make build -build_root: - image_stream_tag: - cluster: https://api.ci.openshift.org - name: release - namespace: openshift - tag: golang-1.11 images: - dockerfile_path: build/Dockerfile from: os @@ -20,9 +13,6 @@ images: - destination_dir: . source_path: /go/src/github.com/kiegroup/kie-cloud-operator/build to: kie-cloud-operator -promotion: - name: kie-cloud - namespace: kiegroup resources: '*': limits: @@ -30,6 +20,14 @@ resources: requests: cpu: 100m memory: 200Mi +build_root: + image_stream_tag: + name: release + namespace: openshift + tag: golang-1.11 +promotion: + name: kie-cloud + namespace: kiegroup tests: - as: unit commands: CI=true make test diff --git a/ci-operator/config/kiegroup/kie-cloud-operator/kiegroup-kie-cloud-operator-release-v1.0.x.yaml b/ci-operator/config/kiegroup/kie-cloud-operator/kiegroup-kie-cloud-operator-release-v1.0.x.yaml index 4051d5a8ce4c6..f4d6576fd497b 100644 --- a/ci-operator/config/kiegroup/kie-cloud-operator/kiegroup-kie-cloud-operator-release-v1.0.x.yaml +++ b/ci-operator/config/kiegroup/kie-cloud-operator/kiegroup-kie-cloud-operator-release-v1.0.x.yaml @@ -1,16 +1,9 @@ base_images: os: - cluster: https://api.ci.openshift.org name: centos namespace: openshift - tag: "7" + tag: '7' binary_build_commands: CI=true make build -build_root: - image_stream_tag: - cluster: https://api.ci.openshift.org - name: release - namespace: openshift - tag: golang-1.10 images: - dockerfile_path: build/Dockerfile from: os @@ -20,9 +13,6 @@ images: - destination_dir: . source_path: /go/src/github.com/kiegroup/kie-cloud-operator/build to: kie-cloud-operator -promotion: - name: kie-cloud - namespace: kiegroup resources: '*': limits: @@ -30,6 +20,14 @@ resources: requests: cpu: 100m memory: 200Mi +build_root: + image_stream_tag: + name: release + namespace: openshift + tag: golang-1.10 +promotion: + name: kie-cloud + namespace: kiegroup tests: - as: unit commands: CI=true make test diff --git a/ci-operator/config/kiegroup/kie-cloud-operator/kiegroup-kie-cloud-operator-release-v1.1.x.yaml b/ci-operator/config/kiegroup/kie-cloud-operator/kiegroup-kie-cloud-operator-release-v1.1.x.yaml index f420f9007bb30..b55cfbf9b36d4 100644 --- a/ci-operator/config/kiegroup/kie-cloud-operator/kiegroup-kie-cloud-operator-release-v1.1.x.yaml +++ b/ci-operator/config/kiegroup/kie-cloud-operator/kiegroup-kie-cloud-operator-release-v1.1.x.yaml @@ -1,16 +1,9 @@ base_images: os: - cluster: https://api.ci.openshift.org name: centos namespace: openshift - tag: "7" + tag: '7' binary_build_commands: CI=true make build -build_root: - image_stream_tag: - cluster: https://api.ci.openshift.org - name: release - namespace: openshift - tag: golang-1.11 images: - dockerfile_path: build/Dockerfile from: os @@ -20,9 +13,6 @@ images: - destination_dir: . source_path: /go/src/github.com/kiegroup/kie-cloud-operator/build to: kie-cloud-operator -promotion: - name: kie-cloud - namespace: kiegroup resources: '*': limits: @@ -30,6 +20,14 @@ resources: requests: cpu: 100m memory: 200Mi +build_root: + image_stream_tag: + name: release + namespace: openshift + tag: golang-1.11 +promotion: + name: kie-cloud + namespace: kiegroup tests: - as: unit commands: CI=true make test diff --git a/ci-operator/config/kiegroup/kie-cloud-operator/kiegroup-kie-cloud-operator-release-v1.2.x.yaml b/ci-operator/config/kiegroup/kie-cloud-operator/kiegroup-kie-cloud-operator-release-v1.2.x.yaml index f420f9007bb30..b55cfbf9b36d4 100644 --- a/ci-operator/config/kiegroup/kie-cloud-operator/kiegroup-kie-cloud-operator-release-v1.2.x.yaml +++ b/ci-operator/config/kiegroup/kie-cloud-operator/kiegroup-kie-cloud-operator-release-v1.2.x.yaml @@ -1,16 +1,9 @@ base_images: os: - cluster: https://api.ci.openshift.org name: centos namespace: openshift - tag: "7" + tag: '7' binary_build_commands: CI=true make build -build_root: - image_stream_tag: - cluster: https://api.ci.openshift.org - name: release - namespace: openshift - tag: golang-1.11 images: - dockerfile_path: build/Dockerfile from: os @@ -20,9 +13,6 @@ images: - destination_dir: . source_path: /go/src/github.com/kiegroup/kie-cloud-operator/build to: kie-cloud-operator -promotion: - name: kie-cloud - namespace: kiegroup resources: '*': limits: @@ -30,6 +20,14 @@ resources: requests: cpu: 100m memory: 200Mi +build_root: + image_stream_tag: + name: release + namespace: openshift + tag: golang-1.11 +promotion: + name: kie-cloud + namespace: kiegroup tests: - as: unit commands: CI=true make test diff --git a/ci-operator/config/kiegroup/kie-cloud-operator/kiegroup-kie-cloud-operator-release-v1.3.x.yaml b/ci-operator/config/kiegroup/kie-cloud-operator/kiegroup-kie-cloud-operator-release-v1.3.x.yaml index f420f9007bb30..b55cfbf9b36d4 100644 --- a/ci-operator/config/kiegroup/kie-cloud-operator/kiegroup-kie-cloud-operator-release-v1.3.x.yaml +++ b/ci-operator/config/kiegroup/kie-cloud-operator/kiegroup-kie-cloud-operator-release-v1.3.x.yaml @@ -1,16 +1,9 @@ base_images: os: - cluster: https://api.ci.openshift.org name: centos namespace: openshift - tag: "7" + tag: '7' binary_build_commands: CI=true make build -build_root: - image_stream_tag: - cluster: https://api.ci.openshift.org - name: release - namespace: openshift - tag: golang-1.11 images: - dockerfile_path: build/Dockerfile from: os @@ -20,9 +13,6 @@ images: - destination_dir: . source_path: /go/src/github.com/kiegroup/kie-cloud-operator/build to: kie-cloud-operator -promotion: - name: kie-cloud - namespace: kiegroup resources: '*': limits: @@ -30,6 +20,14 @@ resources: requests: cpu: 100m memory: 200Mi +build_root: + image_stream_tag: + name: release + namespace: openshift + tag: golang-1.11 +promotion: + name: kie-cloud + namespace: kiegroup tests: - as: unit commands: CI=true make test diff --git a/ci-operator/config/kubevirt/hyperconverged-cluster-operator/kubevirt-hyperconverged-cluster-operator-master.yaml b/ci-operator/config/kubevirt/hyperconverged-cluster-operator/kubevirt-hyperconverged-cluster-operator-master.yaml index 7d2c1a5ac2cd8..266b6bb983958 100644 --- a/ci-operator/config/kubevirt/hyperconverged-cluster-operator/kubevirt-hyperconverged-cluster-operator-master.yaml +++ b/ci-operator/config/kubevirt/hyperconverged-cluster-operator/kubevirt-hyperconverged-cluster-operator-master.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base binary_build_commands: make install build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -33,7 +31,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/kubevirt/hyperconverged-cluster-operator/kubevirt-hyperconverged-cluster-operator-release-4.2.yaml b/ci-operator/config/kubevirt/hyperconverged-cluster-operator/kubevirt-hyperconverged-cluster-operator-release-4.2.yaml index 96d92676cdb0f..93a35706fcca3 100644 --- a/ci-operator/config/kubevirt/hyperconverged-cluster-operator/kubevirt-hyperconverged-cluster-operator-release-4.2.yaml +++ b/ci-operator/config/kubevirt/hyperconverged-cluster-operator/kubevirt-hyperconverged-cluster-operator-release-4.2.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base binary_build_commands: make install build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -33,7 +31,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/kubevirt/hyperconverged-cluster-operator/kubevirt-hyperconverged-cluster-operator-release-4.3.yaml b/ci-operator/config/kubevirt/hyperconverged-cluster-operator/kubevirt-hyperconverged-cluster-operator-release-4.3.yaml index 0491c320eaa3c..d7ce95fa20b32 100644 --- a/ci-operator/config/kubevirt/hyperconverged-cluster-operator/kubevirt-hyperconverged-cluster-operator-release-4.3.yaml +++ b/ci-operator/config/kubevirt/hyperconverged-cluster-operator/kubevirt-hyperconverged-cluster-operator-release-4.3.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base binary_build_commands: make install build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -34,7 +32,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/kubevirt/hyperconverged-cluster-operator/kubevirt-hyperconverged-cluster-operator-release-4.4.yaml b/ci-operator/config/kubevirt/hyperconverged-cluster-operator/kubevirt-hyperconverged-cluster-operator-release-4.4.yaml index eebf1b982c978..c5a01cf4af17e 100644 --- a/ci-operator/config/kubevirt/hyperconverged-cluster-operator/kubevirt-hyperconverged-cluster-operator-release-4.4.yaml +++ b/ci-operator/config/kubevirt/hyperconverged-cluster-operator/kubevirt-hyperconverged-cluster-operator-release-4.4.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base binary_build_commands: make install build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -33,7 +31,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/monstorak/monstorak-operator/monstorak-monstorak-operator-master.yaml b/ci-operator/config/monstorak/monstorak-operator/monstorak-monstorak-operator-master.yaml index d66dd27c7833f..3f9ba784fbe11 100644 --- a/ci-operator/config/monstorak/monstorak-operator/monstorak-monstorak-operator-master.yaml +++ b/ci-operator/config/monstorak/monstorak-operator/monstorak-monstorak-operator-master.yaml @@ -1,41 +1,46 @@ + base_images: + os: + name: centos + namespace: openshift + tag: '7' operator-registry: - cluster: https://api.ci.openshift.org name: "4.0" namespace: ocp tag: operator-registry - os: - cluster: https://api.ci.openshift.org - name: centos - namespace: openshift - tag: "7" -binary_build_commands: make build -build_root: - project_image: - dockerfile_path: openshift-ci/Dockerfile.tools + +resources: + '*': + limits: + memory: 6Gi + requests: + memory: 250Mi + cpu: 100m + images: -- dockerfile_path: openshift-ci/Dockerfile.deploy - from: os +- from: os inputs: bin: paths: - destination_dir: . - source_path: /go/src/github.com/monstorak/monstorak-operator/build/_output/bin/monstorak-operator + source_path: /go/src/github.com/monstorak/monstorak-operator/build/_output/bin/monstorak-operator + dockerfile_path: openshift-ci/Dockerfile.deploy to: monstorak-operator + promotion: - name: monstorak-0.0.1 namespace: openshift -resources: - '*': - limits: - memory: 6Gi - requests: - cpu: 100m - memory: 250Mi + name: monstorak-0.0.1 + +build_root: + project_image: + dockerfile_path: openshift-ci/Dockerfile.tools + +binary_build_commands: make build + tag_specification: - cluster: https://api.ci.openshift.org name: "4.0" namespace: ocp + tests: - as: lint commands: VERBOSE=2 make lint @@ -45,3 +50,4 @@ tests: commands: make test container: from: src + diff --git a/ci-operator/config/openshift-knative/serverless-operator/openshift-knative-serverless-operator-master.yaml b/ci-operator/config/openshift-knative/serverless-operator/openshift-knative-serverless-operator-master.yaml index 10ac635d2197e..f63253ddd2170 100644 --- a/ci-operator/config/openshift-knative/serverless-operator/openshift-knative-serverless-operator-master.yaml +++ b/ci-operator/config/openshift-knative/serverless-operator/openshift-knative-serverless-operator-master.yaml @@ -1,13 +1,30 @@ +tag_specification: + name: '4.1' + namespace: ocp +promotion: + namespace: openshift + name: openshift-serverless-v1.0.0 base_images: base: - cluster: https://api.ci.openshift.org - name: "4.1" + name: '4.1' namespace: ocp tag: base -binary_build_commands: make install build_root: project_image: dockerfile_path: openshift/ci-operator/build-image/Dockerfile +binary_build_commands: make install +tests: +- as: e2e-aws + commands: "make test-e2e" + openshift_installer_src: + cluster_profile: aws +resources: + '*': + limits: + memory: 4Gi + requests: + cpu: 100m + memory: 200Mi images: - dockerfile_path: build/Dockerfile from: base @@ -17,22 +34,3 @@ images: - destination_dir: . source_path: /go/src/github.com/openshift-knative/serverless-operator/olm-catalog to: serverless-operator -promotion: - name: openshift-serverless-v1.0.0 - namespace: openshift -resources: - '*': - limits: - memory: 4Gi - requests: - cpu: 100m - memory: 200Mi -tag_specification: - cluster: https://api.ci.openshift.org - name: "4.1" - namespace: ocp -tests: -- as: e2e-aws - commands: make test-e2e - openshift_installer_src: - cluster_profile: aws diff --git a/ci-operator/config/openshift/ansible-service-broker/openshift-ansible-service-broker-master.yaml b/ci-operator/config/openshift/ansible-service-broker/openshift-ansible-service-broker-master.yaml index 5daa3d621fd2e..5eba44c24262b 100644 --- a/ci-operator/config/openshift/ansible-service-broker/openshift-ansible-service-broker-master.yaml +++ b/ci-operator/config/openshift/ansible-service-broker/openshift-ansible-service-broker-master.yaml @@ -1,11 +1,9 @@ base_images: ansible_operator: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: ansible-operator base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base @@ -37,7 +35,6 @@ resources: cpu: 200m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp test_binary_build_commands: make openshift-ci-test-container diff --git a/ci-operator/config/openshift/ansible-service-broker/openshift-ansible-service-broker-release-4.1.yaml b/ci-operator/config/openshift/ansible-service-broker/openshift-ansible-service-broker-release-4.1.yaml index 41242ec5e58d8..0feab8d442bc0 100644 --- a/ci-operator/config/openshift/ansible-service-broker/openshift-ansible-service-broker-release-4.1.yaml +++ b/ci-operator/config/openshift/ansible-service-broker/openshift-ansible-service-broker-release-4.1.yaml @@ -1,11 +1,9 @@ base_images: ansible_operator: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: ansible-operator centos7: - cluster: https://api.ci.openshift.org name: centos namespace: openshift tag: "7" @@ -37,7 +35,6 @@ resources: cpu: 200m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp test_binary_build_commands: make openshift-ci-test-container diff --git a/ci-operator/config/openshift/ansible-service-broker/openshift-ansible-service-broker-release-4.2.yaml b/ci-operator/config/openshift/ansible-service-broker/openshift-ansible-service-broker-release-4.2.yaml index 74a4c8c994cc1..71c38412d1fba 100644 --- a/ci-operator/config/openshift/ansible-service-broker/openshift-ansible-service-broker-release-4.2.yaml +++ b/ci-operator/config/openshift/ansible-service-broker/openshift-ansible-service-broker-release-4.2.yaml @@ -1,11 +1,9 @@ base_images: ansible_operator: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: ansible-operator base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base @@ -37,7 +35,6 @@ resources: cpu: 200m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp test_binary_build_commands: make openshift-ci-test-container diff --git a/ci-operator/config/openshift/ansible-service-broker/openshift-ansible-service-broker-release-4.3.yaml b/ci-operator/config/openshift/ansible-service-broker/openshift-ansible-service-broker-release-4.3.yaml index 0972cef2e1f9b..6192e74b56bbd 100644 --- a/ci-operator/config/openshift/ansible-service-broker/openshift-ansible-service-broker-release-4.3.yaml +++ b/ci-operator/config/openshift/ansible-service-broker/openshift-ansible-service-broker-release-4.3.yaml @@ -1,11 +1,9 @@ base_images: ansible_operator: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: ansible-operator base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base @@ -38,7 +36,6 @@ resources: cpu: 200m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp test_binary_build_commands: make openshift-ci-test-container diff --git a/ci-operator/config/openshift/ansible-service-broker/openshift-ansible-service-broker-release-4.4.yaml b/ci-operator/config/openshift/ansible-service-broker/openshift-ansible-service-broker-release-4.4.yaml index 366f74c9374df..d2d147073cdd8 100644 --- a/ci-operator/config/openshift/ansible-service-broker/openshift-ansible-service-broker-release-4.4.yaml +++ b/ci-operator/config/openshift/ansible-service-broker/openshift-ansible-service-broker-release-4.4.yaml @@ -1,11 +1,9 @@ base_images: ansible_operator: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: ansible-operator base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base @@ -37,7 +35,6 @@ resources: cpu: 200m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp test_binary_build_commands: make openshift-ci-test-container diff --git a/ci-operator/config/openshift/api/openshift-api-master.yaml b/ci-operator/config/openshift/api/openshift-api-master.yaml index fc509fcd8b293..b270a78fafcda 100644 --- a/ci-operator/config/openshift/api/openshift-api-master.yaml +++ b/ci-operator/config/openshift/api/openshift-api-master.yaml @@ -1,6 +1,5 @@ build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -15,7 +14,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/api/openshift-api-release-3.11.yaml b/ci-operator/config/openshift/api/openshift-api-release-3.11.yaml index 20da255d50c50..81a6b7c927f00 100644 --- a/ci-operator/config/openshift/api/openshift-api-release-3.11.yaml +++ b/ci-operator/config/openshift/api/openshift-api-release-3.11.yaml @@ -1,9 +1,3 @@ -build_root: - image_stream_tag: - cluster: https://api.ci.openshift.org - name: release - namespace: openshift - tag: golang-1.10 resources: '*': limits: @@ -11,6 +5,11 @@ resources: requests: cpu: 100m memory: 200Mi +build_root: + image_stream_tag: + name: release + namespace: openshift + tag: golang-1.10 tests: - as: verify commands: go get golang.org/x/tools/imports; make build verify diff --git a/ci-operator/config/openshift/api/openshift-api-release-4.1.yaml b/ci-operator/config/openshift/api/openshift-api-release-4.1.yaml index 897ad39bfd728..009e3b69e4138 100644 --- a/ci-operator/config/openshift/api/openshift-api-release-4.1.yaml +++ b/ci-operator/config/openshift/api/openshift-api-release-4.1.yaml @@ -1,6 +1,5 @@ build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.11 @@ -15,7 +14,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/api/openshift-api-release-4.2.yaml b/ci-operator/config/openshift/api/openshift-api-release-4.2.yaml index 3653e95ecc0e4..6fd8b2eae0ffb 100644 --- a/ci-operator/config/openshift/api/openshift-api-release-4.2.yaml +++ b/ci-operator/config/openshift/api/openshift-api-release-4.2.yaml @@ -1,6 +1,5 @@ build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -15,7 +14,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/api/openshift-api-release-4.3.yaml b/ci-operator/config/openshift/api/openshift-api-release-4.3.yaml index ca01e83157ddd..8e72f7bc1f13f 100644 --- a/ci-operator/config/openshift/api/openshift-api-release-4.3.yaml +++ b/ci-operator/config/openshift/api/openshift-api-release-4.3.yaml @@ -1,6 +1,5 @@ build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -16,7 +15,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/api/openshift-api-release-4.4.yaml b/ci-operator/config/openshift/api/openshift-api-release-4.4.yaml index 559aaa691b07e..28a5e5fe4b6e7 100644 --- a/ci-operator/config/openshift/api/openshift-api-release-4.4.yaml +++ b/ci-operator/config/openshift/api/openshift-api-release-4.4.yaml @@ -1,6 +1,5 @@ build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -15,7 +14,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/apiserver-library-go/openshift-apiserver-library-go-master.yaml b/ci-operator/config/openshift/apiserver-library-go/openshift-apiserver-library-go-master.yaml index b43a45a9a8518..449366d3ded9a 100644 --- a/ci-operator/config/openshift/apiserver-library-go/openshift-apiserver-library-go-master.yaml +++ b/ci-operator/config/openshift/apiserver-library-go/openshift-apiserver-library-go-master.yaml @@ -1,13 +1,11 @@ base_images: os: - cluster: https://api.ci.openshift.org name: centos namespace: openshift tag: "7" binary_build_commands: make build --warn-undefined-variables build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 diff --git a/ci-operator/config/openshift/apiserver-library-go/openshift-apiserver-library-go-release-4.3.yaml b/ci-operator/config/openshift/apiserver-library-go/openshift-apiserver-library-go-release-4.3.yaml index 9a5ae539b490a..8dcaf608c2624 100644 --- a/ci-operator/config/openshift/apiserver-library-go/openshift-apiserver-library-go-release-4.3.yaml +++ b/ci-operator/config/openshift/apiserver-library-go/openshift-apiserver-library-go-release-4.3.yaml @@ -1,13 +1,11 @@ base_images: os: - cluster: https://api.ci.openshift.org name: centos namespace: openshift tag: "7" binary_build_commands: make build --warn-undefined-variables build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 diff --git a/ci-operator/config/openshift/apiserver-library-go/openshift-apiserver-library-go-release-4.4.yaml b/ci-operator/config/openshift/apiserver-library-go/openshift-apiserver-library-go-release-4.4.yaml index 3e94ae7173768..862f316f85b51 100644 --- a/ci-operator/config/openshift/apiserver-library-go/openshift-apiserver-library-go-release-4.4.yaml +++ b/ci-operator/config/openshift/apiserver-library-go/openshift-apiserver-library-go-release-4.4.yaml @@ -1,13 +1,11 @@ base_images: os: - cluster: https://api.ci.openshift.org name: centos namespace: openshift tag: "7" binary_build_commands: make build --warn-undefined-variables build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 diff --git a/ci-operator/config/openshift/aws-account-operator/openshift-aws-account-operator-master.yaml b/ci-operator/config/openshift/aws-account-operator/openshift-aws-account-operator-master.yaml index 2be51983498be..58cf169f70744 100644 --- a/ci-operator/config/openshift/aws-account-operator/openshift-aws-account-operator-master.yaml +++ b/ci-operator/config/openshift/aws-account-operator/openshift-aws-account-operator-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,6 +23,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp diff --git a/ci-operator/config/openshift/aws-account-operator/openshift-aws-account-operator-release-4.1.yaml b/ci-operator/config/openshift/aws-account-operator/openshift-aws-account-operator-release-4.1.yaml index 87f5ab5a5dfc2..3dfd0ecc61500 100644 --- a/ci-operator/config/openshift/aws-account-operator/openshift-aws-account-operator-release-4.1.yaml +++ b/ci-operator/config/openshift/aws-account-operator/openshift-aws-account-operator-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,6 +23,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp diff --git a/ci-operator/config/openshift/aws-account-operator/openshift-aws-account-operator-release-4.2.yaml b/ci-operator/config/openshift/aws-account-operator/openshift-aws-account-operator-release-4.2.yaml index 4d40134ff6b0e..18acaf29d300a 100644 --- a/ci-operator/config/openshift/aws-account-operator/openshift-aws-account-operator-release-4.2.yaml +++ b/ci-operator/config/openshift/aws-account-operator/openshift-aws-account-operator-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,6 +23,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp diff --git a/ci-operator/config/openshift/aws-account-operator/openshift-aws-account-operator-release-4.3.yaml b/ci-operator/config/openshift/aws-account-operator/openshift-aws-account-operator-release-4.3.yaml index 7261e8b696fa5..2d87f22e28f8b 100644 --- a/ci-operator/config/openshift/aws-account-operator/openshift-aws-account-operator-release-4.3.yaml +++ b/ci-operator/config/openshift/aws-account-operator/openshift-aws-account-operator-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -26,6 +24,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp diff --git a/ci-operator/config/openshift/aws-account-operator/openshift-aws-account-operator-release-4.4.yaml b/ci-operator/config/openshift/aws-account-operator/openshift-aws-account-operator-release-4.4.yaml index ea7db8eead687..9f0cd28910f25 100644 --- a/ci-operator/config/openshift/aws-account-operator/openshift-aws-account-operator-release-4.4.yaml +++ b/ci-operator/config/openshift/aws-account-operator/openshift-aws-account-operator-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,6 +23,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp diff --git a/ci-operator/config/openshift/baremetal-operator/openshift-baremetal-operator-master.yaml b/ci-operator/config/openshift/baremetal-operator/openshift-baremetal-operator-master.yaml index 98197cacc0c29..ed535728b5738 100644 --- a/ci-operator/config/openshift/baremetal-operator/openshift-baremetal-operator-master.yaml +++ b/ci-operator/config/openshift/baremetal-operator/openshift-baremetal-operator-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -26,7 +24,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/baremetal-operator/openshift-baremetal-operator-release-4.1.yaml b/ci-operator/config/openshift/baremetal-operator/openshift-baremetal-operator-release-4.1.yaml index 7639e37bab007..ce575a442ad09 100644 --- a/ci-operator/config/openshift/baremetal-operator/openshift-baremetal-operator-release-4.1.yaml +++ b/ci-operator/config/openshift/baremetal-operator/openshift-baremetal-operator-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -26,7 +24,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/baremetal-operator/openshift-baremetal-operator-release-4.2.yaml b/ci-operator/config/openshift/baremetal-operator/openshift-baremetal-operator-release-4.2.yaml index 88f17356becae..58af9591777ba 100644 --- a/ci-operator/config/openshift/baremetal-operator/openshift-baremetal-operator-release-4.2.yaml +++ b/ci-operator/config/openshift/baremetal-operator/openshift-baremetal-operator-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -26,7 +24,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/baremetal-operator/openshift-baremetal-operator-release-4.3.yaml b/ci-operator/config/openshift/baremetal-operator/openshift-baremetal-operator-release-4.3.yaml index 53726c0b2dbd7..5c9b0381c758f 100644 --- a/ci-operator/config/openshift/baremetal-operator/openshift-baremetal-operator-release-4.3.yaml +++ b/ci-operator/config/openshift/baremetal-operator/openshift-baremetal-operator-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -27,7 +25,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/baremetal-operator/openshift-baremetal-operator-release-4.4.yaml b/ci-operator/config/openshift/baremetal-operator/openshift-baremetal-operator-release-4.4.yaml index 3b942f1ada00b..56e2681f4d291 100644 --- a/ci-operator/config/openshift/baremetal-operator/openshift-baremetal-operator-release-4.4.yaml +++ b/ci-operator/config/openshift/baremetal-operator/openshift-baremetal-operator-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -26,7 +24,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/baremetal-runtimecfg/openshift-baremetal-runtimecfg-master.yaml b/ci-operator/config/openshift/baremetal-runtimecfg/openshift-baremetal-runtimecfg-master.yaml index c66f905f3babb..07078bb8c7acf 100644 --- a/ci-operator/config/openshift/baremetal-runtimecfg/openshift-baremetal-runtimecfg-master.yaml +++ b/ci-operator/config/openshift/baremetal-runtimecfg/openshift-baremetal-runtimecfg-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/baremetal-runtimecfg/openshift-baremetal-runtimecfg-release-4.2.yaml b/ci-operator/config/openshift/baremetal-runtimecfg/openshift-baremetal-runtimecfg-release-4.2.yaml index 9651ad66c8175..668617e5488d8 100644 --- a/ci-operator/config/openshift/baremetal-runtimecfg/openshift-baremetal-runtimecfg-release-4.2.yaml +++ b/ci-operator/config/openshift/baremetal-runtimecfg/openshift-baremetal-runtimecfg-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/baremetal-runtimecfg/openshift-baremetal-runtimecfg-release-4.3.yaml b/ci-operator/config/openshift/baremetal-runtimecfg/openshift-baremetal-runtimecfg-release-4.3.yaml index aa8f7b2b4cdfd..5dff25591328e 100644 --- a/ci-operator/config/openshift/baremetal-runtimecfg/openshift-baremetal-runtimecfg-release-4.3.yaml +++ b/ci-operator/config/openshift/baremetal-runtimecfg/openshift-baremetal-runtimecfg-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/baremetal-runtimecfg/openshift-baremetal-runtimecfg-release-4.4.yaml b/ci-operator/config/openshift/baremetal-runtimecfg/openshift-baremetal-runtimecfg-release-4.4.yaml index dcffa00b46dd1..993e10f677c3a 100644 --- a/ci-operator/config/openshift/baremetal-runtimecfg/openshift-baremetal-runtimecfg-release-4.4.yaml +++ b/ci-operator/config/openshift/baremetal-runtimecfg/openshift-baremetal-runtimecfg-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/builder/openshift-builder-master.yaml b/ci-operator/config/openshift/builder/openshift-builder-master.yaml index ba2831f734801..c1b62fd967dea 100644 --- a/ci-operator/config/openshift/builder/openshift-builder-master.yaml +++ b/ci-operator/config/openshift/builder/openshift-builder-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/builder/openshift-builder-release-4.1.yaml b/ci-operator/config/openshift/builder/openshift-builder-release-4.1.yaml index b4eb013ae57a6..ee74475c82336 100644 --- a/ci-operator/config/openshift/builder/openshift-builder-release-4.1.yaml +++ b/ci-operator/config/openshift/builder/openshift-builder-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/builder/openshift-builder-release-4.2.yaml b/ci-operator/config/openshift/builder/openshift-builder-release-4.2.yaml index e8f0362598c2a..409eb9468f90c 100644 --- a/ci-operator/config/openshift/builder/openshift-builder-release-4.2.yaml +++ b/ci-operator/config/openshift/builder/openshift-builder-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/builder/openshift-builder-release-4.3.yaml b/ci-operator/config/openshift/builder/openshift-builder-release-4.3.yaml index a1e0e49745344..6995e228fb0e9 100644 --- a/ci-operator/config/openshift/builder/openshift-builder-release-4.3.yaml +++ b/ci-operator/config/openshift/builder/openshift-builder-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/builder/openshift-builder-release-4.4.yaml b/ci-operator/config/openshift/builder/openshift-builder-release-4.4.yaml index c9ba5be07998b..899afe726a6f5 100644 --- a/ci-operator/config/openshift/builder/openshift-builder-release-4.4.yaml +++ b/ci-operator/config/openshift/builder/openshift-builder-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/certman-operator/openshift-certman-operator-master.yaml b/ci-operator/config/openshift/certman-operator/openshift-certman-operator-master.yaml index f98075cee1af6..9b44cafbe65d5 100644 --- a/ci-operator/config/openshift/certman-operator/openshift-certman-operator-master.yaml +++ b/ci-operator/config/openshift/certman-operator/openshift-certman-operator-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.11 @@ -25,6 +23,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp diff --git a/ci-operator/config/openshift/certman-operator/openshift-certman-operator-release-4.1.yaml b/ci-operator/config/openshift/certman-operator/openshift-certman-operator-release-4.1.yaml index bc3e4fd891244..3af4ffe2f4572 100644 --- a/ci-operator/config/openshift/certman-operator/openshift-certman-operator-release-4.1.yaml +++ b/ci-operator/config/openshift/certman-operator/openshift-certman-operator-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.11 @@ -25,6 +23,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp diff --git a/ci-operator/config/openshift/certman-operator/openshift-certman-operator-release-4.2.yaml b/ci-operator/config/openshift/certman-operator/openshift-certman-operator-release-4.2.yaml index c1ffaccecf765..58262c46db829 100644 --- a/ci-operator/config/openshift/certman-operator/openshift-certman-operator-release-4.2.yaml +++ b/ci-operator/config/openshift/certman-operator/openshift-certman-operator-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.11 @@ -25,6 +23,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp diff --git a/ci-operator/config/openshift/certman-operator/openshift-certman-operator-release-4.3.yaml b/ci-operator/config/openshift/certman-operator/openshift-certman-operator-release-4.3.yaml index ccb33f538a279..ca19d028375a1 100644 --- a/ci-operator/config/openshift/certman-operator/openshift-certman-operator-release-4.3.yaml +++ b/ci-operator/config/openshift/certman-operator/openshift-certman-operator-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.11 @@ -26,6 +24,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp diff --git a/ci-operator/config/openshift/certman-operator/openshift-certman-operator-release-4.4.yaml b/ci-operator/config/openshift/certman-operator/openshift-certman-operator-release-4.4.yaml index 302e4636bd752..c91f2877466a9 100644 --- a/ci-operator/config/openshift/certman-operator/openshift-certman-operator-release-4.4.yaml +++ b/ci-operator/config/openshift/certman-operator/openshift-certman-operator-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.11 @@ -25,6 +23,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp diff --git a/ci-operator/config/openshift/ci-chat-bot/openshift-ci-chat-bot-master.yaml b/ci-operator/config/openshift/ci-chat-bot/openshift-ci-chat-bot-master.yaml index 32fc8d666c708..d7dce83dee12c 100644 --- a/ci-operator/config/openshift/ci-chat-bot/openshift-ci-chat-bot-master.yaml +++ b/ci-operator/config/openshift/ci-chat-bot/openshift-ci-chat-bot-master.yaml @@ -1,20 +1,12 @@ base_images: base: - cluster: https://api.ci.openshift.org name: centos namespace: openshift - tag: "7" -build_root: - image_stream_tag: - cluster: https://api.ci.openshift.org - name: release - namespace: openshift - tag: golang-1.10 + tag: '7' images: - from: base to: ci-chat-bot promotion: - name: "" namespace: ci tag: latest resources: @@ -24,3 +16,8 @@ resources: requests: cpu: 100m memory: 200Mi +build_root: + image_stream_tag: + name: release + namespace: openshift + tag: golang-1.10 diff --git a/ci-operator/config/openshift/ci-ns-ttl-controller/openshift-ci-ns-ttl-controller-master.yaml b/ci-operator/config/openshift/ci-ns-ttl-controller/openshift-ci-ns-ttl-controller-master.yaml index cd4c60bea6b45..37991cf94e219 100644 --- a/ci-operator/config/openshift/ci-ns-ttl-controller/openshift-ci-ns-ttl-controller-master.yaml +++ b/ci-operator/config/openshift/ci-ns-ttl-controller/openshift-ci-ns-ttl-controller-master.yaml @@ -3,14 +3,8 @@ base_images: cluster: https://api.ci.openshift.org name: alpine namespace: ci - tag: "3.10" + tag: '3.10' binary_build_commands: make CGO_ENABLED=0 install -build_root: - image_stream_tag: - cluster: https://api.ci.openshift.org - name: release - namespace: openshift - tag: golang-1.13 images: - context_dir: image/ from: os @@ -21,7 +15,7 @@ images: source_path: /go/bin/ci-ns-ttl-controller to: ci-ns-ttl-controller promotion: - name: "" + cluster: https://api.ci.openshift.org namespace: ci tag: latest resources: @@ -31,6 +25,12 @@ resources: requests: cpu: 100m memory: 200Mi +build_root: + image_stream_tag: + cluster: https://api.ci.openshift.org + name: release + namespace: openshift + tag: golang-1.13 tests: - artifact_dir: /tmp/artifacts as: unit diff --git a/ci-operator/config/openshift/ci-search/openshift-ci-search-master.yaml b/ci-operator/config/openshift/ci-search/openshift-ci-search-master.yaml index 6a27beeea0081..680abd6f32ee6 100644 --- a/ci-operator/config/openshift/ci-search/openshift-ci-search-master.yaml +++ b/ci-operator/config/openshift/ci-search/openshift-ci-search-master.yaml @@ -1,20 +1,12 @@ base_images: base: - cluster: https://api.ci.openshift.org name: centos namespace: openshift - tag: "7" -build_root: - image_stream_tag: - cluster: https://api.ci.openshift.org - name: release - namespace: openshift - tag: golang-1.11 + tag: '7' images: - from: base to: ci-search promotion: - name: "" namespace: ci-search tag: latest resources: @@ -24,3 +16,8 @@ resources: requests: cpu: 100m memory: 200Mi +build_root: + image_stream_tag: + name: release + namespace: openshift + tag: golang-1.11 diff --git a/ci-operator/config/openshift/ci-secret-mirroring-controller/openshift-ci-secret-mirroring-controller-master.yaml b/ci-operator/config/openshift/ci-secret-mirroring-controller/openshift-ci-secret-mirroring-controller-master.yaml index 3c28ffd3fcca9..b460bc6ffdddd 100644 --- a/ci-operator/config/openshift/ci-secret-mirroring-controller/openshift-ci-secret-mirroring-controller-master.yaml +++ b/ci-operator/config/openshift/ci-secret-mirroring-controller/openshift-ci-secret-mirroring-controller-master.yaml @@ -3,14 +3,8 @@ base_images: cluster: https://api.ci.openshift.org name: centos namespace: openshift - tag: "7" + tag: '7' binary_build_commands: make install -build_root: - image_stream_tag: - cluster: https://api.ci.openshift.org - name: release - namespace: openshift - tag: golang-1.12 images: - context_dir: image/ from: os @@ -21,7 +15,6 @@ images: source_path: /go/bin/ci-secret-mirroring-controller to: ci-secret-mirroring-controller promotion: - name: "" namespace: ci tag: latest resources: @@ -31,6 +24,12 @@ resources: requests: cpu: 100m memory: 200Mi +build_root: + image_stream_tag: + cluster: https://api.ci.openshift.org + name: release + namespace: openshift + tag: golang-1.12 tests: - artifact_dir: /tmp/artifacts as: unit diff --git a/ci-operator/config/openshift/ci-tools/openshift-ci-tools-master.yaml b/ci-operator/config/openshift/ci-tools/openshift-ci-tools-master.yaml index b37b502af057e..5a2c91ebab1df 100644 --- a/ci-operator/config/openshift/ci-tools/openshift-ci-tools-master.yaml +++ b/ci-operator/config/openshift/ci-tools/openshift-ci-tools-master.yaml @@ -1,31 +1,21 @@ base_images: - cli: - cluster: https://api.ci.openshift.org - name: "4.2" - namespace: ocp - tag: cli + os: + name: centos + namespace: openshift + tag: '7' git: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.13 hive: - cluster: https://api.ci.openshift.org name: hive-v4.0 namespace: openshift - tag: hive - os: - cluster: https://api.ci.openshift.org - name: centos - namespace: openshift - tag: "7" + tag: 'hive' + cli: + name: "4.2" + namespace: ocp + tag: cli binary_build_commands: make install -build_root: - image_stream_tag: - cluster: https://api.ci.openshift.org - name: release - namespace: openshift - tag: golang-1.13 images: - context_dir: images/blocking-issue-creator/ from: os @@ -134,8 +124,8 @@ images: inputs: bin: paths: - - destination_dir: . - source_path: /go/bin/applyconfig + - destination_dir: . + source_path: /go/bin/applyconfig cli: paths: - destination_dir: usr/bin @@ -198,7 +188,6 @@ images: source_path: /go/bin/determinize-prow-config to: determinize-prow-config promotion: - name: "" namespace: ci tag: latest resources: @@ -208,6 +197,11 @@ resources: requests: cpu: 100m memory: 200Mi +build_root: + image_stream_tag: + name: release + namespace: openshift + tag: golang-1.13 tests: - artifact_dir: /tmp/artifacts as: unit diff --git a/ci-operator/config/openshift/cincinnati/openshift-cincinnati-master.yaml b/ci-operator/config/openshift/cincinnati/openshift-cincinnati-master.yaml index 298336ee3936e..a60dd7dc376d0 100644 --- a/ci-operator/config/openshift/cincinnati/openshift-cincinnati-master.yaml +++ b/ci-operator/config/openshift/cincinnati/openshift-cincinnati-master.yaml @@ -1,14 +1,15 @@ base_images: centos7: - cluster: https://api.ci.openshift.org name: centos namespace: openshift tag: "7" + build_root: project_image: dockerfile_path: dist/openshift-release/Dockerfile.builder + resources: - '*': + "*": limits: memory: 4Gi requests: @@ -20,20 +21,21 @@ resources: requests: cpu: "3" memory: 5Gi + tests: -- as: yaml-lint - commands: dist/prow_yaml_lint.sh - container: - from: src -- as: rustfmt-1.39.0 - commands: dist/prow_rustfmt.sh 1.39.0 - container: - from: src -- as: rustfmt-1.38.0 - commands: dist/prow_rustfmt.sh 1.38.0 - container: - from: src -- as: rustfmt-1.37.0 - commands: dist/prow_rustfmt.sh 1.37.0 - container: - from: src + - as: yaml-lint + commands: dist/prow_yaml_lint.sh + container: + from: src + - as: rustfmt-1.39.0 + commands: dist/prow_rustfmt.sh 1.39.0 + container: + from: src + - as: rustfmt-1.38.0 + commands: dist/prow_rustfmt.sh 1.38.0 + container: + from: src + - as: rustfmt-1.37.0 + commands: dist/prow_rustfmt.sh 1.37.0 + container: + from: src diff --git a/ci-operator/config/openshift/client-go/openshift-client-go-master.yaml b/ci-operator/config/openshift/client-go/openshift-client-go-master.yaml index 0bcd9459825f8..8d0ee1d293410 100644 --- a/ci-operator/config/openshift/client-go/openshift-client-go-master.yaml +++ b/ci-operator/config/openshift/client-go/openshift-client-go-master.yaml @@ -1,6 +1,5 @@ build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -15,7 +14,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/client-go/openshift-client-go-release-4.1.yaml b/ci-operator/config/openshift/client-go/openshift-client-go-release-4.1.yaml index 8e4fb955219d0..2f5e748858f8f 100644 --- a/ci-operator/config/openshift/client-go/openshift-client-go-release-4.1.yaml +++ b/ci-operator/config/openshift/client-go/openshift-client-go-release-4.1.yaml @@ -1,6 +1,5 @@ build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.11 @@ -15,7 +14,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/client-go/openshift-client-go-release-4.2.yaml b/ci-operator/config/openshift/client-go/openshift-client-go-release-4.2.yaml index 71523c4d12776..18e354782a6bc 100644 --- a/ci-operator/config/openshift/client-go/openshift-client-go-release-4.2.yaml +++ b/ci-operator/config/openshift/client-go/openshift-client-go-release-4.2.yaml @@ -1,6 +1,5 @@ build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -15,7 +14,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/client-go/openshift-client-go-release-4.3.yaml b/ci-operator/config/openshift/client-go/openshift-client-go-release-4.3.yaml index 68e9df7f38a08..be784ad1fa27c 100644 --- a/ci-operator/config/openshift/client-go/openshift-client-go-release-4.3.yaml +++ b/ci-operator/config/openshift/client-go/openshift-client-go-release-4.3.yaml @@ -1,6 +1,5 @@ build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -16,7 +15,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/client-go/openshift-client-go-release-4.4.yaml b/ci-operator/config/openshift/client-go/openshift-client-go-release-4.4.yaml index f41b162b18b58..03f03f6497e44 100644 --- a/ci-operator/config/openshift/client-go/openshift-client-go-release-4.4.yaml +++ b/ci-operator/config/openshift/client-go/openshift-client-go-release-4.4.yaml @@ -1,6 +1,5 @@ build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -15,7 +14,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cloud-credential-operator/openshift-cloud-credential-operator-master.yaml b/ci-operator/config/openshift/cloud-credential-operator/openshift-cloud-credential-operator-master.yaml index 9490af4094e16..9ae558ed9e2a2 100644 --- a/ci-operator/config/openshift/cloud-credential-operator/openshift-cloud-credential-operator-master.yaml +++ b/ci-operator/config/openshift/cloud-credential-operator/openshift-cloud-credential-operator-master.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base binary_build_commands: make build-no-gen build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -26,7 +24,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cloud-credential-operator/openshift-cloud-credential-operator-release-4.1.yaml b/ci-operator/config/openshift/cloud-credential-operator/openshift-cloud-credential-operator-release-4.1.yaml index 8f00996a6ecdb..afcc631335136 100644 --- a/ci-operator/config/openshift/cloud-credential-operator/openshift-cloud-credential-operator-release-4.1.yaml +++ b/ci-operator/config/openshift/cloud-credential-operator/openshift-cloud-credential-operator-release-4.1.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base binary_build_commands: make build-no-gen build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -26,7 +24,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cloud-credential-operator/openshift-cloud-credential-operator-release-4.2.yaml b/ci-operator/config/openshift/cloud-credential-operator/openshift-cloud-credential-operator-release-4.2.yaml index 46570bde2d93e..ba747c6eb9ec2 100644 --- a/ci-operator/config/openshift/cloud-credential-operator/openshift-cloud-credential-operator-release-4.2.yaml +++ b/ci-operator/config/openshift/cloud-credential-operator/openshift-cloud-credential-operator-release-4.2.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base binary_build_commands: make build-no-gen build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -26,7 +24,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cloud-credential-operator/openshift-cloud-credential-operator-release-4.3.yaml b/ci-operator/config/openshift/cloud-credential-operator/openshift-cloud-credential-operator-release-4.3.yaml index f79ceace884b8..3f0a469a39498 100644 --- a/ci-operator/config/openshift/cloud-credential-operator/openshift-cloud-credential-operator-release-4.3.yaml +++ b/ci-operator/config/openshift/cloud-credential-operator/openshift-cloud-credential-operator-release-4.3.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base binary_build_commands: make build-no-gen build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -27,7 +25,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cloud-credential-operator/openshift-cloud-credential-operator-release-4.4.yaml b/ci-operator/config/openshift/cloud-credential-operator/openshift-cloud-credential-operator-release-4.4.yaml index a78be49bcf865..377667b98421b 100644 --- a/ci-operator/config/openshift/cloud-credential-operator/openshift-cloud-credential-operator-release-4.4.yaml +++ b/ci-operator/config/openshift/cloud-credential-operator/openshift-cloud-credential-operator-release-4.4.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base binary_build_commands: make build-no-gen build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -26,7 +24,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cloud-provider-openstack/openshift-cloud-provider-openstack-master.yaml b/ci-operator/config/openshift/cloud-provider-openstack/openshift-cloud-provider-openstack-master.yaml index 8200fb01d7d6f..a7a468254730a 100644 --- a/ci-operator/config/openshift/cloud-provider-openstack/openshift-cloud-provider-openstack-master.yaml +++ b/ci-operator/config/openshift/cloud-provider-openstack/openshift-cloud-provider-openstack-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.11 @@ -31,7 +29,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cloud-provider-openstack/openshift-cloud-provider-openstack-release-4.1.yaml b/ci-operator/config/openshift/cloud-provider-openstack/openshift-cloud-provider-openstack-release-4.1.yaml index fcbe79c0cca32..a9104c113a2c9 100644 --- a/ci-operator/config/openshift/cloud-provider-openstack/openshift-cloud-provider-openstack-release-4.1.yaml +++ b/ci-operator/config/openshift/cloud-provider-openstack/openshift-cloud-provider-openstack-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.11 @@ -31,7 +29,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cloud-provider-openstack/openshift-cloud-provider-openstack-release-4.2.yaml b/ci-operator/config/openshift/cloud-provider-openstack/openshift-cloud-provider-openstack-release-4.2.yaml index 3a9fd04478d7e..62902395e5a5f 100644 --- a/ci-operator/config/openshift/cloud-provider-openstack/openshift-cloud-provider-openstack-release-4.2.yaml +++ b/ci-operator/config/openshift/cloud-provider-openstack/openshift-cloud-provider-openstack-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.11 @@ -31,7 +29,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cloud-provider-openstack/openshift-cloud-provider-openstack-release-4.3.yaml b/ci-operator/config/openshift/cloud-provider-openstack/openshift-cloud-provider-openstack-release-4.3.yaml index 77e35d95fd4fa..da1901d52f227 100644 --- a/ci-operator/config/openshift/cloud-provider-openstack/openshift-cloud-provider-openstack-release-4.3.yaml +++ b/ci-operator/config/openshift/cloud-provider-openstack/openshift-cloud-provider-openstack-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.11 @@ -32,7 +30,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cloud-provider-openstack/openshift-cloud-provider-openstack-release-4.4.yaml b/ci-operator/config/openshift/cloud-provider-openstack/openshift-cloud-provider-openstack-release-4.4.yaml index c2e6c30e5144e..1d9542d0287ee 100644 --- a/ci-operator/config/openshift/cloud-provider-openstack/openshift-cloud-provider-openstack-release-4.4.yaml +++ b/ci-operator/config/openshift/cloud-provider-openstack/openshift-cloud-provider-openstack-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.11 @@ -31,7 +29,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-api-actuator-pkg/openshift-cluster-api-actuator-pkg-master.yaml b/ci-operator/config/openshift/cluster-api-actuator-pkg/openshift-cluster-api-actuator-pkg-master.yaml index 28c30226bb2af..a81d2028755cc 100644 --- a/ci-operator/config/openshift/cluster-api-actuator-pkg/openshift-cluster-api-actuator-pkg-master.yaml +++ b/ci-operator/config/openshift/cluster-api-actuator-pkg/openshift-cluster-api-actuator-pkg-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -21,7 +19,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-api-actuator-pkg/openshift-cluster-api-actuator-pkg-release-4.1.yaml b/ci-operator/config/openshift/cluster-api-actuator-pkg/openshift-cluster-api-actuator-pkg-release-4.1.yaml index 8dba4dfcd5333..fb968c2698a15 100644 --- a/ci-operator/config/openshift/cluster-api-actuator-pkg/openshift-cluster-api-actuator-pkg-release-4.1.yaml +++ b/ci-operator/config/openshift/cluster-api-actuator-pkg/openshift-cluster-api-actuator-pkg-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -21,7 +19,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-api-actuator-pkg/openshift-cluster-api-actuator-pkg-release-4.2.yaml b/ci-operator/config/openshift/cluster-api-actuator-pkg/openshift-cluster-api-actuator-pkg-release-4.2.yaml index 57384b0fc9e3e..f2550395b25b1 100644 --- a/ci-operator/config/openshift/cluster-api-actuator-pkg/openshift-cluster-api-actuator-pkg-release-4.2.yaml +++ b/ci-operator/config/openshift/cluster-api-actuator-pkg/openshift-cluster-api-actuator-pkg-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -21,7 +19,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-api-actuator-pkg/openshift-cluster-api-actuator-pkg-release-4.3.yaml b/ci-operator/config/openshift/cluster-api-actuator-pkg/openshift-cluster-api-actuator-pkg-release-4.3.yaml index 5dc7d982c36fd..1c8fc83351ef5 100644 --- a/ci-operator/config/openshift/cluster-api-actuator-pkg/openshift-cluster-api-actuator-pkg-release-4.3.yaml +++ b/ci-operator/config/openshift/cluster-api-actuator-pkg/openshift-cluster-api-actuator-pkg-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -22,7 +20,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-api-actuator-pkg/openshift-cluster-api-actuator-pkg-release-4.4.yaml b/ci-operator/config/openshift/cluster-api-actuator-pkg/openshift-cluster-api-actuator-pkg-release-4.4.yaml index 5d94b068b48b0..c9fd66971d3ee 100644 --- a/ci-operator/config/openshift/cluster-api-actuator-pkg/openshift-cluster-api-actuator-pkg-release-4.4.yaml +++ b/ci-operator/config/openshift/cluster-api-actuator-pkg/openshift-cluster-api-actuator-pkg-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -21,7 +19,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-master.yaml b/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-master.yaml index f29ceb96f6cb6..afa91117091df 100644 --- a/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-master.yaml +++ b/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-master.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base binary_build_commands: NO_DOCKER=1 make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -27,7 +25,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.1.yaml b/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.1.yaml index 4c1f744bb106e..55993b4c97371 100644 --- a/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.1.yaml +++ b/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.1.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base binary_build_commands: NO_DOCKER=1 make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -27,7 +25,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.2.yaml b/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.2.yaml index 7236716a6c389..501fdfbb61d19 100644 --- a/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.2.yaml +++ b/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.2.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base binary_build_commands: NO_DOCKER=1 make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -27,7 +25,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.3.yaml b/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.3.yaml index eb3c89b689371..f94e3b344d044 100644 --- a/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.3.yaml +++ b/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.3.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base binary_build_commands: NO_DOCKER=1 make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -28,7 +26,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.4.yaml b/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.4.yaml index 47b66453b78c5..53a5eb9688c3f 100644 --- a/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.4.yaml +++ b/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.4.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base binary_build_commands: NO_DOCKER=1 make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -27,7 +25,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-api-provider-azure/openshift-cluster-api-provider-azure-master.yaml b/ci-operator/config/openshift/cluster-api-provider-azure/openshift-cluster-api-provider-azure-master.yaml index 0ee36ffa9fd94..d30cc4afa103a 100644 --- a/ci-operator/config/openshift/cluster-api-provider-azure/openshift-cluster-api-provider-azure-master.yaml +++ b/ci-operator/config/openshift/cluster-api-provider-azure/openshift-cluster-api-provider-azure-master.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base binary_build_commands: go build -o bin/manager sigs.k8s.io/cluster-api-provider-azure/cmd/manager/ build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -27,7 +25,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-api-provider-azure/openshift-cluster-api-provider-azure-release-4.1.yaml b/ci-operator/config/openshift/cluster-api-provider-azure/openshift-cluster-api-provider-azure-release-4.1.yaml index da3036f0f9e3e..3ccf1a040648c 100644 --- a/ci-operator/config/openshift/cluster-api-provider-azure/openshift-cluster-api-provider-azure-release-4.1.yaml +++ b/ci-operator/config/openshift/cluster-api-provider-azure/openshift-cluster-api-provider-azure-release-4.1.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base binary_build_commands: go build -o bin/manager sigs.k8s.io/cluster-api-provider-azure/cmd/manager/ build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -27,7 +25,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-api-provider-azure/openshift-cluster-api-provider-azure-release-4.2.yaml b/ci-operator/config/openshift/cluster-api-provider-azure/openshift-cluster-api-provider-azure-release-4.2.yaml index 187844fdd81f6..990f2c899d088 100644 --- a/ci-operator/config/openshift/cluster-api-provider-azure/openshift-cluster-api-provider-azure-release-4.2.yaml +++ b/ci-operator/config/openshift/cluster-api-provider-azure/openshift-cluster-api-provider-azure-release-4.2.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base binary_build_commands: go build -o bin/manager sigs.k8s.io/cluster-api-provider-azure/cmd/manager/ build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -27,7 +25,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-api-provider-azure/openshift-cluster-api-provider-azure-release-4.3.yaml b/ci-operator/config/openshift/cluster-api-provider-azure/openshift-cluster-api-provider-azure-release-4.3.yaml index d3a5865e149fa..8da0a77c804cd 100644 --- a/ci-operator/config/openshift/cluster-api-provider-azure/openshift-cluster-api-provider-azure-release-4.3.yaml +++ b/ci-operator/config/openshift/cluster-api-provider-azure/openshift-cluster-api-provider-azure-release-4.3.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base binary_build_commands: go build -o bin/manager sigs.k8s.io/cluster-api-provider-azure/cmd/manager/ build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -28,7 +26,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-api-provider-azure/openshift-cluster-api-provider-azure-release-4.4.yaml b/ci-operator/config/openshift/cluster-api-provider-azure/openshift-cluster-api-provider-azure-release-4.4.yaml index 49d356ad7b389..34a0cb89b2fc8 100644 --- a/ci-operator/config/openshift/cluster-api-provider-azure/openshift-cluster-api-provider-azure-release-4.4.yaml +++ b/ci-operator/config/openshift/cluster-api-provider-azure/openshift-cluster-api-provider-azure-release-4.4.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base binary_build_commands: go build -o bin/manager sigs.k8s.io/cluster-api-provider-azure/cmd/manager/ build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -27,7 +25,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-api-provider-baremetal/openshift-cluster-api-provider-baremetal-master.yaml b/ci-operator/config/openshift/cluster-api-provider-baremetal/openshift-cluster-api-provider-baremetal-master.yaml index 4aeecfb45458c..d19b0065fc279 100644 --- a/ci-operator/config/openshift/cluster-api-provider-baremetal/openshift-cluster-api-provider-baremetal-master.yaml +++ b/ci-operator/config/openshift/cluster-api-provider-baremetal/openshift-cluster-api-provider-baremetal-master.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base binary_build_commands: make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -27,7 +25,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-api-provider-baremetal/openshift-cluster-api-provider-baremetal-release-4.1.yaml b/ci-operator/config/openshift/cluster-api-provider-baremetal/openshift-cluster-api-provider-baremetal-release-4.1.yaml index 4686bae49d4a3..cf50c3f5d7294 100644 --- a/ci-operator/config/openshift/cluster-api-provider-baremetal/openshift-cluster-api-provider-baremetal-release-4.1.yaml +++ b/ci-operator/config/openshift/cluster-api-provider-baremetal/openshift-cluster-api-provider-baremetal-release-4.1.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base binary_build_commands: make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -27,7 +25,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-api-provider-baremetal/openshift-cluster-api-provider-baremetal-release-4.2.yaml b/ci-operator/config/openshift/cluster-api-provider-baremetal/openshift-cluster-api-provider-baremetal-release-4.2.yaml index 7cb2093847ecf..9fcd711ac8046 100644 --- a/ci-operator/config/openshift/cluster-api-provider-baremetal/openshift-cluster-api-provider-baremetal-release-4.2.yaml +++ b/ci-operator/config/openshift/cluster-api-provider-baremetal/openshift-cluster-api-provider-baremetal-release-4.2.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base binary_build_commands: make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -27,7 +25,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-api-provider-baremetal/openshift-cluster-api-provider-baremetal-release-4.3.yaml b/ci-operator/config/openshift/cluster-api-provider-baremetal/openshift-cluster-api-provider-baremetal-release-4.3.yaml index 0b7af156ad916..b37a70099432f 100644 --- a/ci-operator/config/openshift/cluster-api-provider-baremetal/openshift-cluster-api-provider-baremetal-release-4.3.yaml +++ b/ci-operator/config/openshift/cluster-api-provider-baremetal/openshift-cluster-api-provider-baremetal-release-4.3.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base binary_build_commands: make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -28,7 +26,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-api-provider-baremetal/openshift-cluster-api-provider-baremetal-release-4.4.yaml b/ci-operator/config/openshift/cluster-api-provider-baremetal/openshift-cluster-api-provider-baremetal-release-4.4.yaml index d7ced25016d87..b814c7ea3fda5 100644 --- a/ci-operator/config/openshift/cluster-api-provider-baremetal/openshift-cluster-api-provider-baremetal-release-4.4.yaml +++ b/ci-operator/config/openshift/cluster-api-provider-baremetal/openshift-cluster-api-provider-baremetal-release-4.4.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base binary_build_commands: make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -27,7 +25,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-api-provider-gcp/openshift-cluster-api-provider-gcp-master.yaml b/ci-operator/config/openshift/cluster-api-provider-gcp/openshift-cluster-api-provider-gcp-master.yaml index 392a7e9e512be..fe1d1472eb0e2 100644 --- a/ci-operator/config/openshift/cluster-api-provider-gcp/openshift-cluster-api-provider-gcp-master.yaml +++ b/ci-operator/config/openshift/cluster-api-provider-gcp/openshift-cluster-api-provider-gcp-master.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base binary_build_commands: NO_DOCKER=1 make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-api-provider-gcp/openshift-cluster-api-provider-gcp-release-4.1.yaml b/ci-operator/config/openshift/cluster-api-provider-gcp/openshift-cluster-api-provider-gcp-release-4.1.yaml index e4634bba256a5..a1fa596623a08 100644 --- a/ci-operator/config/openshift/cluster-api-provider-gcp/openshift-cluster-api-provider-gcp-release-4.1.yaml +++ b/ci-operator/config/openshift/cluster-api-provider-gcp/openshift-cluster-api-provider-gcp-release-4.1.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base binary_build_commands: NO_DOCKER=1 make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -26,7 +24,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-api-provider-gcp/openshift-cluster-api-provider-gcp-release-4.2.yaml b/ci-operator/config/openshift/cluster-api-provider-gcp/openshift-cluster-api-provider-gcp-release-4.2.yaml index 96355471951e7..71d45848e477b 100644 --- a/ci-operator/config/openshift/cluster-api-provider-gcp/openshift-cluster-api-provider-gcp-release-4.2.yaml +++ b/ci-operator/config/openshift/cluster-api-provider-gcp/openshift-cluster-api-provider-gcp-release-4.2.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base binary_build_commands: NO_DOCKER=1 make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-api-provider-gcp/openshift-cluster-api-provider-gcp-release-4.3.yaml b/ci-operator/config/openshift/cluster-api-provider-gcp/openshift-cluster-api-provider-gcp-release-4.3.yaml index 970b6dff568da..0ac53a151b45e 100644 --- a/ci-operator/config/openshift/cluster-api-provider-gcp/openshift-cluster-api-provider-gcp-release-4.3.yaml +++ b/ci-operator/config/openshift/cluster-api-provider-gcp/openshift-cluster-api-provider-gcp-release-4.3.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base binary_build_commands: NO_DOCKER=1 make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -27,7 +25,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-api-provider-gcp/openshift-cluster-api-provider-gcp-release-4.4.yaml b/ci-operator/config/openshift/cluster-api-provider-gcp/openshift-cluster-api-provider-gcp-release-4.4.yaml index 451fea59b61f3..ba9803801be33 100644 --- a/ci-operator/config/openshift/cluster-api-provider-gcp/openshift-cluster-api-provider-gcp-release-4.4.yaml +++ b/ci-operator/config/openshift/cluster-api-provider-gcp/openshift-cluster-api-provider-gcp-release-4.4.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base binary_build_commands: NO_DOCKER=1 make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-api-provider-kubemark/openshift-cluster-api-provider-kubemark-master.yaml b/ci-operator/config/openshift/cluster-api-provider-kubemark/openshift-cluster-api-provider-kubemark-master.yaml index f7c1fe3b2dadb..01dee901f2d75 100644 --- a/ci-operator/config/openshift/cluster-api-provider-kubemark/openshift-cluster-api-provider-kubemark-master.yaml +++ b/ci-operator/config/openshift/cluster-api-provider-kubemark/openshift-cluster-api-provider-kubemark-master.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base binary_build_commands: NO_DOCKER=1 make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-api-provider-kubemark/openshift-cluster-api-provider-kubemark-release-4.1.yaml b/ci-operator/config/openshift/cluster-api-provider-kubemark/openshift-cluster-api-provider-kubemark-release-4.1.yaml index fa62125dc0a07..672a0c7baf7fb 100644 --- a/ci-operator/config/openshift/cluster-api-provider-kubemark/openshift-cluster-api-provider-kubemark-release-4.1.yaml +++ b/ci-operator/config/openshift/cluster-api-provider-kubemark/openshift-cluster-api-provider-kubemark-release-4.1.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base binary_build_commands: NO_DOCKER=1 make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -26,7 +24,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-api-provider-kubemark/openshift-cluster-api-provider-kubemark-release-4.2.yaml b/ci-operator/config/openshift/cluster-api-provider-kubemark/openshift-cluster-api-provider-kubemark-release-4.2.yaml index c866178a16cf5..a2519c5773bb9 100644 --- a/ci-operator/config/openshift/cluster-api-provider-kubemark/openshift-cluster-api-provider-kubemark-release-4.2.yaml +++ b/ci-operator/config/openshift/cluster-api-provider-kubemark/openshift-cluster-api-provider-kubemark-release-4.2.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base binary_build_commands: NO_DOCKER=1 make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-api-provider-kubemark/openshift-cluster-api-provider-kubemark-release-4.3.yaml b/ci-operator/config/openshift/cluster-api-provider-kubemark/openshift-cluster-api-provider-kubemark-release-4.3.yaml index 319e9943e0a93..1da0fdc82a916 100644 --- a/ci-operator/config/openshift/cluster-api-provider-kubemark/openshift-cluster-api-provider-kubemark-release-4.3.yaml +++ b/ci-operator/config/openshift/cluster-api-provider-kubemark/openshift-cluster-api-provider-kubemark-release-4.3.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base binary_build_commands: NO_DOCKER=1 make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -27,7 +25,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-api-provider-kubemark/openshift-cluster-api-provider-kubemark-release-4.4.yaml b/ci-operator/config/openshift/cluster-api-provider-kubemark/openshift-cluster-api-provider-kubemark-release-4.4.yaml index a9d7c91789abe..e096a78c79b67 100644 --- a/ci-operator/config/openshift/cluster-api-provider-kubemark/openshift-cluster-api-provider-kubemark-release-4.4.yaml +++ b/ci-operator/config/openshift/cluster-api-provider-kubemark/openshift-cluster-api-provider-kubemark-release-4.4.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base binary_build_commands: NO_DOCKER=1 make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-api-provider-libvirt/openshift-cluster-api-provider-libvirt-master.yaml b/ci-operator/config/openshift/cluster-api-provider-libvirt/openshift-cluster-api-provider-libvirt-master.yaml index d4f4634afa8e3..807504cb24933 100644 --- a/ci-operator/config/openshift/cluster-api-provider-libvirt/openshift-cluster-api-provider-libvirt-master.yaml +++ b/ci-operator/config/openshift/cluster-api-provider-libvirt/openshift-cluster-api-provider-libvirt-master.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base binary_build_commands: make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-api-provider-libvirt/openshift-cluster-api-provider-libvirt-release-4.1.yaml b/ci-operator/config/openshift/cluster-api-provider-libvirt/openshift-cluster-api-provider-libvirt-release-4.1.yaml index c2e4eadedeb45..0d6876a2b041e 100644 --- a/ci-operator/config/openshift/cluster-api-provider-libvirt/openshift-cluster-api-provider-libvirt-release-4.1.yaml +++ b/ci-operator/config/openshift/cluster-api-provider-libvirt/openshift-cluster-api-provider-libvirt-release-4.1.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base binary_build_commands: make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -26,7 +24,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-api-provider-libvirt/openshift-cluster-api-provider-libvirt-release-4.2.yaml b/ci-operator/config/openshift/cluster-api-provider-libvirt/openshift-cluster-api-provider-libvirt-release-4.2.yaml index e0f91c4e2eaa6..aca9f9c3a573f 100644 --- a/ci-operator/config/openshift/cluster-api-provider-libvirt/openshift-cluster-api-provider-libvirt-release-4.2.yaml +++ b/ci-operator/config/openshift/cluster-api-provider-libvirt/openshift-cluster-api-provider-libvirt-release-4.2.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base binary_build_commands: make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-api-provider-libvirt/openshift-cluster-api-provider-libvirt-release-4.3.yaml b/ci-operator/config/openshift/cluster-api-provider-libvirt/openshift-cluster-api-provider-libvirt-release-4.3.yaml index bba38c97ee631..2e7db8f3f87ce 100644 --- a/ci-operator/config/openshift/cluster-api-provider-libvirt/openshift-cluster-api-provider-libvirt-release-4.3.yaml +++ b/ci-operator/config/openshift/cluster-api-provider-libvirt/openshift-cluster-api-provider-libvirt-release-4.3.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base binary_build_commands: make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -27,7 +25,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-api-provider-libvirt/openshift-cluster-api-provider-libvirt-release-4.4.yaml b/ci-operator/config/openshift/cluster-api-provider-libvirt/openshift-cluster-api-provider-libvirt-release-4.4.yaml index ff44448d1ad91..0b4239eff3fa7 100644 --- a/ci-operator/config/openshift/cluster-api-provider-libvirt/openshift-cluster-api-provider-libvirt-release-4.4.yaml +++ b/ci-operator/config/openshift/cluster-api-provider-libvirt/openshift-cluster-api-provider-libvirt-release-4.4.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base binary_build_commands: make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-master.yaml b/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-master.yaml index e8ee8d49976cb..4f04721e9e2a2 100644 --- a/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-master.yaml +++ b/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-master.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base binary_build_commands: make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -27,7 +25,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-release-4.1.yaml b/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-release-4.1.yaml index 0305172828e8b..946f592abd505 100644 --- a/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-release-4.1.yaml +++ b/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-release-4.1.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base binary_build_commands: make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -27,7 +25,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-release-4.2.yaml b/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-release-4.2.yaml index 2a3d73a0884b9..121cb9404b3eb 100644 --- a/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-release-4.2.yaml +++ b/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-release-4.2.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base binary_build_commands: make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -27,7 +25,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-release-4.3.yaml b/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-release-4.3.yaml index 062b052a74364..0e2fe773c2eab 100644 --- a/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-release-4.3.yaml +++ b/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-release-4.3.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base binary_build_commands: make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -28,7 +26,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-release-4.4.yaml b/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-release-4.4.yaml index 2f354fd71b783..33cd6b776606a 100644 --- a/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-release-4.4.yaml +++ b/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-release-4.4.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base binary_build_commands: make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -27,7 +25,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-api/openshift-cluster-api-master.yaml b/ci-operator/config/openshift/cluster-api/openshift-cluster-api-master.yaml index b71fd2bb917ea..648494ed42e9d 100644 --- a/ci-operator/config/openshift/cluster-api/openshift-cluster-api-master.yaml +++ b/ci-operator/config/openshift/cluster-api/openshift-cluster-api-master.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base binary_build_commands: make manager clusterctl build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -32,7 +30,6 @@ resources: cpu: 100m memory: 400Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-api/openshift-cluster-api-openshift-4.1.yaml b/ci-operator/config/openshift/cluster-api/openshift-cluster-api-openshift-4.1.yaml index 2924c47497d7c..e4cc0af75c369 100644 --- a/ci-operator/config/openshift/cluster-api/openshift-cluster-api-openshift-4.1.yaml +++ b/ci-operator/config/openshift/cluster-api/openshift-cluster-api-openshift-4.1.yaml @@ -1,16 +1,15 @@ base_images: base: - cluster: https://api.ci.openshift.org - name: "4.1" + name: '4.1' namespace: ocp tag: base binary_build_commands: make manager clusterctl build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 + images: - dockerfile_path: Dockerfile from: base @@ -32,8 +31,7 @@ resources: cpu: 100m memory: 400Mi tag_specification: - cluster: https://api.ci.openshift.org - name: "4.1" + name: '4.1' namespace: ocp tests: - as: unit diff --git a/ci-operator/config/openshift/cluster-api/openshift-cluster-api-openshift-4.2.yaml b/ci-operator/config/openshift/cluster-api/openshift-cluster-api-openshift-4.2.yaml index e27d36d480914..598a0decf2fb0 100644 --- a/ci-operator/config/openshift/cluster-api/openshift-cluster-api-openshift-4.2.yaml +++ b/ci-operator/config/openshift/cluster-api/openshift-cluster-api-openshift-4.2.yaml @@ -1,23 +1,19 @@ +tag_specification: + name: '4.2' + namespace: ocp +promotion: + name: cluster-api + namespace: ocp-future base_images: base: - cluster: https://api.ci.openshift.org - name: "4.2" + name: '4.2' namespace: ocp tag: base binary_build_commands: make manager clusterctl -build_root: - image_stream_tag: - cluster: https://api.ci.openshift.org - name: release - namespace: openshift - tag: golang-1.12 images: - dockerfile_path: Dockerfile from: base to: cluster-api -promotion: - name: cluster-api - namespace: ocp-future resources: '*': limits: @@ -31,10 +27,11 @@ resources: requests: cpu: 100m memory: 400Mi -tag_specification: - cluster: https://api.ci.openshift.org - name: "4.2" - namespace: ocp +build_root: + image_stream_tag: + name: release + namespace: openshift + tag: golang-1.12 tests: - as: unit commands: | diff --git a/ci-operator/config/openshift/cluster-api/openshift-cluster-api-release-4.3.yaml b/ci-operator/config/openshift/cluster-api/openshift-cluster-api-release-4.3.yaml index ea49fa45ab128..b8ca20fb04f73 100644 --- a/ci-operator/config/openshift/cluster-api/openshift-cluster-api-release-4.3.yaml +++ b/ci-operator/config/openshift/cluster-api/openshift-cluster-api-release-4.3.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base binary_build_commands: make manager clusterctl build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -33,7 +31,6 @@ resources: cpu: 100m memory: 400Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-api/openshift-cluster-api-release-4.4.yaml b/ci-operator/config/openshift/cluster-api/openshift-cluster-api-release-4.4.yaml index 80e5534224cd1..0bf369f27dbed 100644 --- a/ci-operator/config/openshift/cluster-api/openshift-cluster-api-release-4.4.yaml +++ b/ci-operator/config/openshift/cluster-api/openshift-cluster-api-release-4.4.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base binary_build_commands: make manager clusterctl build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -32,7 +30,6 @@ resources: cpu: 100m memory: 400Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-master.yaml b/ci-operator/config/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-master.yaml index db756546f4ed4..c4a5338bf95c4 100644 --- a/ci-operator/config/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-master.yaml +++ b/ci-operator/config/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-release-4.1.yaml b/ci-operator/config/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-release-4.1.yaml index e65aa5a9549ad..5557d5c57669c 100644 --- a/ci-operator/config/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-release-4.1.yaml +++ b/ci-operator/config/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: @@ -33,8 +30,8 @@ tests: make verify -k --warn-undefined-variables container: from: src -- artifact_dir: /tmp/artifacts - as: unit +- as: unit + artifact_dir: /tmp/artifacts commands: | mkdir -p /tmp/artifacts make test-unit JUNITFILE=/tmp/artifacts/unit_report.xml --warn-undefined-variables diff --git a/ci-operator/config/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-release-4.2.yaml b/ci-operator/config/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-release-4.2.yaml index 8f8fab1ca5de4..9791ecc18c312 100644 --- a/ci-operator/config/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-release-4.2.yaml +++ b/ci-operator/config/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-release-4.3.yaml b/ci-operator/config/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-release-4.3.yaml index 618b6701facd6..f19f7a0465d12 100644 --- a/ci-operator/config/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-release-4.3.yaml +++ b/ci-operator/config/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-release-4.4.yaml b/ci-operator/config/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-release-4.4.yaml index 3d105b332e88a..dcb88ae27579d 100644 --- a/ci-operator/config/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-release-4.4.yaml +++ b/ci-operator/config/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-autoscaler-operator/openshift-cluster-autoscaler-operator-master.yaml b/ci-operator/config/openshift/cluster-autoscaler-operator/openshift-cluster-autoscaler-operator-master.yaml index 394c91cf0707c..883bbb620001d 100644 --- a/ci-operator/config/openshift/cluster-autoscaler-operator/openshift-cluster-autoscaler-operator-master.yaml +++ b/ci-operator/config/openshift/cluster-autoscaler-operator/openshift-cluster-autoscaler-operator-master.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base binary_build_commands: make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-autoscaler-operator/openshift-cluster-autoscaler-operator-release-4.1.yaml b/ci-operator/config/openshift/cluster-autoscaler-operator/openshift-cluster-autoscaler-operator-release-4.1.yaml index d5782558cff14..24c846c449e3a 100644 --- a/ci-operator/config/openshift/cluster-autoscaler-operator/openshift-cluster-autoscaler-operator-release-4.1.yaml +++ b/ci-operator/config/openshift/cluster-autoscaler-operator/openshift-cluster-autoscaler-operator-release-4.1.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base binary_build_commands: make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -26,7 +24,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-autoscaler-operator/openshift-cluster-autoscaler-operator-release-4.2.yaml b/ci-operator/config/openshift/cluster-autoscaler-operator/openshift-cluster-autoscaler-operator-release-4.2.yaml index 7bd3fbec692c1..a60d85f4030ad 100644 --- a/ci-operator/config/openshift/cluster-autoscaler-operator/openshift-cluster-autoscaler-operator-release-4.2.yaml +++ b/ci-operator/config/openshift/cluster-autoscaler-operator/openshift-cluster-autoscaler-operator-release-4.2.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base binary_build_commands: make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-autoscaler-operator/openshift-cluster-autoscaler-operator-release-4.3.yaml b/ci-operator/config/openshift/cluster-autoscaler-operator/openshift-cluster-autoscaler-operator-release-4.3.yaml index 94962d6260b6a..0ab2650e7b69c 100644 --- a/ci-operator/config/openshift/cluster-autoscaler-operator/openshift-cluster-autoscaler-operator-release-4.3.yaml +++ b/ci-operator/config/openshift/cluster-autoscaler-operator/openshift-cluster-autoscaler-operator-release-4.3.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base binary_build_commands: make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -27,7 +25,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-autoscaler-operator/openshift-cluster-autoscaler-operator-release-4.4.yaml b/ci-operator/config/openshift/cluster-autoscaler-operator/openshift-cluster-autoscaler-operator-release-4.4.yaml index 458432264974d..67588c74a8c52 100644 --- a/ci-operator/config/openshift/cluster-autoscaler-operator/openshift-cluster-autoscaler-operator-release-4.4.yaml +++ b/ci-operator/config/openshift/cluster-autoscaler-operator/openshift-cluster-autoscaler-operator-release-4.4.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base binary_build_commands: make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-bootstrap/openshift-cluster-bootstrap-master.yaml b/ci-operator/config/openshift/cluster-bootstrap/openshift-cluster-bootstrap-master.yaml index 731212e244759..8fa0d192cfe19 100644 --- a/ci-operator/config/openshift/cluster-bootstrap/openshift-cluster-bootstrap-master.yaml +++ b/ci-operator/config/openshift/cluster-bootstrap/openshift-cluster-bootstrap-master.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base binary_build_commands: make build --warn-undefined-variables build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: "3" memory: 1Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/cluster-bootstrap/openshift-cluster-bootstrap-release-4.1.yaml b/ci-operator/config/openshift/cluster-bootstrap/openshift-cluster-bootstrap-release-4.1.yaml index 3ec4da13cad30..3336412f5d5f5 100644 --- a/ci-operator/config/openshift/cluster-bootstrap/openshift-cluster-bootstrap-release-4.1.yaml +++ b/ci-operator/config/openshift/cluster-bootstrap/openshift-cluster-bootstrap-release-4.1.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base binary_build_commands: make build --warn-undefined-variables build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -26,7 +24,6 @@ resources: cpu: "3" memory: 1Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/cluster-bootstrap/openshift-cluster-bootstrap-release-4.2.yaml b/ci-operator/config/openshift/cluster-bootstrap/openshift-cluster-bootstrap-release-4.2.yaml index c749bf4c226f5..b4713c958063e 100644 --- a/ci-operator/config/openshift/cluster-bootstrap/openshift-cluster-bootstrap-release-4.2.yaml +++ b/ci-operator/config/openshift/cluster-bootstrap/openshift-cluster-bootstrap-release-4.2.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base binary_build_commands: make build --warn-undefined-variables build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: "3" memory: 1Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/cluster-bootstrap/openshift-cluster-bootstrap-release-4.3.yaml b/ci-operator/config/openshift/cluster-bootstrap/openshift-cluster-bootstrap-release-4.3.yaml index e0e38439b27ad..1163e0fa3a4ca 100644 --- a/ci-operator/config/openshift/cluster-bootstrap/openshift-cluster-bootstrap-release-4.3.yaml +++ b/ci-operator/config/openshift/cluster-bootstrap/openshift-cluster-bootstrap-release-4.3.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base binary_build_commands: make build --warn-undefined-variables build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -27,7 +25,6 @@ resources: cpu: "3" memory: 1Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/cluster-bootstrap/openshift-cluster-bootstrap-release-4.4.yaml b/ci-operator/config/openshift/cluster-bootstrap/openshift-cluster-bootstrap-release-4.4.yaml index 815f2b85f6283..c4c8721894ed1 100644 --- a/ci-operator/config/openshift/cluster-bootstrap/openshift-cluster-bootstrap-release-4.4.yaml +++ b/ci-operator/config/openshift/cluster-bootstrap/openshift-cluster-bootstrap-release-4.4.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base binary_build_commands: make build --warn-undefined-variables build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: "3" memory: 1Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/cluster-capacity/openshift-cluster-capacity-master.yaml b/ci-operator/config/openshift/cluster-capacity/openshift-cluster-capacity-master.yaml index cb622e451b81c..aadafdeb23f9e 100644 --- a/ci-operator/config/openshift/cluster-capacity/openshift-cluster-capacity-master.yaml +++ b/ci-operator/config/openshift/cluster-capacity/openshift-cluster-capacity-master.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base binary_build_commands: make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -27,7 +25,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp test_binary_build_commands: OS_GOFLAGS='-race' make build diff --git a/ci-operator/config/openshift/cluster-capacity/openshift-cluster-capacity-release-3.10.yaml b/ci-operator/config/openshift/cluster-capacity/openshift-cluster-capacity-release-3.10.yaml index 20848239805ff..28a2b9c3fcd5e 100644 --- a/ci-operator/config/openshift/cluster-capacity/openshift-cluster-capacity-release-3.10.yaml +++ b/ci-operator/config/openshift/cluster-capacity/openshift-cluster-capacity-release-3.10.yaml @@ -4,12 +4,6 @@ base_rpm_images: namespace: openshift tag: base binary_build_commands: make build -build_root: - image_stream_tag: - cluster: https://api.ci.openshift.org - name: release - namespace: openshift - tag: golang-1.9 canonical_go_repository: github.com/kubernetes-incubator/cluster-capacity images: - context_dir: images/cluster-capacity/ @@ -24,9 +18,15 @@ resources: memory: 200Mi rpm_build_commands: make build-rpms tag_specification: - cluster: https://api.ci.openshift.org name: origin-v3.10 namespace: openshift + tag: '' + tag_overrides: {} +build_root: + image_stream_tag: + name: release + namespace: openshift + tag: golang-1.9 test_binary_build_commands: OS_GOFLAGS='-race' make build tests: - artifact_dir: /tmp/artifacts diff --git a/ci-operator/config/openshift/cluster-capacity/openshift-cluster-capacity-release-3.11.yaml b/ci-operator/config/openshift/cluster-capacity/openshift-cluster-capacity-release-3.11.yaml index b3b61c40af730..e2889d7436b92 100644 --- a/ci-operator/config/openshift/cluster-capacity/openshift-cluster-capacity-release-3.11.yaml +++ b/ci-operator/config/openshift/cluster-capacity/openshift-cluster-capacity-release-3.11.yaml @@ -4,12 +4,6 @@ base_rpm_images: namespace: openshift tag: base binary_build_commands: make build -build_root: - image_stream_tag: - cluster: https://api.ci.openshift.org - name: release - namespace: openshift - tag: golang-1.10 canonical_go_repository: github.com/kubernetes-incubator/cluster-capacity images: - context_dir: images/cluster-capacity/ @@ -24,9 +18,15 @@ resources: memory: 200Mi rpm_build_commands: make build-rpms tag_specification: - cluster: https://api.ci.openshift.org name: origin-v3.11 namespace: openshift + tag: '' + tag_overrides: {} +build_root: + image_stream_tag: + name: release + namespace: openshift + tag: golang-1.10 test_binary_build_commands: OS_GOFLAGS='-race' make build tests: - artifact_dir: /tmp/artifacts diff --git a/ci-operator/config/openshift/cluster-capacity/openshift-cluster-capacity-release-4.1.yaml b/ci-operator/config/openshift/cluster-capacity/openshift-cluster-capacity-release-4.1.yaml index 90b42ec4165fb..1419676b9e0c0 100644 --- a/ci-operator/config/openshift/cluster-capacity/openshift-cluster-capacity-release-4.1.yaml +++ b/ci-operator/config/openshift/cluster-capacity/openshift-cluster-capacity-release-4.1.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base binary_build_commands: make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -27,7 +25,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp test_binary_build_commands: OS_GOFLAGS='-race' make build diff --git a/ci-operator/config/openshift/cluster-capacity/openshift-cluster-capacity-release-4.2.yaml b/ci-operator/config/openshift/cluster-capacity/openshift-cluster-capacity-release-4.2.yaml index 23c44ba9b231d..cbd5f0d8da94e 100644 --- a/ci-operator/config/openshift/cluster-capacity/openshift-cluster-capacity-release-4.2.yaml +++ b/ci-operator/config/openshift/cluster-capacity/openshift-cluster-capacity-release-4.2.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base binary_build_commands: make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -27,7 +25,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp test_binary_build_commands: OS_GOFLAGS='-race' make build diff --git a/ci-operator/config/openshift/cluster-capacity/openshift-cluster-capacity-release-4.3.yaml b/ci-operator/config/openshift/cluster-capacity/openshift-cluster-capacity-release-4.3.yaml index 1db773dcd816f..3aa50badc7bce 100644 --- a/ci-operator/config/openshift/cluster-capacity/openshift-cluster-capacity-release-4.3.yaml +++ b/ci-operator/config/openshift/cluster-capacity/openshift-cluster-capacity-release-4.3.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base binary_build_commands: make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -28,7 +26,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp test_binary_build_commands: OS_GOFLAGS='-race' make build diff --git a/ci-operator/config/openshift/cluster-capacity/openshift-cluster-capacity-release-4.4.yaml b/ci-operator/config/openshift/cluster-capacity/openshift-cluster-capacity-release-4.4.yaml index ff6920fe00202..821c15e1f761d 100644 --- a/ci-operator/config/openshift/cluster-capacity/openshift-cluster-capacity-release-4.4.yaml +++ b/ci-operator/config/openshift/cluster-capacity/openshift-cluster-capacity-release-4.4.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base binary_build_commands: make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -27,7 +25,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp test_binary_build_commands: OS_GOFLAGS='-race' make build diff --git a/ci-operator/config/openshift/cluster-config-operator/openshift-cluster-config-operator-master.yaml b/ci-operator/config/openshift/cluster-config-operator/openshift-cluster-config-operator-master.yaml index 8142155bfabd6..d116c67aec3da 100644 --- a/ci-operator/config/openshift/cluster-config-operator/openshift-cluster-config-operator-master.yaml +++ b/ci-operator/config/openshift/cluster-config-operator/openshift-cluster-config-operator-master.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base binary_build_commands: make build --warn-undefined-variables build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: "3" memory: 1Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/cluster-config-operator/openshift-cluster-config-operator-release-4.1.yaml b/ci-operator/config/openshift/cluster-config-operator/openshift-cluster-config-operator-release-4.1.yaml index 1dde01af1625f..e66e3ebb0fb65 100644 --- a/ci-operator/config/openshift/cluster-config-operator/openshift-cluster-config-operator-release-4.1.yaml +++ b/ci-operator/config/openshift/cluster-config-operator/openshift-cluster-config-operator-release-4.1.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base binary_build_commands: make build --warn-undefined-variables build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -26,7 +24,6 @@ resources: cpu: "3" memory: 1Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/cluster-config-operator/openshift-cluster-config-operator-release-4.2.yaml b/ci-operator/config/openshift/cluster-config-operator/openshift-cluster-config-operator-release-4.2.yaml index 705d984000aad..7b3dc7c23d375 100644 --- a/ci-operator/config/openshift/cluster-config-operator/openshift-cluster-config-operator-release-4.2.yaml +++ b/ci-operator/config/openshift/cluster-config-operator/openshift-cluster-config-operator-release-4.2.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base binary_build_commands: make build --warn-undefined-variables build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: "3" memory: 1Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/cluster-config-operator/openshift-cluster-config-operator-release-4.3.yaml b/ci-operator/config/openshift/cluster-config-operator/openshift-cluster-config-operator-release-4.3.yaml index 74233f6dacba7..820e4dfe35a26 100644 --- a/ci-operator/config/openshift/cluster-config-operator/openshift-cluster-config-operator-release-4.3.yaml +++ b/ci-operator/config/openshift/cluster-config-operator/openshift-cluster-config-operator-release-4.3.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base binary_build_commands: make build --warn-undefined-variables build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -27,7 +25,6 @@ resources: cpu: "3" memory: 1Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/cluster-config-operator/openshift-cluster-config-operator-release-4.4.yaml b/ci-operator/config/openshift/cluster-config-operator/openshift-cluster-config-operator-release-4.4.yaml index 50b21f9fd4e7e..5d35cfd3f1b88 100644 --- a/ci-operator/config/openshift/cluster-config-operator/openshift-cluster-config-operator-release-4.4.yaml +++ b/ci-operator/config/openshift/cluster-config-operator/openshift-cluster-config-operator-release-4.4.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base binary_build_commands: make build --warn-undefined-variables build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: "3" memory: 1Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/cluster-dns-operator/openshift-cluster-dns-operator-master.yaml b/ci-operator/config/openshift/cluster-dns-operator/openshift-cluster-dns-operator-master.yaml index 80da7e2c791d0..6485b4634f33c 100644 --- a/ci-operator/config/openshift/cluster-dns-operator/openshift-cluster-dns-operator-master.yaml +++ b/ci-operator/config/openshift/cluster-dns-operator/openshift-cluster-dns-operator-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-dns-operator/openshift-cluster-dns-operator-release-4.1.yaml b/ci-operator/config/openshift/cluster-dns-operator/openshift-cluster-dns-operator-release-4.1.yaml index c91d014406011..82b1aee8688a5 100644 --- a/ci-operator/config/openshift/cluster-dns-operator/openshift-cluster-dns-operator-release-4.1.yaml +++ b/ci-operator/config/openshift/cluster-dns-operator/openshift-cluster-dns-operator-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-dns-operator/openshift-cluster-dns-operator-release-4.2.yaml b/ci-operator/config/openshift/cluster-dns-operator/openshift-cluster-dns-operator-release-4.2.yaml index 417810af553e5..bb8f2773527ba 100644 --- a/ci-operator/config/openshift/cluster-dns-operator/openshift-cluster-dns-operator-release-4.2.yaml +++ b/ci-operator/config/openshift/cluster-dns-operator/openshift-cluster-dns-operator-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-dns-operator/openshift-cluster-dns-operator-release-4.3.yaml b/ci-operator/config/openshift/cluster-dns-operator/openshift-cluster-dns-operator-release-4.3.yaml index cd8ac37f0cb98..0cd20771c9b0a 100644 --- a/ci-operator/config/openshift/cluster-dns-operator/openshift-cluster-dns-operator-release-4.3.yaml +++ b/ci-operator/config/openshift/cluster-dns-operator/openshift-cluster-dns-operator-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-dns-operator/openshift-cluster-dns-operator-release-4.4.yaml b/ci-operator/config/openshift/cluster-dns-operator/openshift-cluster-dns-operator-release-4.4.yaml index c03e7d86fe639..fab6345192664 100644 --- a/ci-operator/config/openshift/cluster-dns-operator/openshift-cluster-dns-operator-release-4.4.yaml +++ b/ci-operator/config/openshift/cluster-dns-operator/openshift-cluster-dns-operator-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-master.yaml b/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-master.yaml index 8c6f97efb71ef..7c9b3290b824d 100644 --- a/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-master.yaml +++ b/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-master.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base binary_build_commands: make build --warn-undefined-variables build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: "3" memory: 1Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.2.yaml b/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.2.yaml index 930e7edbbb2f0..617556353982d 100644 --- a/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.2.yaml +++ b/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.2.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base binary_build_commands: make build --warn-undefined-variables build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: "3" memory: 1Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.3.yaml b/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.3.yaml index 3de57b55cd9e3..874f38de40e65 100644 --- a/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.3.yaml +++ b/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.3.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base binary_build_commands: make build --warn-undefined-variables build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -27,7 +25,6 @@ resources: cpu: "3" memory: 1Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.4.yaml b/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.4.yaml index 73af23ec0e9f9..578f3562f1184 100644 --- a/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.4.yaml +++ b/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.4.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base binary_build_commands: make build --warn-undefined-variables build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: "3" memory: 1Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-master.yaml b/ci-operator/config/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-master.yaml index 820f24d74dd6b..b5c3f46d6dc55 100644 --- a/ci-operator/config/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-master.yaml +++ b/ci-operator/config/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-release-4.1.yaml b/ci-operator/config/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-release-4.1.yaml index 837b711a81625..416d0e4fd5e0c 100644 --- a/ci-operator/config/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-release-4.1.yaml +++ b/ci-operator/config/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-release-4.2.yaml b/ci-operator/config/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-release-4.2.yaml index 53e3738618537..4bb423c54e63b 100644 --- a/ci-operator/config/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-release-4.2.yaml +++ b/ci-operator/config/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-release-4.3.yaml b/ci-operator/config/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-release-4.3.yaml index fce165d7459f4..a1643689de607 100644 --- a/ci-operator/config/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-release-4.3.yaml +++ b/ci-operator/config/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-release-4.4.yaml b/ci-operator/config/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-release-4.4.yaml index a4920daa3b7ef..bdedc7d41fd7c 100644 --- a/ci-operator/config/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-release-4.4.yaml +++ b/ci-operator/config/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-master.yaml b/ci-operator/config/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-master.yaml index ae273b610463f..bd70ea55bb4d4 100644 --- a/ci-operator/config/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-master.yaml +++ b/ci-operator/config/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-release-4.1.yaml b/ci-operator/config/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-release-4.1.yaml index 18090dff735c3..10bc4dc4eb6bc 100644 --- a/ci-operator/config/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-release-4.1.yaml +++ b/ci-operator/config/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-release-4.2.yaml b/ci-operator/config/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-release-4.2.yaml index 48785a885c597..bbde2e218b735 100644 --- a/ci-operator/config/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-release-4.2.yaml +++ b/ci-operator/config/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-release-4.3.yaml b/ci-operator/config/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-release-4.3.yaml index cfe151325e8e2..5549aa272a1f1 100644 --- a/ci-operator/config/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-release-4.3.yaml +++ b/ci-operator/config/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-release-4.4.yaml b/ci-operator/config/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-release-4.4.yaml index d6c9b359fa9ff..32fba16ce6d0b 100644 --- a/ci-operator/config/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-release-4.4.yaml +++ b/ci-operator/config/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-master.yaml b/ci-operator/config/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-master.yaml index 80f9062187087..dceafafa8b0b6 100644 --- a/ci-operator/config/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-master.yaml +++ b/ci-operator/config/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-master.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base binary_build_commands: make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: "3" memory: 3Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' diff --git a/ci-operator/config/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-release-4.1.yaml b/ci-operator/config/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-release-4.1.yaml index 345100f46e5d2..864ebfa04435a 100644 --- a/ci-operator/config/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-release-4.1.yaml +++ b/ci-operator/config/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-release-4.1.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base binary_build_commands: make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.11 @@ -26,7 +24,6 @@ resources: cpu: "3" memory: 3Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' diff --git a/ci-operator/config/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-release-4.2.yaml b/ci-operator/config/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-release-4.2.yaml index a961cfd02c4ad..cda3959b678e1 100644 --- a/ci-operator/config/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-release-4.2.yaml +++ b/ci-operator/config/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-release-4.2.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base binary_build_commands: make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: "3" memory: 3Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' diff --git a/ci-operator/config/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-release-4.3.yaml b/ci-operator/config/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-release-4.3.yaml index 73a75161a1ee6..1807d3e584b3f 100644 --- a/ci-operator/config/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-release-4.3.yaml +++ b/ci-operator/config/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-release-4.3.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base binary_build_commands: make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -27,7 +25,6 @@ resources: cpu: "3" memory: 3Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' diff --git a/ci-operator/config/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-release-4.4.yaml b/ci-operator/config/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-release-4.4.yaml index a02f7f5f5c162..4b708629018de 100644 --- a/ci-operator/config/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-release-4.4.yaml +++ b/ci-operator/config/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-release-4.4.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base binary_build_commands: make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: "3" memory: 3Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' diff --git a/ci-operator/config/openshift/cluster-kube-controller-manager-operator/openshift-cluster-kube-controller-manager-operator-master.yaml b/ci-operator/config/openshift/cluster-kube-controller-manager-operator/openshift-cluster-kube-controller-manager-operator-master.yaml index 6333968dabc0b..a57687cc51a19 100644 --- a/ci-operator/config/openshift/cluster-kube-controller-manager-operator/openshift-cluster-kube-controller-manager-operator-master.yaml +++ b/ci-operator/config/openshift/cluster-kube-controller-manager-operator/openshift-cluster-kube-controller-manager-operator-master.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base binary_build_commands: make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: "3" memory: 1Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' diff --git a/ci-operator/config/openshift/cluster-kube-controller-manager-operator/openshift-cluster-kube-controller-manager-operator-release-4.1.yaml b/ci-operator/config/openshift/cluster-kube-controller-manager-operator/openshift-cluster-kube-controller-manager-operator-release-4.1.yaml index 82bf04a6f7cca..ec221dd7d8287 100644 --- a/ci-operator/config/openshift/cluster-kube-controller-manager-operator/openshift-cluster-kube-controller-manager-operator-release-4.1.yaml +++ b/ci-operator/config/openshift/cluster-kube-controller-manager-operator/openshift-cluster-kube-controller-manager-operator-release-4.1.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base binary_build_commands: make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.11 @@ -26,7 +24,6 @@ resources: cpu: "3" memory: 1Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' diff --git a/ci-operator/config/openshift/cluster-kube-controller-manager-operator/openshift-cluster-kube-controller-manager-operator-release-4.2.yaml b/ci-operator/config/openshift/cluster-kube-controller-manager-operator/openshift-cluster-kube-controller-manager-operator-release-4.2.yaml index 636850fcfc700..bc429ac1fc56b 100644 --- a/ci-operator/config/openshift/cluster-kube-controller-manager-operator/openshift-cluster-kube-controller-manager-operator-release-4.2.yaml +++ b/ci-operator/config/openshift/cluster-kube-controller-manager-operator/openshift-cluster-kube-controller-manager-operator-release-4.2.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base binary_build_commands: make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: "3" memory: 1Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' diff --git a/ci-operator/config/openshift/cluster-kube-controller-manager-operator/openshift-cluster-kube-controller-manager-operator-release-4.3.yaml b/ci-operator/config/openshift/cluster-kube-controller-manager-operator/openshift-cluster-kube-controller-manager-operator-release-4.3.yaml index 74ba054c8f18e..582a39614d400 100644 --- a/ci-operator/config/openshift/cluster-kube-controller-manager-operator/openshift-cluster-kube-controller-manager-operator-release-4.3.yaml +++ b/ci-operator/config/openshift/cluster-kube-controller-manager-operator/openshift-cluster-kube-controller-manager-operator-release-4.3.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base binary_build_commands: make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -27,7 +25,6 @@ resources: cpu: "3" memory: 1Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' diff --git a/ci-operator/config/openshift/cluster-kube-controller-manager-operator/openshift-cluster-kube-controller-manager-operator-release-4.4.yaml b/ci-operator/config/openshift/cluster-kube-controller-manager-operator/openshift-cluster-kube-controller-manager-operator-release-4.4.yaml index eb3f48cb3adab..2df5cc3077b08 100644 --- a/ci-operator/config/openshift/cluster-kube-controller-manager-operator/openshift-cluster-kube-controller-manager-operator-release-4.4.yaml +++ b/ci-operator/config/openshift/cluster-kube-controller-manager-operator/openshift-cluster-kube-controller-manager-operator-release-4.4.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base binary_build_commands: make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: "3" memory: 1Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' diff --git a/ci-operator/config/openshift/cluster-kube-scheduler-operator/openshift-cluster-kube-scheduler-operator-master.yaml b/ci-operator/config/openshift/cluster-kube-scheduler-operator/openshift-cluster-kube-scheduler-operator-master.yaml index ef8f99271bb13..8bdcac0f19566 100644 --- a/ci-operator/config/openshift/cluster-kube-scheduler-operator/openshift-cluster-kube-scheduler-operator-master.yaml +++ b/ci-operator/config/openshift/cluster-kube-scheduler-operator/openshift-cluster-kube-scheduler-operator-master.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base binary_build_commands: make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp test_binary_build_commands: OS_GOFLAGS='-race' make build diff --git a/ci-operator/config/openshift/cluster-kube-scheduler-operator/openshift-cluster-kube-scheduler-operator-release-4.1.yaml b/ci-operator/config/openshift/cluster-kube-scheduler-operator/openshift-cluster-kube-scheduler-operator-release-4.1.yaml index 2c9f2a954305a..ab71ef27414b1 100644 --- a/ci-operator/config/openshift/cluster-kube-scheduler-operator/openshift-cluster-kube-scheduler-operator-release-4.1.yaml +++ b/ci-operator/config/openshift/cluster-kube-scheduler-operator/openshift-cluster-kube-scheduler-operator-release-4.1.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base binary_build_commands: make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.11 @@ -26,7 +24,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp test_binary_build_commands: OS_GOFLAGS='-race' make build diff --git a/ci-operator/config/openshift/cluster-kube-scheduler-operator/openshift-cluster-kube-scheduler-operator-release-4.2.yaml b/ci-operator/config/openshift/cluster-kube-scheduler-operator/openshift-cluster-kube-scheduler-operator-release-4.2.yaml index 0b209a3fabd13..bcd7ef824de30 100644 --- a/ci-operator/config/openshift/cluster-kube-scheduler-operator/openshift-cluster-kube-scheduler-operator-release-4.2.yaml +++ b/ci-operator/config/openshift/cluster-kube-scheduler-operator/openshift-cluster-kube-scheduler-operator-release-4.2.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base binary_build_commands: make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp test_binary_build_commands: OS_GOFLAGS='-race' make build diff --git a/ci-operator/config/openshift/cluster-kube-scheduler-operator/openshift-cluster-kube-scheduler-operator-release-4.3.yaml b/ci-operator/config/openshift/cluster-kube-scheduler-operator/openshift-cluster-kube-scheduler-operator-release-4.3.yaml index 6add1e00b821b..b300dfc49e9ca 100644 --- a/ci-operator/config/openshift/cluster-kube-scheduler-operator/openshift-cluster-kube-scheduler-operator-release-4.3.yaml +++ b/ci-operator/config/openshift/cluster-kube-scheduler-operator/openshift-cluster-kube-scheduler-operator-release-4.3.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base binary_build_commands: make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -27,7 +25,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp test_binary_build_commands: OS_GOFLAGS='-race' make build diff --git a/ci-operator/config/openshift/cluster-kube-scheduler-operator/openshift-cluster-kube-scheduler-operator-release-4.4.yaml b/ci-operator/config/openshift/cluster-kube-scheduler-operator/openshift-cluster-kube-scheduler-operator-release-4.4.yaml index 3d9c08ffb3082..586198590ad00 100644 --- a/ci-operator/config/openshift/cluster-kube-scheduler-operator/openshift-cluster-kube-scheduler-operator-release-4.4.yaml +++ b/ci-operator/config/openshift/cluster-kube-scheduler-operator/openshift-cluster-kube-scheduler-operator-release-4.4.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base binary_build_commands: make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp test_binary_build_commands: OS_GOFLAGS='-race' make build diff --git a/ci-operator/config/openshift/cluster-kube-storage-version-migrator-operator/openshift-cluster-kube-storage-version-migrator-operator-master.yaml b/ci-operator/config/openshift/cluster-kube-storage-version-migrator-operator/openshift-cluster-kube-storage-version-migrator-operator-master.yaml index e909c35361dda..c7fdc974b8928 100644 --- a/ci-operator/config/openshift/cluster-kube-storage-version-migrator-operator/openshift-cluster-kube-storage-version-migrator-operator-master.yaml +++ b/ci-operator/config/openshift/cluster-kube-storage-version-migrator-operator/openshift-cluster-kube-storage-version-migrator-operator-master.yaml @@ -1,6 +1,5 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base @@ -26,7 +25,6 @@ resources: cpu: "3" memory: 1Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/cluster-kube-storage-version-migrator-operator/openshift-cluster-kube-storage-version-migrator-operator-release-4.3.yaml b/ci-operator/config/openshift/cluster-kube-storage-version-migrator-operator/openshift-cluster-kube-storage-version-migrator-operator-release-4.3.yaml index 3db464ce1c21c..a89df261b12f0 100644 --- a/ci-operator/config/openshift/cluster-kube-storage-version-migrator-operator/openshift-cluster-kube-storage-version-migrator-operator-release-4.3.yaml +++ b/ci-operator/config/openshift/cluster-kube-storage-version-migrator-operator/openshift-cluster-kube-storage-version-migrator-operator-release-4.3.yaml @@ -1,6 +1,5 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base @@ -27,7 +26,6 @@ resources: cpu: "3" memory: 1Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/cluster-kube-storage-version-migrator-operator/openshift-cluster-kube-storage-version-migrator-operator-release-4.4.yaml b/ci-operator/config/openshift/cluster-kube-storage-version-migrator-operator/openshift-cluster-kube-storage-version-migrator-operator-release-4.4.yaml index d53f02a313e77..1c27e6aec66db 100644 --- a/ci-operator/config/openshift/cluster-kube-storage-version-migrator-operator/openshift-cluster-kube-storage-version-migrator-operator-release-4.4.yaml +++ b/ci-operator/config/openshift/cluster-kube-storage-version-migrator-operator/openshift-cluster-kube-storage-version-migrator-operator-release-4.4.yaml @@ -1,6 +1,5 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base @@ -26,7 +25,6 @@ resources: cpu: "3" memory: 1Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/cluster-logging-operator/openshift-cluster-logging-operator-master.yaml b/ci-operator/config/openshift/cluster-logging-operator/openshift-cluster-logging-operator-master.yaml index 1e9dad1faa617..ebf854e3c30ef 100644 --- a/ci-operator/config/openshift/cluster-logging-operator/openshift-cluster-logging-operator-master.yaml +++ b/ci-operator/config/openshift/cluster-logging-operator/openshift-cluster-logging-operator-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -24,7 +22,6 @@ resources: cpu: 200m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-logging-operator/openshift-cluster-logging-operator-release-4.1.yaml b/ci-operator/config/openshift/cluster-logging-operator/openshift-cluster-logging-operator-release-4.1.yaml index 0260ffe065337..c5b709067e80b 100644 --- a/ci-operator/config/openshift/cluster-logging-operator/openshift-cluster-logging-operator-release-4.1.yaml +++ b/ci-operator/config/openshift/cluster-logging-operator/openshift-cluster-logging-operator-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -24,7 +22,6 @@ resources: cpu: 200m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-logging-operator/openshift-cluster-logging-operator-release-4.2.yaml b/ci-operator/config/openshift/cluster-logging-operator/openshift-cluster-logging-operator-release-4.2.yaml index 3743a6d9d60c6..2a27f8b4ae8bb 100644 --- a/ci-operator/config/openshift/cluster-logging-operator/openshift-cluster-logging-operator-release-4.2.yaml +++ b/ci-operator/config/openshift/cluster-logging-operator/openshift-cluster-logging-operator-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -24,7 +22,6 @@ resources: cpu: 200m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-logging-operator/openshift-cluster-logging-operator-release-4.3.yaml b/ci-operator/config/openshift/cluster-logging-operator/openshift-cluster-logging-operator-release-4.3.yaml index 1ec838af42f98..8206e278019fe 100644 --- a/ci-operator/config/openshift/cluster-logging-operator/openshift-cluster-logging-operator-release-4.3.yaml +++ b/ci-operator/config/openshift/cluster-logging-operator/openshift-cluster-logging-operator-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,7 +23,6 @@ resources: cpu: 200m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-logging-operator/openshift-cluster-logging-operator-release-4.4.yaml b/ci-operator/config/openshift/cluster-logging-operator/openshift-cluster-logging-operator-release-4.4.yaml index 3d4b00070ee9a..203aeb3bc223f 100644 --- a/ci-operator/config/openshift/cluster-logging-operator/openshift-cluster-logging-operator-release-4.4.yaml +++ b/ci-operator/config/openshift/cluster-logging-operator/openshift-cluster-logging-operator-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -24,7 +22,6 @@ resources: cpu: 200m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-master.yaml b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-master.yaml index 2a0ba8c80ece0..39cba282ef534 100644 --- a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-master.yaml +++ b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.1.yaml b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.1.yaml index 328e3a8e5330c..83a338a0b6299 100644 --- a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.1.yaml +++ b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.2.yaml b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.2.yaml index 355cc82179692..fbf4c13df236d 100644 --- a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.2.yaml +++ b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.3.yaml b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.3.yaml index 4e13218ca13ef..68a37eeacb76e 100644 --- a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.3.yaml +++ b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.4.yaml b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.4.yaml index abffb755e6f41..f927236341e61 100644 --- a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.4.yaml +++ b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-monitoring-operator/openshift-cluster-monitoring-operator-master.yaml b/ci-operator/config/openshift/cluster-monitoring-operator/openshift-cluster-monitoring-operator-master.yaml index 4d94dc58ba2aa..af362897d5ee7 100644 --- a/ci-operator/config/openshift/cluster-monitoring-operator/openshift-cluster-monitoring-operator-master.yaml +++ b/ci-operator/config/openshift/cluster-monitoring-operator/openshift-cluster-monitoring-operator-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-monitoring-operator/openshift-cluster-monitoring-operator-release-3.11.yaml b/ci-operator/config/openshift/cluster-monitoring-operator/openshift-cluster-monitoring-operator-release-3.11.yaml index fab4e01b1b9b4..7400c7130f3de 100644 --- a/ci-operator/config/openshift/cluster-monitoring-operator/openshift-cluster-monitoring-operator-release-3.11.yaml +++ b/ci-operator/config/openshift/cluster-monitoring-operator/openshift-cluster-monitoring-operator-release-3.11.yaml @@ -1,15 +1,8 @@ base_images: base: - cluster: https://api.ci.openshift.org name: origin-v3.11 namespace: openshift tag: base -build_root: - image_stream_tag: - cluster: https://api.ci.openshift.org - name: release - namespace: openshift - tag: golang-1.10 images: - from: base to: cluster-monitoring-operator @@ -24,9 +17,13 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: origin-v3.11 namespace: openshift +build_root: + image_stream_tag: + name: release + namespace: openshift + tag: golang-1.10 tests: - as: unit commands: make test-unit diff --git a/ci-operator/config/openshift/cluster-monitoring-operator/openshift-cluster-monitoring-operator-release-4.1.yaml b/ci-operator/config/openshift/cluster-monitoring-operator/openshift-cluster-monitoring-operator-release-4.1.yaml index 01e67b784fd05..e5ee719f9260a 100644 --- a/ci-operator/config/openshift/cluster-monitoring-operator/openshift-cluster-monitoring-operator-release-4.1.yaml +++ b/ci-operator/config/openshift/cluster-monitoring-operator/openshift-cluster-monitoring-operator-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-monitoring-operator/openshift-cluster-monitoring-operator-release-4.2.yaml b/ci-operator/config/openshift/cluster-monitoring-operator/openshift-cluster-monitoring-operator-release-4.2.yaml index bbcb3c251869a..7a96740cb9a21 100644 --- a/ci-operator/config/openshift/cluster-monitoring-operator/openshift-cluster-monitoring-operator-release-4.2.yaml +++ b/ci-operator/config/openshift/cluster-monitoring-operator/openshift-cluster-monitoring-operator-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-monitoring-operator/openshift-cluster-monitoring-operator-release-4.3.yaml b/ci-operator/config/openshift/cluster-monitoring-operator/openshift-cluster-monitoring-operator-release-4.3.yaml index ce7d010fe806c..f74ee6b4753ab 100644 --- a/ci-operator/config/openshift/cluster-monitoring-operator/openshift-cluster-monitoring-operator-release-4.3.yaml +++ b/ci-operator/config/openshift/cluster-monitoring-operator/openshift-cluster-monitoring-operator-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-monitoring-operator/openshift-cluster-monitoring-operator-release-4.4.yaml b/ci-operator/config/openshift/cluster-monitoring-operator/openshift-cluster-monitoring-operator-release-4.4.yaml index 565819e8f1445..022b4fdfdb156 100644 --- a/ci-operator/config/openshift/cluster-monitoring-operator/openshift-cluster-monitoring-operator-release-4.4.yaml +++ b/ci-operator/config/openshift/cluster-monitoring-operator/openshift-cluster-monitoring-operator-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-master.yaml b/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-master.yaml index f470cb0d3ee2f..d9e1696f2eb50 100644 --- a/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-master.yaml +++ b/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-master.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base binary_build_commands: hack/build-go.sh build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.1.yaml b/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.1.yaml index 839683c576084..967326d2dd318 100644 --- a/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.1.yaml +++ b/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.1.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base binary_build_commands: hack/build-go.sh build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -26,7 +24,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.2.yaml b/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.2.yaml index 58a96d87f13f2..067a10e389c45 100644 --- a/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.2.yaml +++ b/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.2.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base binary_build_commands: hack/build-go.sh build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.3.yaml b/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.3.yaml index 9b82ab704df8a..f646087ddbb98 100644 --- a/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.3.yaml +++ b/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.3.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base binary_build_commands: hack/build-go.sh build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -27,7 +25,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.4.yaml b/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.4.yaml index 7c9cd0bae9b2e..10ed1e5a94f43 100644 --- a/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.4.yaml +++ b/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.4.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base binary_build_commands: hack/build-go.sh build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-nfd-operator/openshift-cluster-nfd-operator-master.yaml b/ci-operator/config/openshift/cluster-nfd-operator/openshift-cluster-nfd-operator-master.yaml index a6b0eb4f45831..34b60d3c3cdf9 100644 --- a/ci-operator/config/openshift/cluster-nfd-operator/openshift-cluster-nfd-operator-master.yaml +++ b/ci-operator/config/openshift/cluster-nfd-operator/openshift-cluster-nfd-operator-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-nfd-operator/openshift-cluster-nfd-operator-release-4.1.yaml b/ci-operator/config/openshift/cluster-nfd-operator/openshift-cluster-nfd-operator-release-4.1.yaml index 73fa0b907f1c4..ef053db0bb47b 100644 --- a/ci-operator/config/openshift/cluster-nfd-operator/openshift-cluster-nfd-operator-release-4.1.yaml +++ b/ci-operator/config/openshift/cluster-nfd-operator/openshift-cluster-nfd-operator-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-nfd-operator/openshift-cluster-nfd-operator-release-4.2.yaml b/ci-operator/config/openshift/cluster-nfd-operator/openshift-cluster-nfd-operator-release-4.2.yaml index a456623503639..a6215e934beb3 100644 --- a/ci-operator/config/openshift/cluster-nfd-operator/openshift-cluster-nfd-operator-release-4.2.yaml +++ b/ci-operator/config/openshift/cluster-nfd-operator/openshift-cluster-nfd-operator-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-nfd-operator/openshift-cluster-nfd-operator-release-4.3.yaml b/ci-operator/config/openshift/cluster-nfd-operator/openshift-cluster-nfd-operator-release-4.3.yaml index 716904fe527e0..3b4582a5cc886 100644 --- a/ci-operator/config/openshift/cluster-nfd-operator/openshift-cluster-nfd-operator-release-4.3.yaml +++ b/ci-operator/config/openshift/cluster-nfd-operator/openshift-cluster-nfd-operator-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-nfd-operator/openshift-cluster-nfd-operator-release-4.4.yaml b/ci-operator/config/openshift/cluster-nfd-operator/openshift-cluster-nfd-operator-release-4.4.yaml index f8c90b1088b29..ae094d3c1070c 100644 --- a/ci-operator/config/openshift/cluster-nfd-operator/openshift-cluster-nfd-operator-release-4.4.yaml +++ b/ci-operator/config/openshift/cluster-nfd-operator/openshift-cluster-nfd-operator-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-node-tuning-operator/openshift-cluster-node-tuning-operator-master.yaml b/ci-operator/config/openshift/cluster-node-tuning-operator/openshift-cluster-node-tuning-operator-master.yaml index c459e6a113287..5c66c6574e7f3 100644 --- a/ci-operator/config/openshift/cluster-node-tuning-operator/openshift-cluster-node-tuning-operator-master.yaml +++ b/ci-operator/config/openshift/cluster-node-tuning-operator/openshift-cluster-node-tuning-operator-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-node-tuning-operator/openshift-cluster-node-tuning-operator-release-4.1.yaml b/ci-operator/config/openshift/cluster-node-tuning-operator/openshift-cluster-node-tuning-operator-release-4.1.yaml index 35bf9d42d7896..b901f266cedd9 100644 --- a/ci-operator/config/openshift/cluster-node-tuning-operator/openshift-cluster-node-tuning-operator-release-4.1.yaml +++ b/ci-operator/config/openshift/cluster-node-tuning-operator/openshift-cluster-node-tuning-operator-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-node-tuning-operator/openshift-cluster-node-tuning-operator-release-4.2.yaml b/ci-operator/config/openshift/cluster-node-tuning-operator/openshift-cluster-node-tuning-operator-release-4.2.yaml index 626074317d825..090d8bf9314c0 100644 --- a/ci-operator/config/openshift/cluster-node-tuning-operator/openshift-cluster-node-tuning-operator-release-4.2.yaml +++ b/ci-operator/config/openshift/cluster-node-tuning-operator/openshift-cluster-node-tuning-operator-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-node-tuning-operator/openshift-cluster-node-tuning-operator-release-4.3.yaml b/ci-operator/config/openshift/cluster-node-tuning-operator/openshift-cluster-node-tuning-operator-release-4.3.yaml index 8d9cdbaeb62e9..1c38f3a8ba9d1 100644 --- a/ci-operator/config/openshift/cluster-node-tuning-operator/openshift-cluster-node-tuning-operator-release-4.3.yaml +++ b/ci-operator/config/openshift/cluster-node-tuning-operator/openshift-cluster-node-tuning-operator-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-node-tuning-operator/openshift-cluster-node-tuning-operator-release-4.4.yaml b/ci-operator/config/openshift/cluster-node-tuning-operator/openshift-cluster-node-tuning-operator-release-4.4.yaml index cd3948cdd1bf7..8741bb7537185 100644 --- a/ci-operator/config/openshift/cluster-node-tuning-operator/openshift-cluster-node-tuning-operator-release-4.4.yaml +++ b/ci-operator/config/openshift/cluster-node-tuning-operator/openshift-cluster-node-tuning-operator-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-master.yaml b/ci-operator/config/openshift/cluster-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-master.yaml index c6d9c5d44f16e..5cd0940f723f7 100644 --- a/ci-operator/config/openshift/cluster-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-master.yaml +++ b/ci-operator/config/openshift/cluster-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-master.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base binary_build_commands: make build --warn-undefined-variables build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -25,7 +23,6 @@ resources: cpu: "3" memory: 3Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/cluster-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-release-4.1.yaml b/ci-operator/config/openshift/cluster-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-release-4.1.yaml index baee87201394d..d5563ef3b901e 100644 --- a/ci-operator/config/openshift/cluster-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-release-4.1.yaml +++ b/ci-operator/config/openshift/cluster-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-release-4.1.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base binary_build_commands: make build --warn-undefined-variables build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.11 @@ -25,7 +23,6 @@ resources: cpu: "3" memory: 1Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/cluster-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-release-4.2.yaml b/ci-operator/config/openshift/cluster-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-release-4.2.yaml index 9d30cb6d36371..bb7450b0f94db 100644 --- a/ci-operator/config/openshift/cluster-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-release-4.2.yaml +++ b/ci-operator/config/openshift/cluster-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-release-4.2.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base binary_build_commands: make build --warn-undefined-variables build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -25,7 +23,6 @@ resources: cpu: "3" memory: 1Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/cluster-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-release-4.3.yaml b/ci-operator/config/openshift/cluster-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-release-4.3.yaml index d8adc3d75e5e9..76a1d6fc0b17d 100644 --- a/ci-operator/config/openshift/cluster-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-release-4.3.yaml +++ b/ci-operator/config/openshift/cluster-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-release-4.3.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base binary_build_commands: make build --warn-undefined-variables build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: "3" memory: 3Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/cluster-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-release-4.4.yaml b/ci-operator/config/openshift/cluster-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-release-4.4.yaml index 3eba9dcfebb8e..30fadd84f09c9 100644 --- a/ci-operator/config/openshift/cluster-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-release-4.4.yaml +++ b/ci-operator/config/openshift/cluster-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-release-4.4.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base binary_build_commands: make build --warn-undefined-variables build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -25,7 +23,6 @@ resources: cpu: "3" memory: 3Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/cluster-openshift-controller-manager-operator/openshift-cluster-openshift-controller-manager-operator-master.yaml b/ci-operator/config/openshift/cluster-openshift-controller-manager-operator/openshift-cluster-openshift-controller-manager-operator-master.yaml index 230f44610eabd..1393307862d87 100644 --- a/ci-operator/config/openshift/cluster-openshift-controller-manager-operator/openshift-cluster-openshift-controller-manager-operator-master.yaml +++ b/ci-operator/config/openshift/cluster-openshift-controller-manager-operator/openshift-cluster-openshift-controller-manager-operator-master.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base binary_build_commands: make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -25,7 +23,6 @@ resources: cpu: "3" memory: 4Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' diff --git a/ci-operator/config/openshift/cluster-openshift-controller-manager-operator/openshift-cluster-openshift-controller-manager-operator-release-4.1.yaml b/ci-operator/config/openshift/cluster-openshift-controller-manager-operator/openshift-cluster-openshift-controller-manager-operator-release-4.1.yaml index 3c8c75f8da6ac..604533d378a6a 100644 --- a/ci-operator/config/openshift/cluster-openshift-controller-manager-operator/openshift-cluster-openshift-controller-manager-operator-release-4.1.yaml +++ b/ci-operator/config/openshift/cluster-openshift-controller-manager-operator/openshift-cluster-openshift-controller-manager-operator-release-4.1.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base binary_build_commands: make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.11 @@ -25,7 +23,6 @@ resources: cpu: "3" memory: 1Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' diff --git a/ci-operator/config/openshift/cluster-openshift-controller-manager-operator/openshift-cluster-openshift-controller-manager-operator-release-4.2.yaml b/ci-operator/config/openshift/cluster-openshift-controller-manager-operator/openshift-cluster-openshift-controller-manager-operator-release-4.2.yaml index 0dca1d7f4511e..173b9d0883889 100644 --- a/ci-operator/config/openshift/cluster-openshift-controller-manager-operator/openshift-cluster-openshift-controller-manager-operator-release-4.2.yaml +++ b/ci-operator/config/openshift/cluster-openshift-controller-manager-operator/openshift-cluster-openshift-controller-manager-operator-release-4.2.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base binary_build_commands: make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -25,7 +23,6 @@ resources: cpu: "3" memory: 4Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' diff --git a/ci-operator/config/openshift/cluster-openshift-controller-manager-operator/openshift-cluster-openshift-controller-manager-operator-release-4.3.yaml b/ci-operator/config/openshift/cluster-openshift-controller-manager-operator/openshift-cluster-openshift-controller-manager-operator-release-4.3.yaml index 52e4a3491d2f6..ebfab2f327222 100644 --- a/ci-operator/config/openshift/cluster-openshift-controller-manager-operator/openshift-cluster-openshift-controller-manager-operator-release-4.3.yaml +++ b/ci-operator/config/openshift/cluster-openshift-controller-manager-operator/openshift-cluster-openshift-controller-manager-operator-release-4.3.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base binary_build_commands: make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: "3" memory: 4Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' diff --git a/ci-operator/config/openshift/cluster-openshift-controller-manager-operator/openshift-cluster-openshift-controller-manager-operator-release-4.4.yaml b/ci-operator/config/openshift/cluster-openshift-controller-manager-operator/openshift-cluster-openshift-controller-manager-operator-release-4.4.yaml index 800476d1b9fe2..b8840250f9d30 100644 --- a/ci-operator/config/openshift/cluster-openshift-controller-manager-operator/openshift-cluster-openshift-controller-manager-operator-release-4.4.yaml +++ b/ci-operator/config/openshift/cluster-openshift-controller-manager-operator/openshift-cluster-openshift-controller-manager-operator-release-4.4.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base binary_build_commands: make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -25,7 +23,6 @@ resources: cpu: "3" memory: 4Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' diff --git a/ci-operator/config/openshift/cluster-policy-controller/openshift-cluster-policy-controller-master.yaml b/ci-operator/config/openshift/cluster-policy-controller/openshift-cluster-policy-controller-master.yaml index 46c3c3b09ee97..33151d0c20d8f 100644 --- a/ci-operator/config/openshift/cluster-policy-controller/openshift-cluster-policy-controller-master.yaml +++ b/ci-operator/config/openshift/cluster-policy-controller/openshift-cluster-policy-controller-master.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base binary_build_commands: make build --warn-undefined-variables build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -31,7 +29,6 @@ resources: cpu: "3" memory: 6Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/cluster-policy-controller/openshift-cluster-policy-controller-release-4.3.yaml b/ci-operator/config/openshift/cluster-policy-controller/openshift-cluster-policy-controller-release-4.3.yaml index 1c8ac5a4ee01a..42e554f7dbf5d 100644 --- a/ci-operator/config/openshift/cluster-policy-controller/openshift-cluster-policy-controller-release-4.3.yaml +++ b/ci-operator/config/openshift/cluster-policy-controller/openshift-cluster-policy-controller-release-4.3.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base binary_build_commands: make build --warn-undefined-variables build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -32,7 +30,6 @@ resources: cpu: "3" memory: 6Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/cluster-policy-controller/openshift-cluster-policy-controller-release-4.4.yaml b/ci-operator/config/openshift/cluster-policy-controller/openshift-cluster-policy-controller-release-4.4.yaml index cde07daebbcc1..2311064c61fd0 100644 --- a/ci-operator/config/openshift/cluster-policy-controller/openshift-cluster-policy-controller-release-4.4.yaml +++ b/ci-operator/config/openshift/cluster-policy-controller/openshift-cluster-policy-controller-release-4.4.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base binary_build_commands: make build --warn-undefined-variables build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -31,7 +29,6 @@ resources: cpu: "3" memory: 6Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/cluster-samples-operator/openshift-cluster-samples-operator-master.yaml b/ci-operator/config/openshift/cluster-samples-operator/openshift-cluster-samples-operator-master.yaml index 61d59bf6cff8f..2d723d68a2670 100644 --- a/ci-operator/config/openshift/cluster-samples-operator/openshift-cluster-samples-operator-master.yaml +++ b/ci-operator/config/openshift/cluster-samples-operator/openshift-cluster-samples-operator-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-samples-operator/openshift-cluster-samples-operator-release-4.1.yaml b/ci-operator/config/openshift/cluster-samples-operator/openshift-cluster-samples-operator-release-4.1.yaml index 338ed6d88e5de..789c9946d3714 100644 --- a/ci-operator/config/openshift/cluster-samples-operator/openshift-cluster-samples-operator-release-4.1.yaml +++ b/ci-operator/config/openshift/cluster-samples-operator/openshift-cluster-samples-operator-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-samples-operator/openshift-cluster-samples-operator-release-4.2.yaml b/ci-operator/config/openshift/cluster-samples-operator/openshift-cluster-samples-operator-release-4.2.yaml index 507686d62e594..7db8b0b915f3a 100644 --- a/ci-operator/config/openshift/cluster-samples-operator/openshift-cluster-samples-operator-release-4.2.yaml +++ b/ci-operator/config/openshift/cluster-samples-operator/openshift-cluster-samples-operator-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-samples-operator/openshift-cluster-samples-operator-release-4.3.yaml b/ci-operator/config/openshift/cluster-samples-operator/openshift-cluster-samples-operator-release-4.3.yaml index 5cad5b74e01ff..30f45c5f484e2 100644 --- a/ci-operator/config/openshift/cluster-samples-operator/openshift-cluster-samples-operator-release-4.3.yaml +++ b/ci-operator/config/openshift/cluster-samples-operator/openshift-cluster-samples-operator-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-samples-operator/openshift-cluster-samples-operator-release-4.4.yaml b/ci-operator/config/openshift/cluster-samples-operator/openshift-cluster-samples-operator-release-4.4.yaml index 553d33c954f1f..843c002188f35 100644 --- a/ci-operator/config/openshift/cluster-samples-operator/openshift-cluster-samples-operator-release-4.4.yaml +++ b/ci-operator/config/openshift/cluster-samples-operator/openshift-cluster-samples-operator-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-storage-operator/openshift-cluster-storage-operator-master.yaml b/ci-operator/config/openshift/cluster-storage-operator/openshift-cluster-storage-operator-master.yaml index e5700c7b36cb8..f2d2217c7d3c7 100644 --- a/ci-operator/config/openshift/cluster-storage-operator/openshift-cluster-storage-operator-master.yaml +++ b/ci-operator/config/openshift/cluster-storage-operator/openshift-cluster-storage-operator-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-storage-operator/openshift-cluster-storage-operator-release-4.1.yaml b/ci-operator/config/openshift/cluster-storage-operator/openshift-cluster-storage-operator-release-4.1.yaml index e25beb825237f..0f107a9434489 100644 --- a/ci-operator/config/openshift/cluster-storage-operator/openshift-cluster-storage-operator-release-4.1.yaml +++ b/ci-operator/config/openshift/cluster-storage-operator/openshift-cluster-storage-operator-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-storage-operator/openshift-cluster-storage-operator-release-4.2.yaml b/ci-operator/config/openshift/cluster-storage-operator/openshift-cluster-storage-operator-release-4.2.yaml index b90a813556b8f..be3f713e93f7e 100644 --- a/ci-operator/config/openshift/cluster-storage-operator/openshift-cluster-storage-operator-release-4.2.yaml +++ b/ci-operator/config/openshift/cluster-storage-operator/openshift-cluster-storage-operator-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-storage-operator/openshift-cluster-storage-operator-release-4.3.yaml b/ci-operator/config/openshift/cluster-storage-operator/openshift-cluster-storage-operator-release-4.3.yaml index 25af0f40a41f4..45281cac04b0a 100644 --- a/ci-operator/config/openshift/cluster-storage-operator/openshift-cluster-storage-operator-release-4.3.yaml +++ b/ci-operator/config/openshift/cluster-storage-operator/openshift-cluster-storage-operator-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-storage-operator/openshift-cluster-storage-operator-release-4.4.yaml b/ci-operator/config/openshift/cluster-storage-operator/openshift-cluster-storage-operator-release-4.4.yaml index d71adc42a826f..b5b3d84a2010b 100644 --- a/ci-operator/config/openshift/cluster-storage-operator/openshift-cluster-storage-operator-release-4.4.yaml +++ b/ci-operator/config/openshift/cluster-storage-operator/openshift-cluster-storage-operator-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-svcat-apiserver-operator/openshift-cluster-svcat-apiserver-operator-master.yaml b/ci-operator/config/openshift/cluster-svcat-apiserver-operator/openshift-cluster-svcat-apiserver-operator-master.yaml index 39a6547d19b03..976c3b8a6e7c4 100644 --- a/ci-operator/config/openshift/cluster-svcat-apiserver-operator/openshift-cluster-svcat-apiserver-operator-master.yaml +++ b/ci-operator/config/openshift/cluster-svcat-apiserver-operator/openshift-cluster-svcat-apiserver-operator-master.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base binary_build_commands: make build --warn-undefined-variables build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: "3" memory: 1Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/cluster-svcat-apiserver-operator/openshift-cluster-svcat-apiserver-operator-release-4.1.yaml b/ci-operator/config/openshift/cluster-svcat-apiserver-operator/openshift-cluster-svcat-apiserver-operator-release-4.1.yaml index db30c0e9e0a2c..3d411e219090f 100644 --- a/ci-operator/config/openshift/cluster-svcat-apiserver-operator/openshift-cluster-svcat-apiserver-operator-release-4.1.yaml +++ b/ci-operator/config/openshift/cluster-svcat-apiserver-operator/openshift-cluster-svcat-apiserver-operator-release-4.1.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base binary_build_commands: make build --warn-undefined-variables build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -26,7 +24,6 @@ resources: cpu: "3" memory: 1Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/cluster-svcat-apiserver-operator/openshift-cluster-svcat-apiserver-operator-release-4.2.yaml b/ci-operator/config/openshift/cluster-svcat-apiserver-operator/openshift-cluster-svcat-apiserver-operator-release-4.2.yaml index 63e9e67c64079..5eaddd6987db1 100644 --- a/ci-operator/config/openshift/cluster-svcat-apiserver-operator/openshift-cluster-svcat-apiserver-operator-release-4.2.yaml +++ b/ci-operator/config/openshift/cluster-svcat-apiserver-operator/openshift-cluster-svcat-apiserver-operator-release-4.2.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base binary_build_commands: make build --warn-undefined-variables build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: "3" memory: 1Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/cluster-svcat-apiserver-operator/openshift-cluster-svcat-apiserver-operator-release-4.3.yaml b/ci-operator/config/openshift/cluster-svcat-apiserver-operator/openshift-cluster-svcat-apiserver-operator-release-4.3.yaml index abdb34b70612f..eebf68f408748 100644 --- a/ci-operator/config/openshift/cluster-svcat-apiserver-operator/openshift-cluster-svcat-apiserver-operator-release-4.3.yaml +++ b/ci-operator/config/openshift/cluster-svcat-apiserver-operator/openshift-cluster-svcat-apiserver-operator-release-4.3.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base binary_build_commands: make build --warn-undefined-variables build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -27,7 +25,6 @@ resources: cpu: "3" memory: 1Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/cluster-svcat-apiserver-operator/openshift-cluster-svcat-apiserver-operator-release-4.4.yaml b/ci-operator/config/openshift/cluster-svcat-apiserver-operator/openshift-cluster-svcat-apiserver-operator-release-4.4.yaml index 58d9086508c73..34e0e7021769e 100644 --- a/ci-operator/config/openshift/cluster-svcat-apiserver-operator/openshift-cluster-svcat-apiserver-operator-release-4.4.yaml +++ b/ci-operator/config/openshift/cluster-svcat-apiserver-operator/openshift-cluster-svcat-apiserver-operator-release-4.4.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base binary_build_commands: make build --warn-undefined-variables build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: "3" memory: 1Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/cluster-svcat-controller-manager-operator/openshift-cluster-svcat-controller-manager-operator-master.yaml b/ci-operator/config/openshift/cluster-svcat-controller-manager-operator/openshift-cluster-svcat-controller-manager-operator-master.yaml index e89dc74eb09f8..d2da7a0be3333 100644 --- a/ci-operator/config/openshift/cluster-svcat-controller-manager-operator/openshift-cluster-svcat-controller-manager-operator-master.yaml +++ b/ci-operator/config/openshift/cluster-svcat-controller-manager-operator/openshift-cluster-svcat-controller-manager-operator-master.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base binary_build_commands: make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: "3" memory: 1Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' diff --git a/ci-operator/config/openshift/cluster-svcat-controller-manager-operator/openshift-cluster-svcat-controller-manager-operator-release-4.1.yaml b/ci-operator/config/openshift/cluster-svcat-controller-manager-operator/openshift-cluster-svcat-controller-manager-operator-release-4.1.yaml index 3cedf1f40ff49..d19bc9a9274f4 100644 --- a/ci-operator/config/openshift/cluster-svcat-controller-manager-operator/openshift-cluster-svcat-controller-manager-operator-release-4.1.yaml +++ b/ci-operator/config/openshift/cluster-svcat-controller-manager-operator/openshift-cluster-svcat-controller-manager-operator-release-4.1.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base binary_build_commands: make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -26,7 +24,6 @@ resources: cpu: "3" memory: 1Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' diff --git a/ci-operator/config/openshift/cluster-svcat-controller-manager-operator/openshift-cluster-svcat-controller-manager-operator-release-4.2.yaml b/ci-operator/config/openshift/cluster-svcat-controller-manager-operator/openshift-cluster-svcat-controller-manager-operator-release-4.2.yaml index 7c37b3e8d6f33..e7c83af9bb0d4 100644 --- a/ci-operator/config/openshift/cluster-svcat-controller-manager-operator/openshift-cluster-svcat-controller-manager-operator-release-4.2.yaml +++ b/ci-operator/config/openshift/cluster-svcat-controller-manager-operator/openshift-cluster-svcat-controller-manager-operator-release-4.2.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base binary_build_commands: make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: "3" memory: 1Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' diff --git a/ci-operator/config/openshift/cluster-svcat-controller-manager-operator/openshift-cluster-svcat-controller-manager-operator-release-4.3.yaml b/ci-operator/config/openshift/cluster-svcat-controller-manager-operator/openshift-cluster-svcat-controller-manager-operator-release-4.3.yaml index 75a6ba533b865..20862ff2aaba2 100644 --- a/ci-operator/config/openshift/cluster-svcat-controller-manager-operator/openshift-cluster-svcat-controller-manager-operator-release-4.3.yaml +++ b/ci-operator/config/openshift/cluster-svcat-controller-manager-operator/openshift-cluster-svcat-controller-manager-operator-release-4.3.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base binary_build_commands: make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -27,7 +25,6 @@ resources: cpu: "3" memory: 1Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' diff --git a/ci-operator/config/openshift/cluster-svcat-controller-manager-operator/openshift-cluster-svcat-controller-manager-operator-release-4.4.yaml b/ci-operator/config/openshift/cluster-svcat-controller-manager-operator/openshift-cluster-svcat-controller-manager-operator-release-4.4.yaml index bac51867920f1..086a3a0af62bb 100644 --- a/ci-operator/config/openshift/cluster-svcat-controller-manager-operator/openshift-cluster-svcat-controller-manager-operator-release-4.4.yaml +++ b/ci-operator/config/openshift/cluster-svcat-controller-manager-operator/openshift-cluster-svcat-controller-manager-operator-release-4.4.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base binary_build_commands: make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: "3" memory: 1Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' diff --git a/ci-operator/config/openshift/cluster-update-keys/openshift-cluster-update-keys-master.yaml b/ci-operator/config/openshift/cluster-update-keys/openshift-cluster-update-keys-master.yaml index c88a9d28d5071..f756329d1cd4a 100644 --- a/ci-operator/config/openshift/cluster-update-keys/openshift-cluster-update-keys-master.yaml +++ b/ci-operator/config/openshift/cluster-update-keys/openshift-cluster-update-keys-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-update-keys/openshift-cluster-update-keys-release-4.1.yaml b/ci-operator/config/openshift/cluster-update-keys/openshift-cluster-update-keys-release-4.1.yaml index 8c1c9ae21c229..c30ebe17e3a9a 100644 --- a/ci-operator/config/openshift/cluster-update-keys/openshift-cluster-update-keys-release-4.1.yaml +++ b/ci-operator/config/openshift/cluster-update-keys/openshift-cluster-update-keys-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-update-keys/openshift-cluster-update-keys-release-4.2.yaml b/ci-operator/config/openshift/cluster-update-keys/openshift-cluster-update-keys-release-4.2.yaml index e576aed4f2aab..984f8711d3c7d 100644 --- a/ci-operator/config/openshift/cluster-update-keys/openshift-cluster-update-keys-release-4.2.yaml +++ b/ci-operator/config/openshift/cluster-update-keys/openshift-cluster-update-keys-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-update-keys/openshift-cluster-update-keys-release-4.3.yaml b/ci-operator/config/openshift/cluster-update-keys/openshift-cluster-update-keys-release-4.3.yaml index 333f0eeb22b36..7af1bdfd25fc6 100644 --- a/ci-operator/config/openshift/cluster-update-keys/openshift-cluster-update-keys-release-4.3.yaml +++ b/ci-operator/config/openshift/cluster-update-keys/openshift-cluster-update-keys-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-update-keys/openshift-cluster-update-keys-release-4.4.yaml b/ci-operator/config/openshift/cluster-update-keys/openshift-cluster-update-keys-release-4.4.yaml index 5a35059bb3712..317cb0fc657c4 100644 --- a/ci-operator/config/openshift/cluster-update-keys/openshift-cluster-update-keys-release-4.4.yaml +++ b/ci-operator/config/openshift/cluster-update-keys/openshift-cluster-update-keys-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-master.yaml b/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-master.yaml index e867e8d4f8267..39c228adb54ed 100644 --- a/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-master.yaml +++ b/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-3.11.yaml b/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-3.11.yaml index 35b79984e43b4..8f399e18b9b10 100644 --- a/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-3.11.yaml +++ b/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-3.11.yaml @@ -1,15 +1,8 @@ base_images: base: - cluster: https://api.ci.openshift.org name: origin-v3.11 namespace: openshift tag: base -build_root: - image_stream_tag: - cluster: https://api.ci.openshift.org - name: release - namespace: openshift - tag: golang-1.10 images: - from: base to: cluster-version-operator @@ -21,9 +14,15 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: origin-v3.11 namespace: openshift + tag: '' + tag_overrides: {} +build_root: + image_stream_tag: + name: release + namespace: openshift + tag: golang-1.10 tests: - as: unit commands: go test ./... diff --git a/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.1.yaml b/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.1.yaml index ae8bbcedd7690..418481407bcdb 100644 --- a/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.1.yaml +++ b/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.2.yaml b/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.2.yaml index 77cd7f177515c..16e83f502ef1e 100644 --- a/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.2.yaml +++ b/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.3.yaml b/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.3.yaml index 91bc29b13e835..0d85cfcca6206 100644 --- a/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.3.yaml +++ b/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.4.yaml b/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.4.yaml index c3757c7d374c4..faa7fb41d6d77 100644 --- a/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.4.yaml +++ b/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/configmap-reload/openshift-configmap-reload-master.yaml b/ci-operator/config/openshift/configmap-reload/openshift-configmap-reload-master.yaml index 5d448465a019c..86e7a341bedb2 100644 --- a/ci-operator/config/openshift/configmap-reload/openshift-configmap-reload-master.yaml +++ b/ci-operator/config/openshift/configmap-reload/openshift-configmap-reload-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/configmap-reload/openshift-configmap-reload-release-4.1.yaml b/ci-operator/config/openshift/configmap-reload/openshift-configmap-reload-release-4.1.yaml index d506969410671..c0dac18a74983 100644 --- a/ci-operator/config/openshift/configmap-reload/openshift-configmap-reload-release-4.1.yaml +++ b/ci-operator/config/openshift/configmap-reload/openshift-configmap-reload-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/configmap-reload/openshift-configmap-reload-release-4.2.yaml b/ci-operator/config/openshift/configmap-reload/openshift-configmap-reload-release-4.2.yaml index c48e3aa790ca4..c5b0a0b044a23 100644 --- a/ci-operator/config/openshift/configmap-reload/openshift-configmap-reload-release-4.2.yaml +++ b/ci-operator/config/openshift/configmap-reload/openshift-configmap-reload-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/configmap-reload/openshift-configmap-reload-release-4.3.yaml b/ci-operator/config/openshift/configmap-reload/openshift-configmap-reload-release-4.3.yaml index 44410a555a2fc..79b9bc2b25ddc 100644 --- a/ci-operator/config/openshift/configmap-reload/openshift-configmap-reload-release-4.3.yaml +++ b/ci-operator/config/openshift/configmap-reload/openshift-configmap-reload-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/configmap-reload/openshift-configmap-reload-release-4.4.yaml b/ci-operator/config/openshift/configmap-reload/openshift-configmap-reload-release-4.4.yaml index 7c602df9b69f9..b03f47f3dfe30 100644 --- a/ci-operator/config/openshift/configmap-reload/openshift-configmap-reload-release-4.4.yaml +++ b/ci-operator/config/openshift/configmap-reload/openshift-configmap-reload-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/configure-alertmanager-operator/openshift-configure-alertmanager-operator-master.yaml b/ci-operator/config/openshift/configure-alertmanager-operator/openshift-configure-alertmanager-operator-master.yaml index d94e430550ab8..496f14380e8ed 100644 --- a/ci-operator/config/openshift/configure-alertmanager-operator/openshift-configure-alertmanager-operator-master.yaml +++ b/ci-operator/config/openshift/configure-alertmanager-operator/openshift-configure-alertmanager-operator-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,6 +23,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp diff --git a/ci-operator/config/openshift/configure-alertmanager-operator/openshift-configure-alertmanager-operator-release-4.1.yaml b/ci-operator/config/openshift/configure-alertmanager-operator/openshift-configure-alertmanager-operator-release-4.1.yaml index 6f6dbf0e1c5e3..e85a5c611d080 100644 --- a/ci-operator/config/openshift/configure-alertmanager-operator/openshift-configure-alertmanager-operator-release-4.1.yaml +++ b/ci-operator/config/openshift/configure-alertmanager-operator/openshift-configure-alertmanager-operator-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,6 +23,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp diff --git a/ci-operator/config/openshift/configure-alertmanager-operator/openshift-configure-alertmanager-operator-release-4.2.yaml b/ci-operator/config/openshift/configure-alertmanager-operator/openshift-configure-alertmanager-operator-release-4.2.yaml index b617dc78f1ff0..c7df8fb61a548 100644 --- a/ci-operator/config/openshift/configure-alertmanager-operator/openshift-configure-alertmanager-operator-release-4.2.yaml +++ b/ci-operator/config/openshift/configure-alertmanager-operator/openshift-configure-alertmanager-operator-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,6 +23,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp diff --git a/ci-operator/config/openshift/configure-alertmanager-operator/openshift-configure-alertmanager-operator-release-4.3.yaml b/ci-operator/config/openshift/configure-alertmanager-operator/openshift-configure-alertmanager-operator-release-4.3.yaml index 164e5646033e9..a4b20c2961ce6 100644 --- a/ci-operator/config/openshift/configure-alertmanager-operator/openshift-configure-alertmanager-operator-release-4.3.yaml +++ b/ci-operator/config/openshift/configure-alertmanager-operator/openshift-configure-alertmanager-operator-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -26,6 +24,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp diff --git a/ci-operator/config/openshift/configure-alertmanager-operator/openshift-configure-alertmanager-operator-release-4.4.yaml b/ci-operator/config/openshift/configure-alertmanager-operator/openshift-configure-alertmanager-operator-release-4.4.yaml index cba34008cecf7..633245cda7314 100644 --- a/ci-operator/config/openshift/configure-alertmanager-operator/openshift-configure-alertmanager-operator-release-4.4.yaml +++ b/ci-operator/config/openshift/configure-alertmanager-operator/openshift-configure-alertmanager-operator-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,6 +23,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp diff --git a/ci-operator/config/openshift/console-operator/openshift-console-operator-master.yaml b/ci-operator/config/openshift/console-operator/openshift-console-operator-master.yaml index 50d8e9abf0e73..fcce7529c898f 100644 --- a/ci-operator/config/openshift/console-operator/openshift-console-operator-master.yaml +++ b/ci-operator/config/openshift/console-operator/openshift-console-operator-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -29,7 +27,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/console-operator/openshift-console-operator-release-4.1.yaml b/ci-operator/config/openshift/console-operator/openshift-console-operator-release-4.1.yaml index c04e126397a5e..3f0af9eab8ce4 100644 --- a/ci-operator/config/openshift/console-operator/openshift-console-operator-release-4.1.yaml +++ b/ci-operator/config/openshift/console-operator/openshift-console-operator-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -29,7 +27,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/console-operator/openshift-console-operator-release-4.2.yaml b/ci-operator/config/openshift/console-operator/openshift-console-operator-release-4.2.yaml index 64dab8cc5c222..f717e0a2f3aaa 100644 --- a/ci-operator/config/openshift/console-operator/openshift-console-operator-release-4.2.yaml +++ b/ci-operator/config/openshift/console-operator/openshift-console-operator-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -29,7 +27,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/console-operator/openshift-console-operator-release-4.3.yaml b/ci-operator/config/openshift/console-operator/openshift-console-operator-release-4.3.yaml index cd04ad82e12c6..1e686f0db7e72 100644 --- a/ci-operator/config/openshift/console-operator/openshift-console-operator-release-4.3.yaml +++ b/ci-operator/config/openshift/console-operator/openshift-console-operator-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -30,7 +28,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/console-operator/openshift-console-operator-release-4.4.yaml b/ci-operator/config/openshift/console-operator/openshift-console-operator-release-4.4.yaml index 52e2d514765e2..95f78d9c22fef 100644 --- a/ci-operator/config/openshift/console-operator/openshift-console-operator-release-4.4.yaml +++ b/ci-operator/config/openshift/console-operator/openshift-console-operator-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -29,7 +27,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/console/openshift-console-master.yaml b/ci-operator/config/openshift/console/openshift-console-master.yaml index f488e26b3bd3c..462e9abe4bc0b 100644 --- a/ci-operator/config/openshift/console/openshift-console-master.yaml +++ b/ci-operator/config/openshift/console/openshift-console-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: tectonic-console-builder @@ -55,7 +53,6 @@ resources: cpu: "1" memory: 10Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp test_binary_build_commands: ./build.sh diff --git a/ci-operator/config/openshift/console/openshift-console-release-3.10.yaml b/ci-operator/config/openshift/console/openshift-console-release-3.10.yaml index c52194c6131a3..fc4cd89034a95 100644 --- a/ci-operator/config/openshift/console/openshift-console-release-3.10.yaml +++ b/ci-operator/config/openshift/console/openshift-console-release-3.10.yaml @@ -1,15 +1,8 @@ base_images: base: - cluster: https://api.ci.openshift.org name: origin-v3.10 namespace: openshift tag: base -build_root: - image_stream_tag: - cluster: https://api.ci.openshift.org - name: release - namespace: openshift - tag: tectonic-console-builder resources: '*': limits: @@ -18,9 +11,15 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: origin-v3.10 namespace: openshift + tag: '' + tag_overrides: {} +build_root: + image_stream_tag: + name: release + namespace: openshift + tag: tectonic-console-builder test_binary_build_commands: ./build.sh tests: - artifact_dir: /tmp/artifacts diff --git a/ci-operator/config/openshift/console/openshift-console-release-3.11.yaml b/ci-operator/config/openshift/console/openshift-console-release-3.11.yaml index 406edce346a97..547bc70aa4271 100644 --- a/ci-operator/config/openshift/console/openshift-console-release-3.11.yaml +++ b/ci-operator/config/openshift/console/openshift-console-release-3.11.yaml @@ -1,22 +1,14 @@ base_images: base: - cluster: https://api.ci.openshift.org name: origin-v3.11 namespace: openshift tag: base -build_root: - image_stream_tag: - cluster: https://api.ci.openshift.org - name: release - namespace: openshift - tag: tectonic-console-builder images: - from: base inputs: root: as: - build - paths: null to: console resources: '*': @@ -26,9 +18,15 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: origin-v3.11 namespace: openshift + tag: '' + tag_overrides: {} +build_root: + image_stream_tag: + name: release + namespace: openshift + tag: tectonic-console-builder test_binary_build_commands: ./build.sh tests: - artifact_dir: /tmp/artifacts diff --git a/ci-operator/config/openshift/console/openshift-console-release-4.1.yaml b/ci-operator/config/openshift/console/openshift-console-release-4.1.yaml index 50e781fff48fb..6aa291e36bc83 100644 --- a/ci-operator/config/openshift/console/openshift-console-release-4.1.yaml +++ b/ci-operator/config/openshift/console/openshift-console-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: tectonic-console-builder @@ -37,7 +35,6 @@ resources: cpu: "1" memory: 5Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp test_binary_build_commands: ./build.sh diff --git a/ci-operator/config/openshift/console/openshift-console-release-4.2.yaml b/ci-operator/config/openshift/console/openshift-console-release-4.2.yaml index 792796509ac6d..b00279fe98c98 100644 --- a/ci-operator/config/openshift/console/openshift-console-release-4.2.yaml +++ b/ci-operator/config/openshift/console/openshift-console-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: tectonic-console-builder @@ -49,7 +47,6 @@ resources: cpu: "1" memory: 10Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp test_binary_build_commands: ./build.sh diff --git a/ci-operator/config/openshift/console/openshift-console-release-4.3.yaml b/ci-operator/config/openshift/console/openshift-console-release-4.3.yaml index b321b446aee37..235b25c1da91f 100644 --- a/ci-operator/config/openshift/console/openshift-console-release-4.3.yaml +++ b/ci-operator/config/openshift/console/openshift-console-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: tectonic-console-builder @@ -56,7 +54,6 @@ resources: cpu: "1" memory: 10Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp test_binary_build_commands: ./build.sh diff --git a/ci-operator/config/openshift/console/openshift-console-release-4.4.yaml b/ci-operator/config/openshift/console/openshift-console-release-4.4.yaml index cfa976591927d..b69d37af18701 100644 --- a/ci-operator/config/openshift/console/openshift-console-release-4.4.yaml +++ b/ci-operator/config/openshift/console/openshift-console-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: tectonic-console-builder @@ -55,7 +53,6 @@ resources: cpu: "1" memory: 10Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp test_binary_build_commands: ./build.sh diff --git a/ci-operator/config/openshift/containernetworking-plugins/openshift-containernetworking-plugins-master.yaml b/ci-operator/config/openshift/containernetworking-plugins/openshift-containernetworking-plugins-master.yaml index 9a493f824cb4f..c42932386c81d 100644 --- a/ci-operator/config/openshift/containernetworking-plugins/openshift-containernetworking-plugins-master.yaml +++ b/ci-operator/config/openshift/containernetworking-plugins/openshift-containernetworking-plugins-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/containernetworking-plugins/openshift-containernetworking-plugins-release-4.1.yaml b/ci-operator/config/openshift/containernetworking-plugins/openshift-containernetworking-plugins-release-4.1.yaml index 9ee988c74078e..c5b37fec5576c 100644 --- a/ci-operator/config/openshift/containernetworking-plugins/openshift-containernetworking-plugins-release-4.1.yaml +++ b/ci-operator/config/openshift/containernetworking-plugins/openshift-containernetworking-plugins-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -28,7 +26,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/containernetworking-plugins/openshift-containernetworking-plugins-release-4.2.yaml b/ci-operator/config/openshift/containernetworking-plugins/openshift-containernetworking-plugins-release-4.2.yaml index 07c7a21268e0b..aa87fe572e181 100644 --- a/ci-operator/config/openshift/containernetworking-plugins/openshift-containernetworking-plugins-release-4.2.yaml +++ b/ci-operator/config/openshift/containernetworking-plugins/openshift-containernetworking-plugins-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/containernetworking-plugins/openshift-containernetworking-plugins-release-4.3.yaml b/ci-operator/config/openshift/containernetworking-plugins/openshift-containernetworking-plugins-release-4.3.yaml index 18adc198c5a8e..2d83589559873 100644 --- a/ci-operator/config/openshift/containernetworking-plugins/openshift-containernetworking-plugins-release-4.3.yaml +++ b/ci-operator/config/openshift/containernetworking-plugins/openshift-containernetworking-plugins-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -26,7 +24,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/containernetworking-plugins/openshift-containernetworking-plugins-release-4.4.yaml b/ci-operator/config/openshift/containernetworking-plugins/openshift-containernetworking-plugins-release-4.4.yaml index 17a1c51e04f35..f72418740ab0b 100644 --- a/ci-operator/config/openshift/containernetworking-plugins/openshift-containernetworking-plugins-release-4.4.yaml +++ b/ci-operator/config/openshift/containernetworking-plugins/openshift-containernetworking-plugins-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/coredns-mdns/openshift-coredns-mdns-master.yaml b/ci-operator/config/openshift/coredns-mdns/openshift-coredns-mdns-master.yaml index c87c4ad4baad3..c3213809b16dc 100644 --- a/ci-operator/config/openshift/coredns-mdns/openshift-coredns-mdns-master.yaml +++ b/ci-operator/config/openshift/coredns-mdns/openshift-coredns-mdns-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 diff --git a/ci-operator/config/openshift/coredns-mdns/openshift-coredns-mdns-release-4.2.yaml b/ci-operator/config/openshift/coredns-mdns/openshift-coredns-mdns-release-4.2.yaml index f91b05a2d9054..50fb82d386960 100644 --- a/ci-operator/config/openshift/coredns-mdns/openshift-coredns-mdns-release-4.2.yaml +++ b/ci-operator/config/openshift/coredns-mdns/openshift-coredns-mdns-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 diff --git a/ci-operator/config/openshift/coredns-mdns/openshift-coredns-mdns-release-4.3.yaml b/ci-operator/config/openshift/coredns-mdns/openshift-coredns-mdns-release-4.3.yaml index 51911032e0625..e4e4b8e9313be 100644 --- a/ci-operator/config/openshift/coredns-mdns/openshift-coredns-mdns-release-4.3.yaml +++ b/ci-operator/config/openshift/coredns-mdns/openshift-coredns-mdns-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 diff --git a/ci-operator/config/openshift/coredns/openshift-coredns-master.yaml b/ci-operator/config/openshift/coredns/openshift-coredns-master.yaml index bc9806271fa07..1c474442157ce 100644 --- a/ci-operator/config/openshift/coredns/openshift-coredns-master.yaml +++ b/ci-operator/config/openshift/coredns/openshift-coredns-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -36,7 +34,6 @@ resources: requests: memory: 4Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/coredns/openshift-coredns-release-4.1.yaml b/ci-operator/config/openshift/coredns/openshift-coredns-release-4.1.yaml index 32c04e6075de8..2b380d3ea270c 100644 --- a/ci-operator/config/openshift/coredns/openshift-coredns-release-4.1.yaml +++ b/ci-operator/config/openshift/coredns/openshift-coredns-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -36,7 +34,6 @@ resources: requests: memory: 4Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/coredns/openshift-coredns-release-4.2.yaml b/ci-operator/config/openshift/coredns/openshift-coredns-release-4.2.yaml index 7534c1185d61f..ef33c521e2fd1 100644 --- a/ci-operator/config/openshift/coredns/openshift-coredns-release-4.2.yaml +++ b/ci-operator/config/openshift/coredns/openshift-coredns-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -36,7 +34,6 @@ resources: requests: memory: 4Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/coredns/openshift-coredns-release-4.3.yaml b/ci-operator/config/openshift/coredns/openshift-coredns-release-4.3.yaml index 5a0533ba126ee..89cb51dabf31a 100644 --- a/ci-operator/config/openshift/coredns/openshift-coredns-release-4.3.yaml +++ b/ci-operator/config/openshift/coredns/openshift-coredns-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -37,7 +35,6 @@ resources: requests: memory: 4Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/coredns/openshift-coredns-release-4.4.yaml b/ci-operator/config/openshift/coredns/openshift-coredns-release-4.4.yaml index 82f7072f4a0cc..30c401110f7ff 100644 --- a/ci-operator/config/openshift/coredns/openshift-coredns-release-4.4.yaml +++ b/ci-operator/config/openshift/coredns/openshift-coredns-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -36,7 +34,6 @@ resources: requests: memory: 4Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/crd-schema-gen/openshift-crd-schema-gen-master.yaml b/ci-operator/config/openshift/crd-schema-gen/openshift-crd-schema-gen-master.yaml index 63de2bb475cbb..33ab5b9b55b29 100644 --- a/ci-operator/config/openshift/crd-schema-gen/openshift-crd-schema-gen-master.yaml +++ b/ci-operator/config/openshift/crd-schema-gen/openshift-crd-schema-gen-master.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base binary_build_commands: make build --warn-undefined-variables build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: "3" memory: 2Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/crd-schema-gen/openshift-crd-schema-gen-release-4.2.yaml b/ci-operator/config/openshift/crd-schema-gen/openshift-crd-schema-gen-release-4.2.yaml index 52f03393b9bfc..caa82dcef6f58 100644 --- a/ci-operator/config/openshift/crd-schema-gen/openshift-crd-schema-gen-release-4.2.yaml +++ b/ci-operator/config/openshift/crd-schema-gen/openshift-crd-schema-gen-release-4.2.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base binary_build_commands: make build --warn-undefined-variables build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: "3" memory: 2Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/crd-schema-gen/openshift-crd-schema-gen-release-4.3.yaml b/ci-operator/config/openshift/crd-schema-gen/openshift-crd-schema-gen-release-4.3.yaml index b8c8601051184..7d15a0feaf189 100644 --- a/ci-operator/config/openshift/crd-schema-gen/openshift-crd-schema-gen-release-4.3.yaml +++ b/ci-operator/config/openshift/crd-schema-gen/openshift-crd-schema-gen-release-4.3.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base binary_build_commands: make build --warn-undefined-variables build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -27,7 +25,6 @@ resources: cpu: "3" memory: 2Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/crd-schema-gen/openshift-crd-schema-gen-release-4.4.yaml b/ci-operator/config/openshift/crd-schema-gen/openshift-crd-schema-gen-release-4.4.yaml index 871fd8341e986..6104565c53c17 100644 --- a/ci-operator/config/openshift/crd-schema-gen/openshift-crd-schema-gen-release-4.4.yaml +++ b/ci-operator/config/openshift/crd-schema-gen/openshift-crd-schema-gen-release-4.4.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base binary_build_commands: make build --warn-undefined-variables build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: "3" memory: 2Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/csi-cluster-driver-registrar/openshift-csi-cluster-driver-registrar-master.yaml b/ci-operator/config/openshift/csi-cluster-driver-registrar/openshift-csi-cluster-driver-registrar-master.yaml index 0331688af79c4..e2eb72b7dfc70 100644 --- a/ci-operator/config/openshift/csi-cluster-driver-registrar/openshift-csi-cluster-driver-registrar-master.yaml +++ b/ci-operator/config/openshift/csi-cluster-driver-registrar/openshift-csi-cluster-driver-registrar-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.11 @@ -31,7 +29,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/csi-cluster-driver-registrar/openshift-csi-cluster-driver-registrar-release-4.1.yaml b/ci-operator/config/openshift/csi-cluster-driver-registrar/openshift-csi-cluster-driver-registrar-release-4.1.yaml index 0dfa5f7c7b7b5..4d0731767989d 100644 --- a/ci-operator/config/openshift/csi-cluster-driver-registrar/openshift-csi-cluster-driver-registrar-release-4.1.yaml +++ b/ci-operator/config/openshift/csi-cluster-driver-registrar/openshift-csi-cluster-driver-registrar-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.11 @@ -22,7 +20,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/csi-cluster-driver-registrar/openshift-csi-cluster-driver-registrar-release-4.2.yaml b/ci-operator/config/openshift/csi-cluster-driver-registrar/openshift-csi-cluster-driver-registrar-release-4.2.yaml index ac5435338410e..262c92da01e21 100644 --- a/ci-operator/config/openshift/csi-cluster-driver-registrar/openshift-csi-cluster-driver-registrar-release-4.2.yaml +++ b/ci-operator/config/openshift/csi-cluster-driver-registrar/openshift-csi-cluster-driver-registrar-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.11 @@ -31,7 +29,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/csi-cluster-driver-registrar/openshift-csi-cluster-driver-registrar-release-4.3.yaml b/ci-operator/config/openshift/csi-cluster-driver-registrar/openshift-csi-cluster-driver-registrar-release-4.3.yaml index 4137d0465b9f5..4304fd9bbd0da 100644 --- a/ci-operator/config/openshift/csi-cluster-driver-registrar/openshift-csi-cluster-driver-registrar-release-4.3.yaml +++ b/ci-operator/config/openshift/csi-cluster-driver-registrar/openshift-csi-cluster-driver-registrar-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.11 @@ -32,7 +30,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/csi-cluster-driver-registrar/openshift-csi-cluster-driver-registrar-release-4.4.yaml b/ci-operator/config/openshift/csi-cluster-driver-registrar/openshift-csi-cluster-driver-registrar-release-4.4.yaml index bb4df78e5982c..21696e57932ba 100644 --- a/ci-operator/config/openshift/csi-cluster-driver-registrar/openshift-csi-cluster-driver-registrar-release-4.4.yaml +++ b/ci-operator/config/openshift/csi-cluster-driver-registrar/openshift-csi-cluster-driver-registrar-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.11 @@ -31,7 +29,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/csi-driver-registrar/openshift-csi-driver-registrar-release-4.1.yaml b/ci-operator/config/openshift/csi-driver-registrar/openshift-csi-driver-registrar-release-4.1.yaml index 0c3de10d8b62d..24a02a0e47580 100644 --- a/ci-operator/config/openshift/csi-driver-registrar/openshift-csi-driver-registrar-release-4.1.yaml +++ b/ci-operator/config/openshift/csi-driver-registrar/openshift-csi-driver-registrar-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -31,7 +29,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/csi-external-attacher/openshift-csi-external-attacher-master.yaml b/ci-operator/config/openshift/csi-external-attacher/openshift-csi-external-attacher-master.yaml index 1cd748dc236d3..44d390b763b6e 100644 --- a/ci-operator/config/openshift/csi-external-attacher/openshift-csi-external-attacher-master.yaml +++ b/ci-operator/config/openshift/csi-external-attacher/openshift-csi-external-attacher-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -31,7 +29,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/csi-external-attacher/openshift-csi-external-attacher-release-4.1.yaml b/ci-operator/config/openshift/csi-external-attacher/openshift-csi-external-attacher-release-4.1.yaml index 0c4335663798a..a29d1706866da 100644 --- a/ci-operator/config/openshift/csi-external-attacher/openshift-csi-external-attacher-release-4.1.yaml +++ b/ci-operator/config/openshift/csi-external-attacher/openshift-csi-external-attacher-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -31,7 +29,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/csi-external-attacher/openshift-csi-external-attacher-release-4.2.yaml b/ci-operator/config/openshift/csi-external-attacher/openshift-csi-external-attacher-release-4.2.yaml index c4fb506e9b3b5..349628ed7189d 100644 --- a/ci-operator/config/openshift/csi-external-attacher/openshift-csi-external-attacher-release-4.2.yaml +++ b/ci-operator/config/openshift/csi-external-attacher/openshift-csi-external-attacher-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.11 @@ -31,7 +29,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/csi-external-attacher/openshift-csi-external-attacher-release-4.3.yaml b/ci-operator/config/openshift/csi-external-attacher/openshift-csi-external-attacher-release-4.3.yaml index 241f59a44ef4c..14d106203b729 100644 --- a/ci-operator/config/openshift/csi-external-attacher/openshift-csi-external-attacher-release-4.3.yaml +++ b/ci-operator/config/openshift/csi-external-attacher/openshift-csi-external-attacher-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -32,7 +30,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/csi-external-attacher/openshift-csi-external-attacher-release-4.4.yaml b/ci-operator/config/openshift/csi-external-attacher/openshift-csi-external-attacher-release-4.4.yaml index 6079dc4c349ef..f6cc48965418f 100644 --- a/ci-operator/config/openshift/csi-external-attacher/openshift-csi-external-attacher-release-4.4.yaml +++ b/ci-operator/config/openshift/csi-external-attacher/openshift-csi-external-attacher-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -31,7 +29,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/csi-external-provisioner/openshift-csi-external-provisioner-master.yaml b/ci-operator/config/openshift/csi-external-provisioner/openshift-csi-external-provisioner-master.yaml index ffeab93875a38..070659aa0c7e9 100644 --- a/ci-operator/config/openshift/csi-external-provisioner/openshift-csi-external-provisioner-master.yaml +++ b/ci-operator/config/openshift/csi-external-provisioner/openshift-csi-external-provisioner-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -31,7 +29,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/csi-external-provisioner/openshift-csi-external-provisioner-release-4.1.yaml b/ci-operator/config/openshift/csi-external-provisioner/openshift-csi-external-provisioner-release-4.1.yaml index 663cfcc4b5376..ef5ceaa006bf1 100644 --- a/ci-operator/config/openshift/csi-external-provisioner/openshift-csi-external-provisioner-release-4.1.yaml +++ b/ci-operator/config/openshift/csi-external-provisioner/openshift-csi-external-provisioner-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -31,7 +29,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/csi-external-provisioner/openshift-csi-external-provisioner-release-4.2.yaml b/ci-operator/config/openshift/csi-external-provisioner/openshift-csi-external-provisioner-release-4.2.yaml index 165ccf481354f..acc43bb2ddb72 100644 --- a/ci-operator/config/openshift/csi-external-provisioner/openshift-csi-external-provisioner-release-4.2.yaml +++ b/ci-operator/config/openshift/csi-external-provisioner/openshift-csi-external-provisioner-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.11 @@ -31,7 +29,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/csi-external-provisioner/openshift-csi-external-provisioner-release-4.3.yaml b/ci-operator/config/openshift/csi-external-provisioner/openshift-csi-external-provisioner-release-4.3.yaml index 9ff17ee6b953e..a2e3e40931390 100644 --- a/ci-operator/config/openshift/csi-external-provisioner/openshift-csi-external-provisioner-release-4.3.yaml +++ b/ci-operator/config/openshift/csi-external-provisioner/openshift-csi-external-provisioner-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -32,7 +30,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/csi-external-provisioner/openshift-csi-external-provisioner-release-4.4.yaml b/ci-operator/config/openshift/csi-external-provisioner/openshift-csi-external-provisioner-release-4.4.yaml index 51b2b68bbfa0b..450b0742d1666 100644 --- a/ci-operator/config/openshift/csi-external-provisioner/openshift-csi-external-provisioner-release-4.4.yaml +++ b/ci-operator/config/openshift/csi-external-provisioner/openshift-csi-external-provisioner-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -31,7 +29,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/csi-external-resizer/openshift-csi-external-resizer-master.yaml b/ci-operator/config/openshift/csi-external-resizer/openshift-csi-external-resizer-master.yaml index cb4ac7137f28a..e6793d277bd81 100644 --- a/ci-operator/config/openshift/csi-external-resizer/openshift-csi-external-resizer-master.yaml +++ b/ci-operator/config/openshift/csi-external-resizer/openshift-csi-external-resizer-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -20,6 +18,10 @@ images: - "0" paths: null to: csi-external-resizer +# No images, it's not to be released in OCP yet +#promotion: +# name: "4.2" +# namespace: ocp resources: '*': limits: @@ -28,7 +30,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/csi-external-snapshotter/openshift-csi-external-snapshotter-master.yaml b/ci-operator/config/openshift/csi-external-snapshotter/openshift-csi-external-snapshotter-master.yaml index d545f26d5cfa8..955f909d64631 100644 --- a/ci-operator/config/openshift/csi-external-snapshotter/openshift-csi-external-snapshotter-master.yaml +++ b/ci-operator/config/openshift/csi-external-snapshotter/openshift-csi-external-snapshotter-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -31,7 +29,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/csi-external-snapshotter/openshift-csi-external-snapshotter-release-4.1.yaml b/ci-operator/config/openshift/csi-external-snapshotter/openshift-csi-external-snapshotter-release-4.1.yaml index 5c17a67c50247..28ae31298bded 100644 --- a/ci-operator/config/openshift/csi-external-snapshotter/openshift-csi-external-snapshotter-release-4.1.yaml +++ b/ci-operator/config/openshift/csi-external-snapshotter/openshift-csi-external-snapshotter-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.11 @@ -22,7 +20,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/csi-external-snapshotter/openshift-csi-external-snapshotter-release-4.2.yaml b/ci-operator/config/openshift/csi-external-snapshotter/openshift-csi-external-snapshotter-release-4.2.yaml index 982111f459b30..93877a2ce0c5a 100644 --- a/ci-operator/config/openshift/csi-external-snapshotter/openshift-csi-external-snapshotter-release-4.2.yaml +++ b/ci-operator/config/openshift/csi-external-snapshotter/openshift-csi-external-snapshotter-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.11 @@ -31,7 +29,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/csi-external-snapshotter/openshift-csi-external-snapshotter-release-4.3.yaml b/ci-operator/config/openshift/csi-external-snapshotter/openshift-csi-external-snapshotter-release-4.3.yaml index 3d3335a43802f..df0a42eedb240 100644 --- a/ci-operator/config/openshift/csi-external-snapshotter/openshift-csi-external-snapshotter-release-4.3.yaml +++ b/ci-operator/config/openshift/csi-external-snapshotter/openshift-csi-external-snapshotter-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -32,7 +30,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/csi-external-snapshotter/openshift-csi-external-snapshotter-release-4.4.yaml b/ci-operator/config/openshift/csi-external-snapshotter/openshift-csi-external-snapshotter-release-4.4.yaml index 3c840b13155a3..d983f870663f2 100644 --- a/ci-operator/config/openshift/csi-external-snapshotter/openshift-csi-external-snapshotter-release-4.4.yaml +++ b/ci-operator/config/openshift/csi-external-snapshotter/openshift-csi-external-snapshotter-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -31,7 +29,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/csi-livenessprobe/openshift-csi-livenessprobe-master.yaml b/ci-operator/config/openshift/csi-livenessprobe/openshift-csi-livenessprobe-master.yaml index 084652f7c40bf..7f1c709941b9f 100644 --- a/ci-operator/config/openshift/csi-livenessprobe/openshift-csi-livenessprobe-master.yaml +++ b/ci-operator/config/openshift/csi-livenessprobe/openshift-csi-livenessprobe-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -31,7 +29,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/csi-livenessprobe/openshift-csi-livenessprobe-release-4.1.yaml b/ci-operator/config/openshift/csi-livenessprobe/openshift-csi-livenessprobe-release-4.1.yaml index a8b01f9713064..fe35e973afcf7 100644 --- a/ci-operator/config/openshift/csi-livenessprobe/openshift-csi-livenessprobe-release-4.1.yaml +++ b/ci-operator/config/openshift/csi-livenessprobe/openshift-csi-livenessprobe-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -31,7 +29,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/csi-livenessprobe/openshift-csi-livenessprobe-release-4.2.yaml b/ci-operator/config/openshift/csi-livenessprobe/openshift-csi-livenessprobe-release-4.2.yaml index 561095480c9e7..3121d53511b35 100644 --- a/ci-operator/config/openshift/csi-livenessprobe/openshift-csi-livenessprobe-release-4.2.yaml +++ b/ci-operator/config/openshift/csi-livenessprobe/openshift-csi-livenessprobe-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.11 @@ -31,7 +29,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/csi-livenessprobe/openshift-csi-livenessprobe-release-4.3.yaml b/ci-operator/config/openshift/csi-livenessprobe/openshift-csi-livenessprobe-release-4.3.yaml index 1755b086def8e..5da7e0c388c8b 100644 --- a/ci-operator/config/openshift/csi-livenessprobe/openshift-csi-livenessprobe-release-4.3.yaml +++ b/ci-operator/config/openshift/csi-livenessprobe/openshift-csi-livenessprobe-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -32,7 +30,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/csi-livenessprobe/openshift-csi-livenessprobe-release-4.4.yaml b/ci-operator/config/openshift/csi-livenessprobe/openshift-csi-livenessprobe-release-4.4.yaml index 284849aca1ff8..0b9f1404dcb96 100644 --- a/ci-operator/config/openshift/csi-livenessprobe/openshift-csi-livenessprobe-release-4.4.yaml +++ b/ci-operator/config/openshift/csi-livenessprobe/openshift-csi-livenessprobe-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -31,7 +29,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/csi-node-driver-registrar/openshift-csi-node-driver-registrar-master.yaml b/ci-operator/config/openshift/csi-node-driver-registrar/openshift-csi-node-driver-registrar-master.yaml index ba0fdb2673239..300e08407cfca 100644 --- a/ci-operator/config/openshift/csi-node-driver-registrar/openshift-csi-node-driver-registrar-master.yaml +++ b/ci-operator/config/openshift/csi-node-driver-registrar/openshift-csi-node-driver-registrar-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -31,7 +29,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/csi-node-driver-registrar/openshift-csi-node-driver-registrar-release-4.1.yaml b/ci-operator/config/openshift/csi-node-driver-registrar/openshift-csi-node-driver-registrar-release-4.1.yaml index 9b726b46fbaaa..684added530ee 100644 --- a/ci-operator/config/openshift/csi-node-driver-registrar/openshift-csi-node-driver-registrar-release-4.1.yaml +++ b/ci-operator/config/openshift/csi-node-driver-registrar/openshift-csi-node-driver-registrar-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.11 @@ -22,7 +20,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/csi-node-driver-registrar/openshift-csi-node-driver-registrar-release-4.2.yaml b/ci-operator/config/openshift/csi-node-driver-registrar/openshift-csi-node-driver-registrar-release-4.2.yaml index 3989d2c808904..4d57aa1496c0a 100644 --- a/ci-operator/config/openshift/csi-node-driver-registrar/openshift-csi-node-driver-registrar-release-4.2.yaml +++ b/ci-operator/config/openshift/csi-node-driver-registrar/openshift-csi-node-driver-registrar-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.11 @@ -31,7 +29,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/csi-node-driver-registrar/openshift-csi-node-driver-registrar-release-4.3.yaml b/ci-operator/config/openshift/csi-node-driver-registrar/openshift-csi-node-driver-registrar-release-4.3.yaml index 56b6d97560be5..f27edbe5318bc 100644 --- a/ci-operator/config/openshift/csi-node-driver-registrar/openshift-csi-node-driver-registrar-release-4.3.yaml +++ b/ci-operator/config/openshift/csi-node-driver-registrar/openshift-csi-node-driver-registrar-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -32,7 +30,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/csi-node-driver-registrar/openshift-csi-node-driver-registrar-release-4.4.yaml b/ci-operator/config/openshift/csi-node-driver-registrar/openshift-csi-node-driver-registrar-release-4.4.yaml index 6dee97ced6404..5cd94b5cefefa 100644 --- a/ci-operator/config/openshift/csi-node-driver-registrar/openshift-csi-node-driver-registrar-release-4.4.yaml +++ b/ci-operator/config/openshift/csi-node-driver-registrar/openshift-csi-node-driver-registrar-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -31,7 +29,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/csi-operator/openshift-csi-operator-master.yaml b/ci-operator/config/openshift/csi-operator/openshift-csi-operator-master.yaml index 6ad01e0d615d1..cdf0488128b07 100644 --- a/ci-operator/config/openshift/csi-operator/openshift-csi-operator-master.yaml +++ b/ci-operator/config/openshift/csi-operator/openshift-csi-operator-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -21,7 +19,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/csi-operator/openshift-csi-operator-release-4.1.yaml b/ci-operator/config/openshift/csi-operator/openshift-csi-operator-release-4.1.yaml index 613bad64b959d..29483de12aec0 100644 --- a/ci-operator/config/openshift/csi-operator/openshift-csi-operator-release-4.1.yaml +++ b/ci-operator/config/openshift/csi-operator/openshift-csi-operator-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -21,7 +19,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/csi-operator/openshift-csi-operator-release-4.2.yaml b/ci-operator/config/openshift/csi-operator/openshift-csi-operator-release-4.2.yaml index 22b5357d81544..9edc0ac34aced 100644 --- a/ci-operator/config/openshift/csi-operator/openshift-csi-operator-release-4.2.yaml +++ b/ci-operator/config/openshift/csi-operator/openshift-csi-operator-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -21,7 +19,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/csi-operator/openshift-csi-operator-release-4.3.yaml b/ci-operator/config/openshift/csi-operator/openshift-csi-operator-release-4.3.yaml index d1dd5d7190dbf..be45cf587ee44 100644 --- a/ci-operator/config/openshift/csi-operator/openshift-csi-operator-release-4.3.yaml +++ b/ci-operator/config/openshift/csi-operator/openshift-csi-operator-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -22,7 +20,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/csi-operator/openshift-csi-operator-release-4.4.yaml b/ci-operator/config/openshift/csi-operator/openshift-csi-operator-release-4.4.yaml index f6de22ddb2660..9f5ab30746474 100644 --- a/ci-operator/config/openshift/csi-operator/openshift-csi-operator-release-4.4.yaml +++ b/ci-operator/config/openshift/csi-operator/openshift-csi-operator-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -21,7 +19,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/custom-resource-status/openshift-custom-resource-status-master.yaml b/ci-operator/config/openshift/custom-resource-status/openshift-custom-resource-status-master.yaml index f9e646fc8eea2..767f930c3e1e9 100644 --- a/ci-operator/config/openshift/custom-resource-status/openshift-custom-resource-status-master.yaml +++ b/ci-operator/config/openshift/custom-resource-status/openshift-custom-resource-status-master.yaml @@ -1,8 +1,7 @@ build_root: image_stream_tag: - cluster: https://api.ci.openshift.org - name: release namespace: openshift + name: release tag: golang-1.12 resources: '*': diff --git a/ci-operator/config/openshift/deadmanssnitch-operator/openshift-deadmanssnitch-operator-master.yaml b/ci-operator/config/openshift/deadmanssnitch-operator/openshift-deadmanssnitch-operator-master.yaml index 9567f3c2fa83b..54b1d31fdffcd 100644 --- a/ci-operator/config/openshift/deadmanssnitch-operator/openshift-deadmanssnitch-operator-master.yaml +++ b/ci-operator/config/openshift/deadmanssnitch-operator/openshift-deadmanssnitch-operator-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,6 +23,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp diff --git a/ci-operator/config/openshift/deadmanssnitch-operator/openshift-deadmanssnitch-operator-release-4.1.yaml b/ci-operator/config/openshift/deadmanssnitch-operator/openshift-deadmanssnitch-operator-release-4.1.yaml index 8713c01d14625..14c928673fd7c 100644 --- a/ci-operator/config/openshift/deadmanssnitch-operator/openshift-deadmanssnitch-operator-release-4.1.yaml +++ b/ci-operator/config/openshift/deadmanssnitch-operator/openshift-deadmanssnitch-operator-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,6 +23,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp diff --git a/ci-operator/config/openshift/deadmanssnitch-operator/openshift-deadmanssnitch-operator-release-4.2.yaml b/ci-operator/config/openshift/deadmanssnitch-operator/openshift-deadmanssnitch-operator-release-4.2.yaml index f6532becebb06..8d85467078a80 100644 --- a/ci-operator/config/openshift/deadmanssnitch-operator/openshift-deadmanssnitch-operator-release-4.2.yaml +++ b/ci-operator/config/openshift/deadmanssnitch-operator/openshift-deadmanssnitch-operator-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,6 +23,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp diff --git a/ci-operator/config/openshift/deadmanssnitch-operator/openshift-deadmanssnitch-operator-release-4.3.yaml b/ci-operator/config/openshift/deadmanssnitch-operator/openshift-deadmanssnitch-operator-release-4.3.yaml index c833244f89990..6353800010798 100644 --- a/ci-operator/config/openshift/deadmanssnitch-operator/openshift-deadmanssnitch-operator-release-4.3.yaml +++ b/ci-operator/config/openshift/deadmanssnitch-operator/openshift-deadmanssnitch-operator-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -26,6 +24,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp diff --git a/ci-operator/config/openshift/deadmanssnitch-operator/openshift-deadmanssnitch-operator-release-4.4.yaml b/ci-operator/config/openshift/deadmanssnitch-operator/openshift-deadmanssnitch-operator-release-4.4.yaml index 811876c37f0fc..e66bc8165d69f 100644 --- a/ci-operator/config/openshift/deadmanssnitch-operator/openshift-deadmanssnitch-operator-release-4.4.yaml +++ b/ci-operator/config/openshift/deadmanssnitch-operator/openshift-deadmanssnitch-operator-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,6 +23,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp diff --git a/ci-operator/config/openshift/dedicated-admin-operator/openshift-dedicated-admin-operator-master.yaml b/ci-operator/config/openshift/dedicated-admin-operator/openshift-dedicated-admin-operator-master.yaml index e29e8d16baa69..94a0614c796ca 100644 --- a/ci-operator/config/openshift/dedicated-admin-operator/openshift-dedicated-admin-operator-master.yaml +++ b/ci-operator/config/openshift/dedicated-admin-operator/openshift-dedicated-admin-operator-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,6 +23,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp diff --git a/ci-operator/config/openshift/dedicated-admin-operator/openshift-dedicated-admin-operator-release-4.1.yaml b/ci-operator/config/openshift/dedicated-admin-operator/openshift-dedicated-admin-operator-release-4.1.yaml index c3df185f1df9a..29c75808ffbc9 100644 --- a/ci-operator/config/openshift/dedicated-admin-operator/openshift-dedicated-admin-operator-release-4.1.yaml +++ b/ci-operator/config/openshift/dedicated-admin-operator/openshift-dedicated-admin-operator-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,6 +23,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp diff --git a/ci-operator/config/openshift/dedicated-admin-operator/openshift-dedicated-admin-operator-release-4.2.yaml b/ci-operator/config/openshift/dedicated-admin-operator/openshift-dedicated-admin-operator-release-4.2.yaml index 43cc68966f1d5..7f99e5396147c 100644 --- a/ci-operator/config/openshift/dedicated-admin-operator/openshift-dedicated-admin-operator-release-4.2.yaml +++ b/ci-operator/config/openshift/dedicated-admin-operator/openshift-dedicated-admin-operator-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,6 +23,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp diff --git a/ci-operator/config/openshift/dedicated-admin-operator/openshift-dedicated-admin-operator-release-4.3.yaml b/ci-operator/config/openshift/dedicated-admin-operator/openshift-dedicated-admin-operator-release-4.3.yaml index 4ddf7db13e43a..506a2f89e224c 100644 --- a/ci-operator/config/openshift/dedicated-admin-operator/openshift-dedicated-admin-operator-release-4.3.yaml +++ b/ci-operator/config/openshift/dedicated-admin-operator/openshift-dedicated-admin-operator-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -26,6 +24,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp diff --git a/ci-operator/config/openshift/dedicated-admin-operator/openshift-dedicated-admin-operator-release-4.4.yaml b/ci-operator/config/openshift/dedicated-admin-operator/openshift-dedicated-admin-operator-release-4.4.yaml index 9b463eb2facdf..5a1fa1d7fa7ff 100644 --- a/ci-operator/config/openshift/dedicated-admin-operator/openshift-dedicated-admin-operator-release-4.4.yaml +++ b/ci-operator/config/openshift/dedicated-admin-operator/openshift-dedicated-admin-operator-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,6 +23,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp diff --git a/ci-operator/config/openshift/descheduler-operator/openshift-descheduler-operator-master.yaml b/ci-operator/config/openshift/descheduler-operator/openshift-descheduler-operator-master.yaml index 208b052b3df81..6cae3aac32f8e 100644 --- a/ci-operator/config/openshift/descheduler-operator/openshift-descheduler-operator-master.yaml +++ b/ci-operator/config/openshift/descheduler-operator/openshift-descheduler-operator-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/descheduler-operator/openshift-descheduler-operator-release-4.1.yaml b/ci-operator/config/openshift/descheduler-operator/openshift-descheduler-operator-release-4.1.yaml index 6dded0a2fdd5e..98cd86b2be989 100644 --- a/ci-operator/config/openshift/descheduler-operator/openshift-descheduler-operator-release-4.1.yaml +++ b/ci-operator/config/openshift/descheduler-operator/openshift-descheduler-operator-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/descheduler-operator/openshift-descheduler-operator-release-4.2.yaml b/ci-operator/config/openshift/descheduler-operator/openshift-descheduler-operator-release-4.2.yaml index 9291d49df1a82..c024cfe7624ec 100644 --- a/ci-operator/config/openshift/descheduler-operator/openshift-descheduler-operator-release-4.2.yaml +++ b/ci-operator/config/openshift/descheduler-operator/openshift-descheduler-operator-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/descheduler-operator/openshift-descheduler-operator-release-4.3.yaml b/ci-operator/config/openshift/descheduler-operator/openshift-descheduler-operator-release-4.3.yaml index 76a4ce7933cfd..e27b5b1479a7c 100644 --- a/ci-operator/config/openshift/descheduler-operator/openshift-descheduler-operator-release-4.3.yaml +++ b/ci-operator/config/openshift/descheduler-operator/openshift-descheduler-operator-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/descheduler-operator/openshift-descheduler-operator-release-4.4.yaml b/ci-operator/config/openshift/descheduler-operator/openshift-descheduler-operator-release-4.4.yaml index e9863e72179ab..cbd9db27eb897 100644 --- a/ci-operator/config/openshift/descheduler-operator/openshift-descheduler-operator-release-4.4.yaml +++ b/ci-operator/config/openshift/descheduler-operator/openshift-descheduler-operator-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/descheduler/openshift-descheduler-master.yaml b/ci-operator/config/openshift/descheduler/openshift-descheduler-master.yaml index 601e7f36bfa9f..20b2f6bd541e2 100644 --- a/ci-operator/config/openshift/descheduler/openshift-descheduler-master.yaml +++ b/ci-operator/config/openshift/descheduler/openshift-descheduler-master.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base binary_build_commands: make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -27,7 +25,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp test_binary_build_commands: OS_GOFLAGS='-race' make build diff --git a/ci-operator/config/openshift/descheduler/openshift-descheduler-release-3.10.yaml b/ci-operator/config/openshift/descheduler/openshift-descheduler-release-3.10.yaml index b5aafeb22aa90..b90a530226e8a 100644 --- a/ci-operator/config/openshift/descheduler/openshift-descheduler-release-3.10.yaml +++ b/ci-operator/config/openshift/descheduler/openshift-descheduler-release-3.10.yaml @@ -4,12 +4,6 @@ base_rpm_images: namespace: openshift tag: base binary_build_commands: make build -build_root: - image_stream_tag: - cluster: https://api.ci.openshift.org - name: release - namespace: openshift - tag: golang-1.9 canonical_go_repository: github.com/kubernetes-incubator/descheduler images: - context_dir: images/descheduler/ @@ -25,9 +19,15 @@ resources: memory: 200Mi rpm_build_commands: make build-rpms tag_specification: - cluster: https://api.ci.openshift.org name: origin-v3.10 namespace: openshift + tag: '' + tag_overrides: {} +build_root: + image_stream_tag: + name: release + namespace: openshift + tag: golang-1.9 test_binary_build_commands: OS_GOFLAGS='-race' make build tests: - as: unit diff --git a/ci-operator/config/openshift/descheduler/openshift-descheduler-release-3.11.yaml b/ci-operator/config/openshift/descheduler/openshift-descheduler-release-3.11.yaml index 8f132ef1b554d..b892b6cfe5fa3 100644 --- a/ci-operator/config/openshift/descheduler/openshift-descheduler-release-3.11.yaml +++ b/ci-operator/config/openshift/descheduler/openshift-descheduler-release-3.11.yaml @@ -4,12 +4,6 @@ base_rpm_images: namespace: openshift tag: base binary_build_commands: make build -build_root: - image_stream_tag: - cluster: https://api.ci.openshift.org - name: release - namespace: openshift - tag: golang-1.10 canonical_go_repository: github.com/kubernetes-incubator/descheduler images: - context_dir: images/descheduler/ @@ -25,9 +19,15 @@ resources: memory: 200Mi rpm_build_commands: make build-rpms tag_specification: - cluster: https://api.ci.openshift.org name: origin-v3.11 namespace: openshift + tag: '' + tag_overrides: {} +build_root: + image_stream_tag: + name: release + namespace: openshift + tag: golang-1.10 test_binary_build_commands: OS_GOFLAGS='-race' make build tests: - as: unit diff --git a/ci-operator/config/openshift/descheduler/openshift-descheduler-release-4.1.yaml b/ci-operator/config/openshift/descheduler/openshift-descheduler-release-4.1.yaml index 663d6e716ded9..8f4c15b7bdb8a 100644 --- a/ci-operator/config/openshift/descheduler/openshift-descheduler-release-4.1.yaml +++ b/ci-operator/config/openshift/descheduler/openshift-descheduler-release-4.1.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base binary_build_commands: make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -27,7 +25,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp test_binary_build_commands: OS_GOFLAGS='-race' make build diff --git a/ci-operator/config/openshift/descheduler/openshift-descheduler-release-4.2.yaml b/ci-operator/config/openshift/descheduler/openshift-descheduler-release-4.2.yaml index 99e912007ebd9..e9b514b723b79 100644 --- a/ci-operator/config/openshift/descheduler/openshift-descheduler-release-4.2.yaml +++ b/ci-operator/config/openshift/descheduler/openshift-descheduler-release-4.2.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base binary_build_commands: make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -27,7 +25,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp test_binary_build_commands: OS_GOFLAGS='-race' make build diff --git a/ci-operator/config/openshift/descheduler/openshift-descheduler-release-4.3.yaml b/ci-operator/config/openshift/descheduler/openshift-descheduler-release-4.3.yaml index 2179664e564b4..71f53f39f54a0 100644 --- a/ci-operator/config/openshift/descheduler/openshift-descheduler-release-4.3.yaml +++ b/ci-operator/config/openshift/descheduler/openshift-descheduler-release-4.3.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base binary_build_commands: make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -28,7 +26,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp test_binary_build_commands: OS_GOFLAGS='-race' make build diff --git a/ci-operator/config/openshift/descheduler/openshift-descheduler-release-4.4.yaml b/ci-operator/config/openshift/descheduler/openshift-descheduler-release-4.4.yaml index 9df1d5b394b59..1b333fbe827a1 100644 --- a/ci-operator/config/openshift/descheduler/openshift-descheduler-release-4.4.yaml +++ b/ci-operator/config/openshift/descheduler/openshift-descheduler-release-4.4.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base binary_build_commands: make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -27,7 +25,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp test_binary_build_commands: OS_GOFLAGS='-race' make build diff --git a/ci-operator/config/openshift/elasticsearch-operator/openshift-elasticsearch-operator-master.yaml b/ci-operator/config/openshift/elasticsearch-operator/openshift-elasticsearch-operator-master.yaml index 5f6b905b8911b..5f9cdd3430cfe 100644 --- a/ci-operator/config/openshift/elasticsearch-operator/openshift-elasticsearch-operator-master.yaml +++ b/ci-operator/config/openshift/elasticsearch-operator/openshift-elasticsearch-operator-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -24,7 +22,6 @@ resources: cpu: 200m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/elasticsearch-operator/openshift-elasticsearch-operator-release-4.1.yaml b/ci-operator/config/openshift/elasticsearch-operator/openshift-elasticsearch-operator-release-4.1.yaml index f240affacff56..bbd22b006feca 100644 --- a/ci-operator/config/openshift/elasticsearch-operator/openshift-elasticsearch-operator-release-4.1.yaml +++ b/ci-operator/config/openshift/elasticsearch-operator/openshift-elasticsearch-operator-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -24,7 +22,6 @@ resources: cpu: 200m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/elasticsearch-operator/openshift-elasticsearch-operator-release-4.2.yaml b/ci-operator/config/openshift/elasticsearch-operator/openshift-elasticsearch-operator-release-4.2.yaml index 4d03c6f8c63b0..1fec029e9080b 100644 --- a/ci-operator/config/openshift/elasticsearch-operator/openshift-elasticsearch-operator-release-4.2.yaml +++ b/ci-operator/config/openshift/elasticsearch-operator/openshift-elasticsearch-operator-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -24,7 +22,6 @@ resources: cpu: 200m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/elasticsearch-operator/openshift-elasticsearch-operator-release-4.3.yaml b/ci-operator/config/openshift/elasticsearch-operator/openshift-elasticsearch-operator-release-4.3.yaml index a629dc0839063..552f45e03eed9 100644 --- a/ci-operator/config/openshift/elasticsearch-operator/openshift-elasticsearch-operator-release-4.3.yaml +++ b/ci-operator/config/openshift/elasticsearch-operator/openshift-elasticsearch-operator-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,7 +23,6 @@ resources: cpu: 200m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/elasticsearch-operator/openshift-elasticsearch-operator-release-4.4.yaml b/ci-operator/config/openshift/elasticsearch-operator/openshift-elasticsearch-operator-release-4.4.yaml index 4742ead1a6726..80eab22212d0e 100644 --- a/ci-operator/config/openshift/elasticsearch-operator/openshift-elasticsearch-operator-release-4.4.yaml +++ b/ci-operator/config/openshift/elasticsearch-operator/openshift-elasticsearch-operator-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -24,7 +22,6 @@ resources: cpu: 200m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/elasticsearch-proxy/openshift-elasticsearch-proxy-master.yaml b/ci-operator/config/openshift/elasticsearch-proxy/openshift-elasticsearch-proxy-master.yaml index 8c86bd9e8afba..7143541b6e760 100644 --- a/ci-operator/config/openshift/elasticsearch-proxy/openshift-elasticsearch-proxy-master.yaml +++ b/ci-operator/config/openshift/elasticsearch-proxy/openshift-elasticsearch-proxy-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -24,7 +22,6 @@ resources: cpu: 200m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/etcd/openshift-etcd-openshift-4.1.yaml b/ci-operator/config/openshift/etcd/openshift-etcd-openshift-4.1.yaml index a4794269ee93b..762da1f86abca 100644 --- a/ci-operator/config/openshift/etcd/openshift-etcd-openshift-4.1.yaml +++ b/ci-operator/config/openshift/etcd/openshift-etcd-openshift-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -26,7 +24,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/etcd/openshift-etcd-openshift-4.2.yaml b/ci-operator/config/openshift/etcd/openshift-etcd-openshift-4.2.yaml index 43192b56e57f9..57d01a4399542 100644 --- a/ci-operator/config/openshift/etcd/openshift-etcd-openshift-4.2.yaml +++ b/ci-operator/config/openshift/etcd/openshift-etcd-openshift-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.11 @@ -26,7 +24,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/etcd/openshift-etcd-openshift-4.3.yaml b/ci-operator/config/openshift/etcd/openshift-etcd-openshift-4.3.yaml index 3afd586879861..04caf2aa6319a 100644 --- a/ci-operator/config/openshift/etcd/openshift-etcd-openshift-4.3.yaml +++ b/ci-operator/config/openshift/etcd/openshift-etcd-openshift-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/etcd/openshift-etcd-openshift-4.4.yaml b/ci-operator/config/openshift/etcd/openshift-etcd-openshift-4.4.yaml index 9e87a4fab5a0a..50353cf5c54ae 100644 --- a/ci-operator/config/openshift/etcd/openshift-etcd-openshift-4.4.yaml +++ b/ci-operator/config/openshift/etcd/openshift-etcd-openshift-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/external-storage/openshift-external-storage-master.yaml b/ci-operator/config/openshift/external-storage/openshift-external-storage-master.yaml index ee39b5c8dc1fa..2ac73b1649aca 100644 --- a/ci-operator/config/openshift/external-storage/openshift-external-storage-master.yaml +++ b/ci-operator/config/openshift/external-storage/openshift-external-storage-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.11 @@ -39,7 +37,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/external-storage/openshift-external-storage-release-4.1.yaml b/ci-operator/config/openshift/external-storage/openshift-external-storage-release-4.1.yaml index ca9872c62132c..d61441aa3fc6d 100644 --- a/ci-operator/config/openshift/external-storage/openshift-external-storage-release-4.1.yaml +++ b/ci-operator/config/openshift/external-storage/openshift-external-storage-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.11 @@ -39,7 +37,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/external-storage/openshift-external-storage-release-4.2.yaml b/ci-operator/config/openshift/external-storage/openshift-external-storage-release-4.2.yaml index 49d39618ae0c8..580d4c045a9f6 100644 --- a/ci-operator/config/openshift/external-storage/openshift-external-storage-release-4.2.yaml +++ b/ci-operator/config/openshift/external-storage/openshift-external-storage-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.11 @@ -39,7 +37,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/external-storage/openshift-external-storage-release-4.3.yaml b/ci-operator/config/openshift/external-storage/openshift-external-storage-release-4.3.yaml index 9ac9015f2b367..fa194d7956ab9 100644 --- a/ci-operator/config/openshift/external-storage/openshift-external-storage-release-4.3.yaml +++ b/ci-operator/config/openshift/external-storage/openshift-external-storage-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.11 @@ -40,7 +38,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/external-storage/openshift-external-storage-release-4.4.yaml b/ci-operator/config/openshift/external-storage/openshift-external-storage-release-4.4.yaml index 5a20a900d2e83..71ca87afd80df 100644 --- a/ci-operator/config/openshift/external-storage/openshift-external-storage-release-4.4.yaml +++ b/ci-operator/config/openshift/external-storage/openshift-external-storage-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.11 @@ -39,7 +37,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/federation-v2-operator/openshift-federation-v2-operator-master.yaml b/ci-operator/config/openshift/federation-v2-operator/openshift-federation-v2-operator-master.yaml index 3e15fe8b1e7d3..00c623a590022 100644 --- a/ci-operator/config/openshift/federation-v2-operator/openshift-federation-v2-operator-master.yaml +++ b/ci-operator/config/openshift/federation-v2-operator/openshift-federation-v2-operator-master.yaml @@ -1,6 +1,5 @@ build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -19,7 +18,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/federation-v2-operator/openshift-federation-v2-operator-release-4.1.yaml b/ci-operator/config/openshift/federation-v2-operator/openshift-federation-v2-operator-release-4.1.yaml index c85420ce7bc49..8827cf54435d6 100644 --- a/ci-operator/config/openshift/federation-v2-operator/openshift-federation-v2-operator-release-4.1.yaml +++ b/ci-operator/config/openshift/federation-v2-operator/openshift-federation-v2-operator-release-4.1.yaml @@ -1,6 +1,5 @@ build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -19,7 +18,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/federation-v2-operator/openshift-federation-v2-operator-release-4.2.yaml b/ci-operator/config/openshift/federation-v2-operator/openshift-federation-v2-operator-release-4.2.yaml index d989ddaded814..3760307fe4039 100644 --- a/ci-operator/config/openshift/federation-v2-operator/openshift-federation-v2-operator-release-4.2.yaml +++ b/ci-operator/config/openshift/federation-v2-operator/openshift-federation-v2-operator-release-4.2.yaml @@ -1,6 +1,5 @@ build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -19,7 +18,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/federation-v2-operator/openshift-federation-v2-operator-release-4.3.yaml b/ci-operator/config/openshift/federation-v2-operator/openshift-federation-v2-operator-release-4.3.yaml index d809ffab61007..f6bb040793a10 100644 --- a/ci-operator/config/openshift/federation-v2-operator/openshift-federation-v2-operator-release-4.3.yaml +++ b/ci-operator/config/openshift/federation-v2-operator/openshift-federation-v2-operator-release-4.3.yaml @@ -1,6 +1,5 @@ build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -20,7 +19,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/federation-v2-operator/openshift-federation-v2-operator-release-4.4.yaml b/ci-operator/config/openshift/federation-v2-operator/openshift-federation-v2-operator-release-4.4.yaml index 90b611498812a..1a54f511732ed 100644 --- a/ci-operator/config/openshift/federation-v2-operator/openshift-federation-v2-operator-release-4.4.yaml +++ b/ci-operator/config/openshift/federation-v2-operator/openshift-federation-v2-operator-release-4.4.yaml @@ -1,6 +1,5 @@ build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -19,7 +18,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/grafana/openshift-grafana-master.yaml b/ci-operator/config/openshift/grafana/openshift-grafana-master.yaml index 360a73f625081..adf3530e63d90 100644 --- a/ci-operator/config/openshift/grafana/openshift-grafana-master.yaml +++ b/ci-operator/config/openshift/grafana/openshift-grafana-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/grafana/openshift-grafana-release-4.1.yaml b/ci-operator/config/openshift/grafana/openshift-grafana-release-4.1.yaml index 3dc6d2ff33e18..d8057831ae8f6 100644 --- a/ci-operator/config/openshift/grafana/openshift-grafana-release-4.1.yaml +++ b/ci-operator/config/openshift/grafana/openshift-grafana-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/grafana/openshift-grafana-release-4.2.yaml b/ci-operator/config/openshift/grafana/openshift-grafana-release-4.2.yaml index 40669991336ec..fcd334d9ef1a8 100644 --- a/ci-operator/config/openshift/grafana/openshift-grafana-release-4.2.yaml +++ b/ci-operator/config/openshift/grafana/openshift-grafana-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/grafana/openshift-grafana-release-4.3.yaml b/ci-operator/config/openshift/grafana/openshift-grafana-release-4.3.yaml index 3916749ee95a5..dea75e379973e 100644 --- a/ci-operator/config/openshift/grafana/openshift-grafana-release-4.3.yaml +++ b/ci-operator/config/openshift/grafana/openshift-grafana-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/grafana/openshift-grafana-release-4.4.yaml b/ci-operator/config/openshift/grafana/openshift-grafana-release-4.4.yaml index 278ebc2eda5ad..9bb303351d06e 100644 --- a/ci-operator/config/openshift/grafana/openshift-grafana-release-4.4.yaml +++ b/ci-operator/config/openshift/grafana/openshift-grafana-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/hive/openshift-hive-master.yaml b/ci-operator/config/openshift/hive/openshift-hive-master.yaml index e2c9a6d3ecad0..ada28d2cbb83b 100644 --- a/ci-operator/config/openshift/hive/openshift-hive-master.yaml +++ b/ci-operator/config/openshift/hive/openshift-hive-master.yaml @@ -1,13 +1,15 @@ +tag_specification: + name: '4.2' + namespace: ocp +promotion: + name: hive-v4.0 + namespace: openshift base_images: base: - cluster: https://api.ci.openshift.org - name: "4.2" + name: '4.2' namespace: ocp tag: base binary_build_commands: make build -build_root: - project_image: - dockerfile_path: build/build-image/Dockerfile images: - dockerfile_path: Dockerfile.hivebase from: base @@ -20,9 +22,6 @@ images: - hive paths: null to: hive -promotion: - name: hive-v4.0 - namespace: openshift resources: '*': limits: @@ -30,22 +29,21 @@ resources: requests: cpu: 100m memory: 200Mi - integration: - limits: - memory: 4Gi - requests: - cpu: 1000m - memory: 2Gi unit: limits: memory: 8Gi requests: cpu: 1000m memory: 4Gi -tag_specification: - cluster: https://api.ci.openshift.org - name: "4.2" - namespace: ocp + integration: + limits: + memory: 4Gi + requests: + cpu: 1000m + memory: 2Gi +build_root: + project_image: + dockerfile_path: build/build-image/Dockerfile tests: - as: unit commands: make test diff --git a/ci-operator/config/openshift/image-registry/openshift-image-registry-master.yaml b/ci-operator/config/openshift/image-registry/openshift-image-registry-master.yaml index d7bb131180b4a..813438bdf92a6 100644 --- a/ci-operator/config/openshift/image-registry/openshift-image-registry-master.yaml +++ b/ci-operator/config/openshift/image-registry/openshift-image-registry-master.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base binary_build_commands: make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -32,7 +30,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp test_binary_build_commands: OS_GOFLAGS='-race' make build diff --git a/ci-operator/config/openshift/image-registry/openshift-image-registry-release-3.10.yaml b/ci-operator/config/openshift/image-registry/openshift-image-registry-release-3.10.yaml index cdc8442f67a83..1a3c579827e88 100644 --- a/ci-operator/config/openshift/image-registry/openshift-image-registry-release-3.10.yaml +++ b/ci-operator/config/openshift/image-registry/openshift-image-registry-release-3.10.yaml @@ -4,12 +4,6 @@ base_rpm_images: namespace: openshift tag: base binary_build_commands: make build -build_root: - image_stream_tag: - cluster: https://api.ci.openshift.org - name: release - namespace: openshift - tag: golang-1.9 images: - context_dir: images/dockerregistry/ from: base @@ -23,9 +17,15 @@ resources: memory: 200Mi rpm_build_commands: make build-rpms tag_specification: - cluster: https://api.ci.openshift.org name: origin-v3.10 namespace: openshift + tag: '' + tag_overrides: {} +build_root: + image_stream_tag: + name: release + namespace: openshift + tag: golang-1.9 test_binary_build_commands: OS_GOFLAGS='-race' make build tests: - artifact_dir: /tmp/artifacts diff --git a/ci-operator/config/openshift/image-registry/openshift-image-registry-release-3.11.yaml b/ci-operator/config/openshift/image-registry/openshift-image-registry-release-3.11.yaml index 496c300eb69d9..ab89eef030cca 100644 --- a/ci-operator/config/openshift/image-registry/openshift-image-registry-release-3.11.yaml +++ b/ci-operator/config/openshift/image-registry/openshift-image-registry-release-3.11.yaml @@ -4,12 +4,6 @@ base_rpm_images: namespace: openshift tag: base binary_build_commands: make build -build_root: - image_stream_tag: - cluster: https://api.ci.openshift.org - name: release - namespace: openshift - tag: golang-1.10 images: - context_dir: images/dockerregistry/ from: base @@ -29,9 +23,15 @@ resources: memory: 200Mi rpm_build_commands: make build-rpms tag_specification: - cluster: https://api.ci.openshift.org name: origin-v3.11 namespace: openshift + tag: '' + tag_overrides: {} +build_root: + image_stream_tag: + name: release + namespace: openshift + tag: golang-1.10 test_binary_build_commands: OS_GOFLAGS='-race' make build tests: - artifact_dir: /tmp/artifacts diff --git a/ci-operator/config/openshift/image-registry/openshift-image-registry-release-4.1.yaml b/ci-operator/config/openshift/image-registry/openshift-image-registry-release-4.1.yaml index bb73b3c0e8e1a..97980fd458392 100644 --- a/ci-operator/config/openshift/image-registry/openshift-image-registry-release-4.1.yaml +++ b/ci-operator/config/openshift/image-registry/openshift-image-registry-release-4.1.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base binary_build_commands: make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -32,7 +30,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp test_binary_build_commands: OS_GOFLAGS='-race' make build @@ -58,4 +55,4 @@ tests: - as: verify commands: make verify container: - from: src + from: src diff --git a/ci-operator/config/openshift/image-registry/openshift-image-registry-release-4.2.yaml b/ci-operator/config/openshift/image-registry/openshift-image-registry-release-4.2.yaml index 250b9411cca3c..e51c39d194f22 100644 --- a/ci-operator/config/openshift/image-registry/openshift-image-registry-release-4.2.yaml +++ b/ci-operator/config/openshift/image-registry/openshift-image-registry-release-4.2.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base binary_build_commands: make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -32,7 +30,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp test_binary_build_commands: OS_GOFLAGS='-race' make build diff --git a/ci-operator/config/openshift/image-registry/openshift-image-registry-release-4.3.yaml b/ci-operator/config/openshift/image-registry/openshift-image-registry-release-4.3.yaml index 996b559583a0b..d8932dca2129d 100644 --- a/ci-operator/config/openshift/image-registry/openshift-image-registry-release-4.3.yaml +++ b/ci-operator/config/openshift/image-registry/openshift-image-registry-release-4.3.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base binary_build_commands: make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -33,7 +31,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp test_binary_build_commands: OS_GOFLAGS='-race' make build diff --git a/ci-operator/config/openshift/image-registry/openshift-image-registry-release-4.4.yaml b/ci-operator/config/openshift/image-registry/openshift-image-registry-release-4.4.yaml index 6f2323118db21..ca806091b7c83 100644 --- a/ci-operator/config/openshift/image-registry/openshift-image-registry-release-4.4.yaml +++ b/ci-operator/config/openshift/image-registry/openshift-image-registry-release-4.4.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base binary_build_commands: make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -32,7 +30,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp test_binary_build_commands: OS_GOFLAGS='-race' make build diff --git a/ci-operator/config/openshift/imagebuilder/openshift-imagebuilder-master.yaml b/ci-operator/config/openshift/imagebuilder/openshift-imagebuilder-master.yaml index a6f562301d46d..79586cfa415c3 100644 --- a/ci-operator/config/openshift/imagebuilder/openshift-imagebuilder-master.yaml +++ b/ci-operator/config/openshift/imagebuilder/openshift-imagebuilder-master.yaml @@ -1,9 +1,3 @@ -build_root: - image_stream_tag: - cluster: https://api.ci.openshift.org - name: release - namespace: openshift - tag: golang-1.10 resources: '*': limits: @@ -11,6 +5,11 @@ resources: requests: cpu: 100m memory: 200Mi +build_root: + image_stream_tag: + name: release + namespace: openshift + tag: golang-1.10 tests: - as: unit commands: make test diff --git a/ci-operator/config/openshift/images/openshift-images-master.yaml b/ci-operator/config/openshift/images/openshift-images-master.yaml index 1d06c09eb0182..eaf37b0c61a4e 100644 --- a/ci-operator/config/openshift/images/openshift-images-master.yaml +++ b/ci-operator/config/openshift/images/openshift-images-master.yaml @@ -1,12 +1,10 @@ base_images: os: - cluster: https://api.ci.openshift.org name: ubi namespace: ocp tag: "7" build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -50,7 +48,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/images/openshift-images-release-4.1.yaml b/ci-operator/config/openshift/images/openshift-images-release-4.1.yaml index 4c2796bfd8051..891bb26d3c322 100644 --- a/ci-operator/config/openshift/images/openshift-images-release-4.1.yaml +++ b/ci-operator/config/openshift/images/openshift-images-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: os: - cluster: https://api.ci.openshift.org name: ubi namespace: ocp tag: "7" build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -52,7 +50,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/images/openshift-images-release-4.2.yaml b/ci-operator/config/openshift/images/openshift-images-release-4.2.yaml index bb4101754379f..1d4c589dd2af4 100644 --- a/ci-operator/config/openshift/images/openshift-images-release-4.2.yaml +++ b/ci-operator/config/openshift/images/openshift-images-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: os: - cluster: https://api.ci.openshift.org name: ubi namespace: ocp tag: "7" build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -50,7 +48,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/images/openshift-images-release-4.3.yaml b/ci-operator/config/openshift/images/openshift-images-release-4.3.yaml index 6897cb1dabe37..108d53ebb2811 100644 --- a/ci-operator/config/openshift/images/openshift-images-release-4.3.yaml +++ b/ci-operator/config/openshift/images/openshift-images-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: os: - cluster: https://api.ci.openshift.org name: ubi namespace: ocp tag: "7" build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -51,7 +49,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/images/openshift-images-release-4.4.yaml b/ci-operator/config/openshift/images/openshift-images-release-4.4.yaml index 4f52536d96b7d..e18c06877faea 100644 --- a/ci-operator/config/openshift/images/openshift-images-release-4.4.yaml +++ b/ci-operator/config/openshift/images/openshift-images-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: os: - cluster: https://api.ci.openshift.org name: ubi namespace: ocp tag: "7" build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -50,7 +48,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/insights-operator/openshift-insights-operator-master.yaml b/ci-operator/config/openshift/insights-operator/openshift-insights-operator-master.yaml index 2a443e2d9ef55..81021e3630d06 100644 --- a/ci-operator/config/openshift/insights-operator/openshift-insights-operator-master.yaml +++ b/ci-operator/config/openshift/insights-operator/openshift-insights-operator-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/insights-operator/openshift-insights-operator-release-4.2.yaml b/ci-operator/config/openshift/insights-operator/openshift-insights-operator-release-4.2.yaml index e88ab17ac2919..54ecd04650719 100644 --- a/ci-operator/config/openshift/insights-operator/openshift-insights-operator-release-4.2.yaml +++ b/ci-operator/config/openshift/insights-operator/openshift-insights-operator-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/insights-operator/openshift-insights-operator-release-4.3.yaml b/ci-operator/config/openshift/insights-operator/openshift-insights-operator-release-4.3.yaml index 3168358e24e8f..3ba8bb473e4ce 100644 --- a/ci-operator/config/openshift/insights-operator/openshift-insights-operator-release-4.3.yaml +++ b/ci-operator/config/openshift/insights-operator/openshift-insights-operator-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/insights-operator/openshift-insights-operator-release-4.4.yaml b/ci-operator/config/openshift/insights-operator/openshift-insights-operator-release-4.4.yaml index 07faf73e060bb..be6c2d643b2ab 100644 --- a/ci-operator/config/openshift/insights-operator/openshift-insights-operator-release-4.4.yaml +++ b/ci-operator/config/openshift/insights-operator/openshift-insights-operator-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/installer/openshift-installer-fcos.yaml b/ci-operator/config/openshift/installer/openshift-installer-fcos.yaml index fbba2cbe6734f..52953d636520f 100644 --- a/ci-operator/config/openshift/installer/openshift-installer-fcos.yaml +++ b/ci-operator/config/openshift/installer/openshift-installer-fcos.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: origin tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -112,7 +110,6 @@ resources: cpu: "3" memory: 5Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: origin tests: diff --git a/ci-operator/config/openshift/installer/openshift-installer-master.yaml b/ci-operator/config/openshift/installer/openshift-installer-master.yaml index ae0b5116b6c2b..c9e316f3a0fda 100644 --- a/ci-operator/config/openshift/installer/openshift-installer-master.yaml +++ b/ci-operator/config/openshift/installer/openshift-installer-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -112,7 +110,6 @@ resources: cpu: "3" memory: 5Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.1.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.1.yaml index 925f801b3d05a..cd25e8c4acb40 100644 --- a/ci-operator/config/openshift/installer/openshift-installer-release-4.1.yaml +++ b/ci-operator/config/openshift/installer/openshift-installer-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -100,7 +98,6 @@ resources: cpu: "3" memory: 5Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.2.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.2.yaml index 95cba9fc60db4..ef8f2e8a92333 100644 --- a/ci-operator/config/openshift/installer/openshift-installer-release-4.2.yaml +++ b/ci-operator/config/openshift/installer/openshift-installer-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -112,7 +110,6 @@ resources: cpu: "3" memory: 5Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.3.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.3.yaml index 0099856b8c9af..95e5bbcab4f1f 100644 --- a/ci-operator/config/openshift/installer/openshift-installer-release-4.3.yaml +++ b/ci-operator/config/openshift/installer/openshift-installer-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -113,7 +111,6 @@ resources: cpu: "3" memory: 5Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.4.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.4.yaml index 02032b28c0f2d..baac1d28f1726 100644 --- a/ci-operator/config/openshift/installer/openshift-installer-release-4.4.yaml +++ b/ci-operator/config/openshift/installer/openshift-installer-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -112,7 +110,6 @@ resources: cpu: "3" memory: 5Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/ironic-hardware-inventory-recorder-image/openshift-ironic-hardware-inventory-recorder-image-master.yaml b/ci-operator/config/openshift/ironic-hardware-inventory-recorder-image/openshift-ironic-hardware-inventory-recorder-image-master.yaml index e87b0754c4752..f619111fd330a 100644 --- a/ci-operator/config/openshift/ironic-hardware-inventory-recorder-image/openshift-ironic-hardware-inventory-recorder-image-master.yaml +++ b/ci-operator/config/openshift/ironic-hardware-inventory-recorder-image/openshift-ironic-hardware-inventory-recorder-image-master.yaml @@ -1,12 +1,10 @@ base_images: os: - cluster: https://api.ci.openshift.org name: ubi namespace: ocp tag: "8" build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -33,6 +31,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp diff --git a/ci-operator/config/openshift/ironic-hardware-inventory-recorder-image/openshift-ironic-hardware-inventory-recorder-image-release-4.3.yaml b/ci-operator/config/openshift/ironic-hardware-inventory-recorder-image/openshift-ironic-hardware-inventory-recorder-image-release-4.3.yaml index aa71e9e21b654..3d0301192b1b7 100644 --- a/ci-operator/config/openshift/ironic-hardware-inventory-recorder-image/openshift-ironic-hardware-inventory-recorder-image-release-4.3.yaml +++ b/ci-operator/config/openshift/ironic-hardware-inventory-recorder-image/openshift-ironic-hardware-inventory-recorder-image-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: os: - cluster: https://api.ci.openshift.org name: ubi namespace: ocp tag: "8" build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -34,6 +32,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp diff --git a/ci-operator/config/openshift/ironic-hardware-inventory-recorder-image/openshift-ironic-hardware-inventory-recorder-image-release-4.4.yaml b/ci-operator/config/openshift/ironic-hardware-inventory-recorder-image/openshift-ironic-hardware-inventory-recorder-image-release-4.4.yaml index fa768b8b81b1d..478c5d53b16cc 100644 --- a/ci-operator/config/openshift/ironic-hardware-inventory-recorder-image/openshift-ironic-hardware-inventory-recorder-image-release-4.4.yaml +++ b/ci-operator/config/openshift/ironic-hardware-inventory-recorder-image/openshift-ironic-hardware-inventory-recorder-image-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: os: - cluster: https://api.ci.openshift.org name: ubi namespace: ocp tag: "8" build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -33,6 +31,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp diff --git a/ci-operator/config/openshift/ironic-image/openshift-ironic-image-master.yaml b/ci-operator/config/openshift/ironic-image/openshift-ironic-image-master.yaml index 44e29b8b6d829..9d092770a4c9b 100644 --- a/ci-operator/config/openshift/ironic-image/openshift-ironic-image-master.yaml +++ b/ci-operator/config/openshift/ironic-image/openshift-ironic-image-master.yaml @@ -1,12 +1,10 @@ base_images: os: - cluster: https://api.ci.openshift.org name: ubi namespace: ocp tag: "8" build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -33,6 +31,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp diff --git a/ci-operator/config/openshift/ironic-image/openshift-ironic-image-release-4.2.yaml b/ci-operator/config/openshift/ironic-image/openshift-ironic-image-release-4.2.yaml index 008332d02defe..c21a65c04a802 100644 --- a/ci-operator/config/openshift/ironic-image/openshift-ironic-image-release-4.2.yaml +++ b/ci-operator/config/openshift/ironic-image/openshift-ironic-image-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -31,6 +29,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp diff --git a/ci-operator/config/openshift/ironic-image/openshift-ironic-image-release-4.3.yaml b/ci-operator/config/openshift/ironic-image/openshift-ironic-image-release-4.3.yaml index 5decb175ad01d..97e38cc33689f 100644 --- a/ci-operator/config/openshift/ironic-image/openshift-ironic-image-release-4.3.yaml +++ b/ci-operator/config/openshift/ironic-image/openshift-ironic-image-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: os: - cluster: https://api.ci.openshift.org name: ubi namespace: ocp tag: "8" build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -34,6 +32,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp diff --git a/ci-operator/config/openshift/ironic-image/openshift-ironic-image-release-4.4.yaml b/ci-operator/config/openshift/ironic-image/openshift-ironic-image-release-4.4.yaml index e2994c01f8af5..54e756c13ef1d 100644 --- a/ci-operator/config/openshift/ironic-image/openshift-ironic-image-release-4.4.yaml +++ b/ci-operator/config/openshift/ironic-image/openshift-ironic-image-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: os: - cluster: https://api.ci.openshift.org name: ubi namespace: ocp tag: "8" build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -33,6 +31,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp diff --git a/ci-operator/config/openshift/ironic-inspector-image/openshift-ironic-inspector-image-master.yaml b/ci-operator/config/openshift/ironic-inspector-image/openshift-ironic-inspector-image-master.yaml index 9118329613907..88470074dc0f9 100644 --- a/ci-operator/config/openshift/ironic-inspector-image/openshift-ironic-inspector-image-master.yaml +++ b/ci-operator/config/openshift/ironic-inspector-image/openshift-ironic-inspector-image-master.yaml @@ -1,12 +1,10 @@ base_images: os: - cluster: https://api.ci.openshift.org name: ubi namespace: ocp tag: "8" build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -33,6 +31,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp diff --git a/ci-operator/config/openshift/ironic-inspector-image/openshift-ironic-inspector-image-release-4.2.yaml b/ci-operator/config/openshift/ironic-inspector-image/openshift-ironic-inspector-image-release-4.2.yaml index 07c6cb2198ded..2818c42ba0232 100644 --- a/ci-operator/config/openshift/ironic-inspector-image/openshift-ironic-inspector-image-release-4.2.yaml +++ b/ci-operator/config/openshift/ironic-inspector-image/openshift-ironic-inspector-image-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -31,6 +29,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp diff --git a/ci-operator/config/openshift/ironic-inspector-image/openshift-ironic-inspector-image-release-4.3.yaml b/ci-operator/config/openshift/ironic-inspector-image/openshift-ironic-inspector-image-release-4.3.yaml index e46f72c62999d..863626218d57f 100644 --- a/ci-operator/config/openshift/ironic-inspector-image/openshift-ironic-inspector-image-release-4.3.yaml +++ b/ci-operator/config/openshift/ironic-inspector-image/openshift-ironic-inspector-image-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: os: - cluster: https://api.ci.openshift.org name: ubi namespace: ocp tag: "8" build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -34,6 +32,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp diff --git a/ci-operator/config/openshift/ironic-inspector-image/openshift-ironic-inspector-image-release-4.4.yaml b/ci-operator/config/openshift/ironic-inspector-image/openshift-ironic-inspector-image-release-4.4.yaml index b21a81bb39293..4594c5b282272 100644 --- a/ci-operator/config/openshift/ironic-inspector-image/openshift-ironic-inspector-image-release-4.4.yaml +++ b/ci-operator/config/openshift/ironic-inspector-image/openshift-ironic-inspector-image-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: os: - cluster: https://api.ci.openshift.org name: ubi namespace: ocp tag: "8" build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -33,6 +31,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp diff --git a/ci-operator/config/openshift/ironic-ipa-downloader/openshift-ironic-ipa-downloader-master.yaml b/ci-operator/config/openshift/ironic-ipa-downloader/openshift-ironic-ipa-downloader-master.yaml index ad1f8f1edc2c6..e4c7e399cac75 100644 --- a/ci-operator/config/openshift/ironic-ipa-downloader/openshift-ironic-ipa-downloader-master.yaml +++ b/ci-operator/config/openshift/ironic-ipa-downloader/openshift-ironic-ipa-downloader-master.yaml @@ -1,12 +1,10 @@ base_images: os: - cluster: https://api.ci.openshift.org name: ubi namespace: ocp tag: "8" build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -33,6 +31,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp diff --git a/ci-operator/config/openshift/ironic-ipa-downloader/openshift-ironic-ipa-downloader-release-4.2.yaml b/ci-operator/config/openshift/ironic-ipa-downloader/openshift-ironic-ipa-downloader-release-4.2.yaml index 90c168f0ace34..238c11b48cb2e 100644 --- a/ci-operator/config/openshift/ironic-ipa-downloader/openshift-ironic-ipa-downloader-release-4.2.yaml +++ b/ci-operator/config/openshift/ironic-ipa-downloader/openshift-ironic-ipa-downloader-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -31,6 +29,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp diff --git a/ci-operator/config/openshift/ironic-ipa-downloader/openshift-ironic-ipa-downloader-release-4.3.yaml b/ci-operator/config/openshift/ironic-ipa-downloader/openshift-ironic-ipa-downloader-release-4.3.yaml index 78c79de0a822b..36015755d64e6 100644 --- a/ci-operator/config/openshift/ironic-ipa-downloader/openshift-ironic-ipa-downloader-release-4.3.yaml +++ b/ci-operator/config/openshift/ironic-ipa-downloader/openshift-ironic-ipa-downloader-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: os: - cluster: https://api.ci.openshift.org name: ubi namespace: ocp tag: "8" build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -34,6 +32,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp diff --git a/ci-operator/config/openshift/ironic-ipa-downloader/openshift-ironic-ipa-downloader-release-4.4.yaml b/ci-operator/config/openshift/ironic-ipa-downloader/openshift-ironic-ipa-downloader-release-4.4.yaml index 214e8918a70cc..84f14d587c668 100644 --- a/ci-operator/config/openshift/ironic-ipa-downloader/openshift-ironic-ipa-downloader-release-4.4.yaml +++ b/ci-operator/config/openshift/ironic-ipa-downloader/openshift-ironic-ipa-downloader-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: os: - cluster: https://api.ci.openshift.org name: ubi namespace: ocp tag: "8" build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -33,6 +31,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp diff --git a/ci-operator/config/openshift/ironic-rhcos-downloader/openshift-ironic-rhcos-downloader-master.yaml b/ci-operator/config/openshift/ironic-rhcos-downloader/openshift-ironic-rhcos-downloader-master.yaml index 8352ce952d49b..09a2d95862953 100644 --- a/ci-operator/config/openshift/ironic-rhcos-downloader/openshift-ironic-rhcos-downloader-master.yaml +++ b/ci-operator/config/openshift/ironic-rhcos-downloader/openshift-ironic-rhcos-downloader-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,6 +23,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp diff --git a/ci-operator/config/openshift/ironic-rhcos-downloader/openshift-ironic-rhcos-downloader-release-4.2.yaml b/ci-operator/config/openshift/ironic-rhcos-downloader/openshift-ironic-rhcos-downloader-release-4.2.yaml index b1070cc327995..3ffe85339353b 100644 --- a/ci-operator/config/openshift/ironic-rhcos-downloader/openshift-ironic-rhcos-downloader-release-4.2.yaml +++ b/ci-operator/config/openshift/ironic-rhcos-downloader/openshift-ironic-rhcos-downloader-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,6 +23,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp diff --git a/ci-operator/config/openshift/ironic-rhcos-downloader/openshift-ironic-rhcos-downloader-release-4.3.yaml b/ci-operator/config/openshift/ironic-rhcos-downloader/openshift-ironic-rhcos-downloader-release-4.3.yaml index e3771e7c1599e..84470df33a8f0 100644 --- a/ci-operator/config/openshift/ironic-rhcos-downloader/openshift-ironic-rhcos-downloader-release-4.3.yaml +++ b/ci-operator/config/openshift/ironic-rhcos-downloader/openshift-ironic-rhcos-downloader-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -26,6 +24,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp diff --git a/ci-operator/config/openshift/ironic-rhcos-downloader/openshift-ironic-rhcos-downloader-release-4.4.yaml b/ci-operator/config/openshift/ironic-rhcos-downloader/openshift-ironic-rhcos-downloader-release-4.4.yaml index d94683f43904a..4cbcfdf81166e 100644 --- a/ci-operator/config/openshift/ironic-rhcos-downloader/openshift-ironic-rhcos-downloader-release-4.4.yaml +++ b/ci-operator/config/openshift/ironic-rhcos-downloader/openshift-ironic-rhcos-downloader-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,6 +23,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp diff --git a/ci-operator/config/openshift/ironic-static-ip-manager/openshift-ironic-static-ip-manager-master.yaml b/ci-operator/config/openshift/ironic-static-ip-manager/openshift-ironic-static-ip-manager-master.yaml index 2ffd8039da921..727d7492c123f 100644 --- a/ci-operator/config/openshift/ironic-static-ip-manager/openshift-ironic-static-ip-manager-master.yaml +++ b/ci-operator/config/openshift/ironic-static-ip-manager/openshift-ironic-static-ip-manager-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -25,6 +23,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp diff --git a/ci-operator/config/openshift/ironic-static-ip-manager/openshift-ironic-static-ip-manager-release-4.2.yaml b/ci-operator/config/openshift/ironic-static-ip-manager/openshift-ironic-static-ip-manager-release-4.2.yaml index 2ee86dd63234c..30727547821c3 100644 --- a/ci-operator/config/openshift/ironic-static-ip-manager/openshift-ironic-static-ip-manager-release-4.2.yaml +++ b/ci-operator/config/openshift/ironic-static-ip-manager/openshift-ironic-static-ip-manager-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -25,6 +23,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp diff --git a/ci-operator/config/openshift/ironic-static-ip-manager/openshift-ironic-static-ip-manager-release-4.3.yaml b/ci-operator/config/openshift/ironic-static-ip-manager/openshift-ironic-static-ip-manager-release-4.3.yaml index f047e7f4a6797..ef2867b184f57 100644 --- a/ci-operator/config/openshift/ironic-static-ip-manager/openshift-ironic-static-ip-manager-release-4.3.yaml +++ b/ci-operator/config/openshift/ironic-static-ip-manager/openshift-ironic-static-ip-manager-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,6 +24,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp diff --git a/ci-operator/config/openshift/ironic-static-ip-manager/openshift-ironic-static-ip-manager-release-4.4.yaml b/ci-operator/config/openshift/ironic-static-ip-manager/openshift-ironic-static-ip-manager-release-4.4.yaml index 64994a40916c8..3c0a5b4cd2f64 100644 --- a/ci-operator/config/openshift/ironic-static-ip-manager/openshift-ironic-static-ip-manager-release-4.4.yaml +++ b/ci-operator/config/openshift/ironic-static-ip-manager/openshift-ironic-static-ip-manager-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -25,6 +23,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp diff --git a/ci-operator/config/openshift/jenkins-client-plugin/openshift-jenkins-client-plugin-master.yaml b/ci-operator/config/openshift/jenkins-client-plugin/openshift-jenkins-client-plugin-master.yaml index 2b8eeab1dbaac..8d4962d71a9fa 100644 --- a/ci-operator/config/openshift/jenkins-client-plugin/openshift-jenkins-client-plugin-master.yaml +++ b/ci-operator/config/openshift/jenkins-client-plugin/openshift-jenkins-client-plugin-master.yaml @@ -1,12 +1,10 @@ base_images: original_jenkins: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: jenkins build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -32,7 +30,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/jenkins-client-plugin/openshift-jenkins-client-plugin-release-4.3.yaml b/ci-operator/config/openshift/jenkins-client-plugin/openshift-jenkins-client-plugin-release-4.3.yaml index 66861c02e7f79..b3068e078d8e9 100644 --- a/ci-operator/config/openshift/jenkins-client-plugin/openshift-jenkins-client-plugin-release-4.3.yaml +++ b/ci-operator/config/openshift/jenkins-client-plugin/openshift-jenkins-client-plugin-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: original_jenkins: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: jenkins build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -33,7 +31,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/jenkins-client-plugin/openshift-jenkins-client-plugin-release-4.4.yaml b/ci-operator/config/openshift/jenkins-client-plugin/openshift-jenkins-client-plugin-release-4.4.yaml index 9ccee7818a94a..4d2a87f3e2693 100644 --- a/ci-operator/config/openshift/jenkins-client-plugin/openshift-jenkins-client-plugin-release-4.4.yaml +++ b/ci-operator/config/openshift/jenkins-client-plugin/openshift-jenkins-client-plugin-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: original_jenkins: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: jenkins build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -32,7 +30,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/jenkins-openshift-login-plugin/openshift-jenkins-openshift-login-plugin-master.yaml b/ci-operator/config/openshift/jenkins-openshift-login-plugin/openshift-jenkins-openshift-login-plugin-master.yaml index 968162138ab97..15584aa949c83 100644 --- a/ci-operator/config/openshift/jenkins-openshift-login-plugin/openshift-jenkins-openshift-login-plugin-master.yaml +++ b/ci-operator/config/openshift/jenkins-openshift-login-plugin/openshift-jenkins-openshift-login-plugin-master.yaml @@ -1,12 +1,10 @@ base_images: original_jenkins: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: jenkins build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -32,7 +30,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/jenkins-openshift-login-plugin/openshift-jenkins-openshift-login-plugin-release-4.3.yaml b/ci-operator/config/openshift/jenkins-openshift-login-plugin/openshift-jenkins-openshift-login-plugin-release-4.3.yaml index 621e211d2acac..16596bb8576d1 100644 --- a/ci-operator/config/openshift/jenkins-openshift-login-plugin/openshift-jenkins-openshift-login-plugin-release-4.3.yaml +++ b/ci-operator/config/openshift/jenkins-openshift-login-plugin/openshift-jenkins-openshift-login-plugin-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: original_jenkins: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: jenkins build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -33,7 +31,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/jenkins-openshift-login-plugin/openshift-jenkins-openshift-login-plugin-release-4.4.yaml b/ci-operator/config/openshift/jenkins-openshift-login-plugin/openshift-jenkins-openshift-login-plugin-release-4.4.yaml index 81ebee6a34024..4c38549c73e9c 100644 --- a/ci-operator/config/openshift/jenkins-openshift-login-plugin/openshift-jenkins-openshift-login-plugin-release-4.4.yaml +++ b/ci-operator/config/openshift/jenkins-openshift-login-plugin/openshift-jenkins-openshift-login-plugin-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: original_jenkins: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: jenkins build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -32,7 +30,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/jenkins-sync-plugin/openshift-jenkins-sync-plugin-master.yaml b/ci-operator/config/openshift/jenkins-sync-plugin/openshift-jenkins-sync-plugin-master.yaml index 0d24e8dab94e0..d2e13e065fd18 100644 --- a/ci-operator/config/openshift/jenkins-sync-plugin/openshift-jenkins-sync-plugin-master.yaml +++ b/ci-operator/config/openshift/jenkins-sync-plugin/openshift-jenkins-sync-plugin-master.yaml @@ -1,12 +1,10 @@ base_images: original_jenkins: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: jenkins build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -32,7 +30,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/jenkins-sync-plugin/openshift-jenkins-sync-plugin-release-4.3.yaml b/ci-operator/config/openshift/jenkins-sync-plugin/openshift-jenkins-sync-plugin-release-4.3.yaml index e672c64a4c801..016be32d8719c 100644 --- a/ci-operator/config/openshift/jenkins-sync-plugin/openshift-jenkins-sync-plugin-release-4.3.yaml +++ b/ci-operator/config/openshift/jenkins-sync-plugin/openshift-jenkins-sync-plugin-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: original_jenkins: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: jenkins build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -33,7 +31,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/jenkins-sync-plugin/openshift-jenkins-sync-plugin-release-4.4.yaml b/ci-operator/config/openshift/jenkins-sync-plugin/openshift-jenkins-sync-plugin-release-4.4.yaml index cff177e9009fc..41b2e83810e72 100644 --- a/ci-operator/config/openshift/jenkins-sync-plugin/openshift-jenkins-sync-plugin-release-4.4.yaml +++ b/ci-operator/config/openshift/jenkins-sync-plugin/openshift-jenkins-sync-plugin-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: original_jenkins: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: jenkins build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -32,7 +30,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/jenkins/openshift-jenkins-master.yaml b/ci-operator/config/openshift/jenkins/openshift-jenkins-master.yaml index b1f3bbba1b00b..e2621dc3c4c8e 100644 --- a/ci-operator/config/openshift/jenkins/openshift-jenkins-master.yaml +++ b/ci-operator/config/openshift/jenkins/openshift-jenkins-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: cli build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -54,7 +52,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/jenkins/openshift-jenkins-openshift-3.11.yaml b/ci-operator/config/openshift/jenkins/openshift-jenkins-openshift-3.11.yaml index 8393ef754ed67..cec1d6103a524 100644 --- a/ci-operator/config/openshift/jenkins/openshift-jenkins-openshift-3.11.yaml +++ b/ci-operator/config/openshift/jenkins/openshift-jenkins-openshift-3.11.yaml @@ -1,20 +1,12 @@ base_images: base: - cluster: https://api.ci.openshift.org name: origin-v3.11 namespace: openshift tag: cli cluster-tests: - cluster: https://api.ci.openshift.org name: origin-v3.11 namespace: openshift tag: tests -build_root: - image_stream_tag: - cluster: https://api.ci.openshift.org - name: release - namespace: openshift - tag: golang-1.9 images: - from: cluster-tests inputs: @@ -64,6 +56,12 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: origin-v3.11 namespace: openshift + tag: '' + tag_overrides: {} +build_root: + image_stream_tag: + name: release + namespace: openshift + tag: golang-1.9 diff --git a/ci-operator/config/openshift/jenkins/openshift-jenkins-release-4.1.yaml b/ci-operator/config/openshift/jenkins/openshift-jenkins-release-4.1.yaml index 1a5d1c32dbb6d..5a80ffe140e81 100644 --- a/ci-operator/config/openshift/jenkins/openshift-jenkins-release-4.1.yaml +++ b/ci-operator/config/openshift/jenkins/openshift-jenkins-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: cli build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -54,7 +52,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/jenkins/openshift-jenkins-release-4.2.yaml b/ci-operator/config/openshift/jenkins/openshift-jenkins-release-4.2.yaml index 794370716dc2e..33a18ebe5b21e 100644 --- a/ci-operator/config/openshift/jenkins/openshift-jenkins-release-4.2.yaml +++ b/ci-operator/config/openshift/jenkins/openshift-jenkins-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: cli build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -54,7 +52,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/jenkins/openshift-jenkins-release-4.3.yaml b/ci-operator/config/openshift/jenkins/openshift-jenkins-release-4.3.yaml index 69d7af0967129..1abb922ecba0e 100644 --- a/ci-operator/config/openshift/jenkins/openshift-jenkins-release-4.3.yaml +++ b/ci-operator/config/openshift/jenkins/openshift-jenkins-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: cli build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -55,7 +53,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/jenkins/openshift-jenkins-release-4.4.yaml b/ci-operator/config/openshift/jenkins/openshift-jenkins-release-4.4.yaml index a508fba99d79c..45b81a0f1c423 100644 --- a/ci-operator/config/openshift/jenkins/openshift-jenkins-release-4.4.yaml +++ b/ci-operator/config/openshift/jenkins/openshift-jenkins-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: cli build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -54,7 +52,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/k8s-prometheus-adapter/openshift-k8s-prometheus-adapter-master.yaml b/ci-operator/config/openshift/k8s-prometheus-adapter/openshift-k8s-prometheus-adapter-master.yaml index 42e9729dfebbe..010722ad83715 100644 --- a/ci-operator/config/openshift/k8s-prometheus-adapter/openshift-k8s-prometheus-adapter-master.yaml +++ b/ci-operator/config/openshift/k8s-prometheus-adapter/openshift-k8s-prometheus-adapter-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/k8s-prometheus-adapter/openshift-k8s-prometheus-adapter-release-4.1.yaml b/ci-operator/config/openshift/k8s-prometheus-adapter/openshift-k8s-prometheus-adapter-release-4.1.yaml index cf455400059d0..59d2815bcc226 100644 --- a/ci-operator/config/openshift/k8s-prometheus-adapter/openshift-k8s-prometheus-adapter-release-4.1.yaml +++ b/ci-operator/config/openshift/k8s-prometheus-adapter/openshift-k8s-prometheus-adapter-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/k8s-prometheus-adapter/openshift-k8s-prometheus-adapter-release-4.2.yaml b/ci-operator/config/openshift/k8s-prometheus-adapter/openshift-k8s-prometheus-adapter-release-4.2.yaml index 7df79337dedb8..b1935aab9b542 100644 --- a/ci-operator/config/openshift/k8s-prometheus-adapter/openshift-k8s-prometheus-adapter-release-4.2.yaml +++ b/ci-operator/config/openshift/k8s-prometheus-adapter/openshift-k8s-prometheus-adapter-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/k8s-prometheus-adapter/openshift-k8s-prometheus-adapter-release-4.3.yaml b/ci-operator/config/openshift/k8s-prometheus-adapter/openshift-k8s-prometheus-adapter-release-4.3.yaml index c2f79f0500746..f81803ce744e7 100644 --- a/ci-operator/config/openshift/k8s-prometheus-adapter/openshift-k8s-prometheus-adapter-release-4.3.yaml +++ b/ci-operator/config/openshift/k8s-prometheus-adapter/openshift-k8s-prometheus-adapter-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -27,7 +25,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/k8s-prometheus-adapter/openshift-k8s-prometheus-adapter-release-4.4.yaml b/ci-operator/config/openshift/k8s-prometheus-adapter/openshift-k8s-prometheus-adapter-release-4.4.yaml index 1fefc51eea2ac..a6a8bf849a7a3 100644 --- a/ci-operator/config/openshift/k8s-prometheus-adapter/openshift-k8s-prometheus-adapter-release-4.4.yaml +++ b/ci-operator/config/openshift/k8s-prometheus-adapter/openshift-k8s-prometheus-adapter-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/knative-build/openshift-knative-build-release-0.2.yaml b/ci-operator/config/openshift/knative-build/openshift-knative-build-release-0.2.yaml index eea38b253111e..03b649ff5967c 100644 --- a/ci-operator/config/openshift/knative-build/openshift-knative-build-release-0.2.yaml +++ b/ci-operator/config/openshift/knative-build/openshift-knative-build-release-0.2.yaml @@ -1,14 +1,17 @@ +tag_specification: + name: origin-v3.11 + namespace: openshift base_images: base: - cluster: https://api.ci.openshift.org name: origin-v3.11 namespace: openshift tag: base -binary_build_commands: make install build_root: project_image: dockerfile_path: openshift/ci-operator/build-image/Dockerfile canonical_go_repository: github.com/knative/build +binary_build_commands: make install +test_binary_build_commands: make test-install images: - dockerfile_path: openshift/ci-operator/knative-images/controller/Dockerfile from: base @@ -59,8 +62,13 @@ images: source_path: /go/bin/panic to: knative-build-test-panic promotion: - name: knative-v0.2 namespace: openshift + name: knative-v0.2 +tests: +- as: e2e + commands: "make test-e2e" + openshift_ansible_src: + cluster_profile: gcp resources: '*': limits: @@ -68,13 +76,3 @@ resources: requests: cpu: 100m memory: 200Mi -tag_specification: - cluster: https://api.ci.openshift.org - name: origin-v3.11 - namespace: openshift -test_binary_build_commands: make test-install -tests: -- as: e2e - commands: make test-e2e - openshift_ansible_src: - cluster_profile: gcp diff --git a/ci-operator/config/openshift/knative-build/openshift-knative-build-release-0.3.yaml b/ci-operator/config/openshift/knative-build/openshift-knative-build-release-0.3.yaml index 376b82ae7d143..fe4868b03aeda 100644 --- a/ci-operator/config/openshift/knative-build/openshift-knative-build-release-0.3.yaml +++ b/ci-operator/config/openshift/knative-build/openshift-knative-build-release-0.3.yaml @@ -1,14 +1,20 @@ +tag_specification: + name: '4.0' + namespace: ocp +promotion: + namespace: openshift + name: knative-v0.3 base_images: base: - cluster: https://api.ci.openshift.org - name: "4.0" + name: '4.0' namespace: ocp tag: base -binary_build_commands: make install build_root: project_image: dockerfile_path: openshift/ci-operator/build-image/Dockerfile canonical_go_repository: github.com/knative/build +binary_build_commands: make install +test_binary_build_commands: make test-install images: - dockerfile_path: openshift/ci-operator/knative-images/controller/Dockerfile from: base @@ -58,9 +64,11 @@ images: - destination_dir: . source_path: /go/bin/panic to: knative-build-test-panic -promotion: - name: knative-v0.3 - namespace: openshift +tests: +- as: e2e-aws + commands: "make test-e2e" + openshift_installer_src: + cluster_profile: aws resources: '*': limits: @@ -68,13 +76,3 @@ resources: requests: cpu: 100m memory: 200Mi -tag_specification: - cluster: https://api.ci.openshift.org - name: "4.0" - namespace: ocp -test_binary_build_commands: make test-install -tests: -- as: e2e-aws - commands: make test-e2e - openshift_installer_src: - cluster_profile: aws diff --git a/ci-operator/config/openshift/knative-build/openshift-knative-build-release-v0.4.0.yaml b/ci-operator/config/openshift/knative-build/openshift-knative-build-release-v0.4.0.yaml index 1a69b4201c0bd..42e3b22e2fdd5 100644 --- a/ci-operator/config/openshift/knative-build/openshift-knative-build-release-v0.4.0.yaml +++ b/ci-operator/config/openshift/knative-build/openshift-knative-build-release-v0.4.0.yaml @@ -1,14 +1,20 @@ +tag_specification: + name: '4.0' + namespace: ocp +promotion: + namespace: openshift + name: knative-v0.4.0 base_images: base: - cluster: https://api.ci.openshift.org - name: "4.0" + name: '4.0' namespace: ocp tag: base -binary_build_commands: make install build_root: project_image: dockerfile_path: openshift/ci-operator/build-image/Dockerfile canonical_go_repository: github.com/knative/build +binary_build_commands: make install +test_binary_build_commands: make test-install images: - dockerfile_path: openshift/ci-operator/knative-images/controller/Dockerfile from: base @@ -58,9 +64,11 @@ images: - destination_dir: . source_path: /go/bin/panic to: knative-build-test-panic -promotion: - name: knative-v0.4.0 - namespace: openshift +tests: +- as: e2e-aws + commands: "make test-e2e" + openshift_installer_src: + cluster_profile: aws resources: '*': limits: @@ -68,13 +76,3 @@ resources: requests: cpu: 100m memory: 200Mi -tag_specification: - cluster: https://api.ci.openshift.org - name: "4.0" - namespace: ocp -test_binary_build_commands: make test-install -tests: -- as: e2e-aws - commands: make test-e2e - openshift_installer_src: - cluster_profile: aws diff --git a/ci-operator/config/openshift/knative-build/openshift-knative-build-release-v0.5.0.yaml b/ci-operator/config/openshift/knative-build/openshift-knative-build-release-v0.5.0.yaml index d984328a66a22..e4e55ef7b0cdc 100644 --- a/ci-operator/config/openshift/knative-build/openshift-knative-build-release-v0.5.0.yaml +++ b/ci-operator/config/openshift/knative-build/openshift-knative-build-release-v0.5.0.yaml @@ -1,14 +1,20 @@ +tag_specification: + name: '4.0' + namespace: ocp +promotion: + namespace: openshift + name: knative-v0.5.0 base_images: base: - cluster: https://api.ci.openshift.org - name: "4.0" + name: '4.0' namespace: ocp tag: base -binary_build_commands: make install build_root: project_image: dockerfile_path: openshift/ci-operator/build-image/Dockerfile canonical_go_repository: github.com/knative/build +binary_build_commands: make install +test_binary_build_commands: make test-install images: - dockerfile_path: openshift/ci-operator/knative-images/controller/Dockerfile from: base @@ -58,9 +64,11 @@ images: - destination_dir: . source_path: /go/bin/panic to: knative-build-test-panic -promotion: - name: knative-v0.5.0 - namespace: openshift +tests: +- as: e2e-aws + commands: "make test-e2e" + openshift_installer_src: + cluster_profile: aws resources: '*': limits: @@ -68,13 +76,3 @@ resources: requests: cpu: 100m memory: 200Mi -tag_specification: - cluster: https://api.ci.openshift.org - name: "4.0" - namespace: ocp -test_binary_build_commands: make test-install -tests: -- as: e2e-aws - commands: make test-e2e - openshift_installer_src: - cluster_profile: aws diff --git a/ci-operator/config/openshift/knative-client/openshift-knative-client-release-next.yaml b/ci-operator/config/openshift/knative-client/openshift-knative-client-release-next.yaml index ff55528ce5289..a4496daf3f791 100644 --- a/ci-operator/config/openshift/knative-client/openshift-knative-client-release-next.yaml +++ b/ci-operator/config/openshift/knative-client/openshift-knative-client-release-next.yaml @@ -1,14 +1,28 @@ +tag_specification: + name: '4.2' + namespace: ocp +promotion: + namespace: openshift + name: knative-nightly +build_root: + project_image: + dockerfile_path: openshift/ci-operator/build-image/Dockerfile +canonical_go_repository: github.com/knative/client +binary_build_commands: make install +tests: +- as: e2e-aws-ocp-42 + commands: "make test-e2e" + openshift_installer_src: + cluster_profile: aws +resources: + '*': + requests: + memory: 2Gi base_images: base: - cluster: https://api.ci.openshift.org name: ubi-minimal namespace: ocp tag: "8" -binary_build_commands: make install -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 @@ -18,20 +32,3 @@ images: - destination_dir: . source_path: /go/bin/kn to: knative-client -promotion: - name: knative-nightly - namespace: openshift -resources: - '*': - limits: null - requests: - memory: 2Gi -tag_specification: - cluster: https://api.ci.openshift.org - name: "4.2" - namespace: ocp -tests: -- as: e2e-aws-ocp-42 - commands: make test-e2e - openshift_installer_src: - cluster_profile: aws diff --git a/ci-operator/config/openshift/knative-client/openshift-knative-client-release-v0.1.0.yaml b/ci-operator/config/openshift/knative-client/openshift-knative-client-release-v0.1.0.yaml index 8930b008dac32..4462ad7bfcfb1 100644 --- a/ci-operator/config/openshift/knative-client/openshift-knative-client-release-v0.1.0.yaml +++ b/ci-operator/config/openshift/knative-client/openshift-knative-client-release-v0.1.0.yaml @@ -1,17 +1,24 @@ +tag_specification: + name: '4.1' + namespace: ocp +promotion: + namespace: openshift + name: release-v0.1.0 base_images: base: - cluster: https://api.ci.openshift.org - name: "4.1" + name: '4.1' namespace: ocp tag: base -binary_build_commands: make build build_root: project_image: dockerfile_path: openshift/ci-operator/build-image/Dockerfile canonical_go_repository: github.com/knative/client -promotion: - name: release-v0.1.0 - namespace: openshift +binary_build_commands: make build +tests: +- as: e2e-aws + commands: "make test-e2e" + openshift_installer_src: + cluster_profile: aws resources: '*': limits: @@ -19,12 +26,3 @@ resources: requests: cpu: 100m memory: 200Mi -tag_specification: - cluster: https://api.ci.openshift.org - name: "4.1" - namespace: ocp -tests: -- as: e2e-aws - commands: make test-e2e - openshift_installer_src: - cluster_profile: aws diff --git a/ci-operator/config/openshift/knative-client/openshift-knative-client-release-v0.2.0.yaml b/ci-operator/config/openshift/knative-client/openshift-knative-client-release-v0.2.0.yaml index 664bbd8973032..6c035defe1ed4 100644 --- a/ci-operator/config/openshift/knative-client/openshift-knative-client-release-v0.2.0.yaml +++ b/ci-operator/config/openshift/knative-client/openshift-knative-client-release-v0.2.0.yaml @@ -1,19 +1,17 @@ -binary_build_commands: make build +tag_specification: + name: '4.1' + namespace: ocp build_root: project_image: dockerfile_path: openshift/ci-operator/build-image/Dockerfile canonical_go_repository: github.com/knative/client -resources: - '*': - limits: null - requests: - memory: 2Gi -tag_specification: - cluster: https://api.ci.openshift.org - name: "4.1" - namespace: ocp +binary_build_commands: make build tests: - as: e2e-aws - commands: make test-e2e + commands: "make test-e2e" openshift_installer_src: cluster_profile: aws +resources: + '*': + requests: + memory: 2Gi diff --git a/ci-operator/config/openshift/knative-client/openshift-knative-client-release-v0.9.0.yaml b/ci-operator/config/openshift/knative-client/openshift-knative-client-release-v0.9.0.yaml index 0b6bb6ad1a3cc..64e34dd33926d 100644 --- a/ci-operator/config/openshift/knative-client/openshift-knative-client-release-v0.9.0.yaml +++ b/ci-operator/config/openshift/knative-client/openshift-knative-client-release-v0.9.0.yaml @@ -1,14 +1,28 @@ +tag_specification: + name: '4.2' + namespace: ocp +promotion: + namespace: openshift + name: knative-v0.9.0 +build_root: + project_image: + dockerfile_path: openshift/ci-operator/build-image/Dockerfile +canonical_go_repository: github.com/knative/client +binary_build_commands: make install +tests: +- as: e2e-aws-ocp-42 + commands: "make test-e2e" + openshift_installer_src: + cluster_profile: aws +resources: + '*': + requests: + memory: 2Gi base_images: base: - cluster: https://api.ci.openshift.org name: ubi-minimal namespace: ocp tag: "8" -binary_build_commands: make install -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 @@ -18,20 +32,3 @@ images: - destination_dir: . source_path: /go/bin/kn to: knative-client -promotion: - name: knative-v0.9.0 - namespace: openshift -resources: - '*': - limits: null - requests: - memory: 2Gi -tag_specification: - cluster: https://api.ci.openshift.org - name: "4.2" - namespace: ocp -tests: -- as: e2e-aws-ocp-42 - commands: make test-e2e - openshift_installer_src: - cluster_profile: aws diff --git a/ci-operator/config/openshift/knative-eventing-contrib/openshift-knative-eventing-contrib-release-next.yaml b/ci-operator/config/openshift/knative-eventing-contrib/openshift-knative-eventing-contrib-release-next.yaml index cac46e8df7e37..7b2cffb863ac4 100644 --- a/ci-operator/config/openshift/knative-eventing-contrib/openshift-knative-eventing-contrib-release-next.yaml +++ b/ci-operator/config/openshift/knative-eventing-contrib/openshift-knative-eventing-contrib-release-next.yaml @@ -1,14 +1,32 @@ +tag_specification: + name: '4.2' + namespace: ocp +promotion: + namespace: openshift + name: knative-nightly base_images: base: - cluster: https://api.ci.openshift.org - name: "4.2" + name: '4.2' namespace: ocp tag: base -binary_build_commands: make install build_root: project_image: dockerfile_path: openshift/ci-operator/build-image/Dockerfile canonical_go_repository: knative.dev/eventing-contrib +binary_build_commands: make install +test_binary_build_commands: make test-install +tests: +- as: e2e-aws-ocp-42 + commands: "make test-e2e" + openshift_installer_src: + cluster_profile: aws +resources: + '*': + limits: + memory: 4Gi + requests: + cpu: 100m + memory: 200Mi images: - dockerfile_path: openshift/ci-operator/knative-images/heartbeats/Dockerfile from: base @@ -106,23 +124,3 @@ images: - destination_dir: . source_path: /go/bin/kafka-channel-webhook to: knative-eventing-sources-kafka-channel-webhook -promotion: - name: knative-nightly - namespace: openshift -resources: - '*': - limits: - memory: 4Gi - requests: - cpu: 100m - memory: 200Mi -tag_specification: - cluster: https://api.ci.openshift.org - name: "4.2" - namespace: ocp -test_binary_build_commands: make test-install -tests: -- as: e2e-aws-ocp-42 - commands: make test-e2e - openshift_installer_src: - cluster_profile: aws diff --git a/ci-operator/config/openshift/knative-eventing-contrib/openshift-knative-eventing-contrib-release-next__43.yaml b/ci-operator/config/openshift/knative-eventing-contrib/openshift-knative-eventing-contrib-release-next__43.yaml index 274859c3609b8..5e1542cf4bbd5 100644 --- a/ci-operator/config/openshift/knative-eventing-contrib/openshift-knative-eventing-contrib-release-next__43.yaml +++ b/ci-operator/config/openshift/knative-eventing-contrib/openshift-knative-eventing-contrib-release-next__43.yaml @@ -1,14 +1,32 @@ +tag_specification: + name: '4.3' + namespace: ocp +promotion: + namespace: openshift + name: knative-nightly base_images: base: - cluster: https://api.ci.openshift.org - name: "4.3" + name: '4.3' namespace: ocp tag: base -binary_build_commands: make install build_root: project_image: dockerfile_path: openshift/ci-operator/build-image/Dockerfile canonical_go_repository: knative.dev/eventing-contrib +binary_build_commands: make install +test_binary_build_commands: make test-install +tests: +- as: e2e-aws-ocp-43 + commands: "make test-e2e" + openshift_installer_src: + cluster_profile: aws +resources: + '*': + limits: + memory: 4Gi + requests: + cpu: 100m + memory: 200Mi images: - dockerfile_path: openshift/ci-operator/knative-images/heartbeats/Dockerfile from: base @@ -106,23 +124,3 @@ images: - destination_dir: . source_path: /go/bin/kafka-channel-webhook to: knative-eventing-sources-kafka-channel-webhook -promotion: - name: knative-nightly - namespace: openshift -resources: - '*': - limits: - memory: 4Gi - requests: - cpu: 100m - memory: 200Mi -tag_specification: - cluster: https://api.ci.openshift.org - name: "4.3" - namespace: ocp -test_binary_build_commands: make test-install -tests: -- as: e2e-aws-ocp-43 - commands: make test-e2e - openshift_installer_src: - cluster_profile: aws diff --git a/ci-operator/config/openshift/knative-eventing-contrib/openshift-knative-eventing-contrib-release-v0.10.0.yaml b/ci-operator/config/openshift/knative-eventing-contrib/openshift-knative-eventing-contrib-release-v0.10.0.yaml index 976fdfd5d4936..1c53cf3ea7723 100644 --- a/ci-operator/config/openshift/knative-eventing-contrib/openshift-knative-eventing-contrib-release-v0.10.0.yaml +++ b/ci-operator/config/openshift/knative-eventing-contrib/openshift-knative-eventing-contrib-release-v0.10.0.yaml @@ -1,14 +1,33 @@ +tag_specification: + name: '4.2' + namespace: ocp +promotion: + cluster: https://api.ci.openshift.org + namespace: openshift + name: knative-v0.10.0 base_images: base: - cluster: https://api.ci.openshift.org - name: "4.2" + name: '4.2' namespace: ocp tag: base -binary_build_commands: make install build_root: project_image: dockerfile_path: openshift/ci-operator/build-image/Dockerfile canonical_go_repository: knative.dev/eventing-contrib +binary_build_commands: make install +test_binary_build_commands: make test-install +tests: +- as: e2e-aws-ocp-42 + commands: "make test-e2e" + openshift_installer_src: + cluster_profile: aws +resources: + '*': + limits: + memory: 4Gi + requests: + cpu: 100m + memory: 200Mi images: - dockerfile_path: openshift/ci-operator/knative-images/kafka-channel-controller/Dockerfile from: base @@ -106,23 +125,3 @@ images: - destination_dir: . source_path: /go/bin/github-source-controller to: knative-eventing-sources-github-source-controller -promotion: - name: knative-v0.10.0 - namespace: openshift -resources: - '*': - limits: - memory: 4Gi - requests: - cpu: 100m - memory: 200Mi -tag_specification: - cluster: https://api.ci.openshift.org - name: "4.2" - namespace: ocp -test_binary_build_commands: make test-install -tests: -- as: e2e-aws-ocp-42 - commands: make test-e2e - openshift_installer_src: - cluster_profile: aws diff --git a/ci-operator/config/openshift/knative-eventing-contrib/openshift-knative-eventing-contrib-release-v0.10.0__4.3.yaml b/ci-operator/config/openshift/knative-eventing-contrib/openshift-knative-eventing-contrib-release-v0.10.0__4.3.yaml index 3fb650caeff37..08f001238e8ee 100644 --- a/ci-operator/config/openshift/knative-eventing-contrib/openshift-knative-eventing-contrib-release-v0.10.0__4.3.yaml +++ b/ci-operator/config/openshift/knative-eventing-contrib/openshift-knative-eventing-contrib-release-v0.10.0__4.3.yaml @@ -1,14 +1,33 @@ +tag_specification: + name: '4.3' + namespace: ocp +promotion: + cluster: https://api.ci.openshift.org + namespace: openshift + name: knative-v0.10.0 base_images: base: - cluster: https://api.ci.openshift.org - name: "4.3" + name: '4.3' namespace: ocp tag: base -binary_build_commands: make install build_root: project_image: dockerfile_path: openshift/ci-operator/build-image/Dockerfile canonical_go_repository: knative.dev/eventing-contrib +binary_build_commands: make install +test_binary_build_commands: make test-install +tests: +- as: e2e-aws-ocp-43 + commands: "make test-e2e" + openshift_installer_src: + cluster_profile: aws +resources: + '*': + limits: + memory: 4Gi + requests: + cpu: 100m + memory: 200Mi images: - dockerfile_path: openshift/ci-operator/knative-images/kafka-channel-controller/Dockerfile from: base @@ -106,23 +125,3 @@ images: - destination_dir: . source_path: /go/bin/github-source-controller to: knative-eventing-sources-github-source-controller -promotion: - name: knative-v0.10.0 - namespace: openshift -resources: - '*': - limits: - memory: 4Gi - requests: - cpu: 100m - memory: 200Mi -tag_specification: - cluster: https://api.ci.openshift.org - name: "4.3" - namespace: ocp -test_binary_build_commands: make test-install -tests: -- as: e2e-aws-ocp-43 - commands: make test-e2e - openshift_installer_src: - cluster_profile: aws diff --git a/ci-operator/config/openshift/knative-eventing-contrib/openshift-knative-eventing-contrib-release-v0.7.0.yaml b/ci-operator/config/openshift/knative-eventing-contrib/openshift-knative-eventing-contrib-release-v0.7.0.yaml index d0a5a87b6be04..0ae92d545b528 100644 --- a/ci-operator/config/openshift/knative-eventing-contrib/openshift-knative-eventing-contrib-release-v0.7.0.yaml +++ b/ci-operator/config/openshift/knative-eventing-contrib/openshift-knative-eventing-contrib-release-v0.7.0.yaml @@ -1,14 +1,32 @@ +tag_specification: + name: '4.1' + namespace: ocp +promotion: + namespace: openshift + name: knative-v0.7.0 base_images: base: - cluster: https://api.ci.openshift.org - name: "4.1" + name: '4.1' namespace: ocp tag: base -binary_build_commands: make install build_root: project_image: dockerfile_path: openshift/ci-operator/build-image/Dockerfile canonical_go_repository: github.com/knative/eventing-contrib +binary_build_commands: make install +test_binary_build_commands: make test-install +tests: +- as: e2e-aws + commands: "make test-e2e" + openshift_installer_src: + cluster_profile: aws +resources: + '*': + limits: + memory: 4Gi + requests: + cpu: 100m + memory: 200Mi images: - dockerfile_path: openshift/ci-operator/knative-images/event_display/Dockerfile from: base @@ -90,23 +108,3 @@ images: - destination_dir: . source_path: /go/bin/k8sevents to: knative-eventing-sources-test-k8sevents -promotion: - name: knative-v0.7.0 - namespace: openshift -resources: - '*': - limits: - memory: 4Gi - requests: - cpu: 100m - memory: 200Mi -tag_specification: - cluster: https://api.ci.openshift.org - name: "4.1" - namespace: ocp -test_binary_build_commands: make test-install -tests: -- as: e2e-aws - commands: make test-e2e - openshift_installer_src: - cluster_profile: aws diff --git a/ci-operator/config/openshift/knative-eventing-contrib/openshift-knative-eventing-contrib-release-v0.7.1.yaml b/ci-operator/config/openshift/knative-eventing-contrib/openshift-knative-eventing-contrib-release-v0.7.1.yaml index df81c32ae9419..f5717679f364e 100644 --- a/ci-operator/config/openshift/knative-eventing-contrib/openshift-knative-eventing-contrib-release-v0.7.1.yaml +++ b/ci-operator/config/openshift/knative-eventing-contrib/openshift-knative-eventing-contrib-release-v0.7.1.yaml @@ -1,14 +1,32 @@ +tag_specification: + name: '4.1' + namespace: ocp +promotion: + namespace: openshift + name: knative-v0.7.1 base_images: base: - cluster: https://api.ci.openshift.org - name: "4.1" + name: '4.1' namespace: ocp tag: base -binary_build_commands: make install build_root: project_image: dockerfile_path: openshift/ci-operator/build-image/Dockerfile canonical_go_repository: github.com/knative/eventing-contrib +binary_build_commands: make install +test_binary_build_commands: make test-install +tests: +- as: e2e-aws + commands: "make test-e2e" + openshift_installer_src: + cluster_profile: aws +resources: + '*': + limits: + memory: 4Gi + requests: + cpu: 100m + memory: 200Mi images: - dockerfile_path: openshift/ci-operator/knative-images/camel-source-controller/Dockerfile from: base @@ -90,23 +108,3 @@ images: - destination_dir: . source_path: /go/bin/k8sevents to: knative-eventing-sources-test-k8sevents -promotion: - name: knative-v0.7.1 - namespace: openshift -resources: - '*': - limits: - memory: 4Gi - requests: - cpu: 100m - memory: 200Mi -tag_specification: - cluster: https://api.ci.openshift.org - name: "4.1" - namespace: ocp -test_binary_build_commands: make test-install -tests: -- as: e2e-aws - commands: make test-e2e - openshift_installer_src: - cluster_profile: aws diff --git a/ci-operator/config/openshift/knative-eventing-contrib/openshift-knative-eventing-contrib-release-v0.8.1.yaml b/ci-operator/config/openshift/knative-eventing-contrib/openshift-knative-eventing-contrib-release-v0.8.1.yaml index 806b04ce02b37..da99a74892293 100644 --- a/ci-operator/config/openshift/knative-eventing-contrib/openshift-knative-eventing-contrib-release-v0.8.1.yaml +++ b/ci-operator/config/openshift/knative-eventing-contrib/openshift-knative-eventing-contrib-release-v0.8.1.yaml @@ -1,14 +1,32 @@ +tag_specification: + name: '4.1' + namespace: ocp +promotion: + namespace: openshift + name: knative-v0.8.1 base_images: base: - cluster: https://api.ci.openshift.org - name: "4.1" + name: '4.1' namespace: ocp tag: base -binary_build_commands: make install build_root: project_image: dockerfile_path: openshift/ci-operator/build-image/Dockerfile canonical_go_repository: github.com/knative/eventing-contrib +binary_build_commands: make install +test_binary_build_commands: make test-install +tests: +- as: e2e-aws-ocp-41 + commands: "make test-e2e" + openshift_installer_src: + cluster_profile: aws +resources: + '*': + limits: + memory: 4Gi + requests: + cpu: 100m + memory: 200Mi images: - dockerfile_path: openshift/ci-operator/knative-images/heartbeats/Dockerfile from: base @@ -130,23 +148,3 @@ images: - destination_dir: . source_path: /go/bin/k8sevents to: knative-eventing-sources-test-k8sevents -promotion: - name: knative-v0.8.1 - namespace: openshift -resources: - '*': - limits: - memory: 4Gi - requests: - cpu: 100m - memory: 200Mi -tag_specification: - cluster: https://api.ci.openshift.org - name: "4.1" - namespace: ocp -test_binary_build_commands: make test-install -tests: -- as: e2e-aws-ocp-41 - commands: make test-e2e - openshift_installer_src: - cluster_profile: aws diff --git a/ci-operator/config/openshift/knative-eventing-contrib/openshift-knative-eventing-contrib-release-v0.8.2.yaml b/ci-operator/config/openshift/knative-eventing-contrib/openshift-knative-eventing-contrib-release-v0.8.2.yaml index 48b78f67c92c2..2bc9e426ba276 100644 --- a/ci-operator/config/openshift/knative-eventing-contrib/openshift-knative-eventing-contrib-release-v0.8.2.yaml +++ b/ci-operator/config/openshift/knative-eventing-contrib/openshift-knative-eventing-contrib-release-v0.8.2.yaml @@ -1,14 +1,32 @@ +tag_specification: + name: '4.1' + namespace: ocp +promotion: + namespace: openshift + name: knative-v0.8.2 base_images: base: - cluster: https://api.ci.openshift.org - name: "4.1" + name: '4.1' namespace: ocp tag: base -binary_build_commands: make install build_root: project_image: dockerfile_path: openshift/ci-operator/build-image/Dockerfile canonical_go_repository: github.com/knative/eventing-contrib +binary_build_commands: make install +test_binary_build_commands: make test-install +tests: +- as: e2e-aws-ocp-41 + commands: "make test-e2e" + openshift_installer_src: + cluster_profile: aws +resources: + '*': + limits: + memory: 4Gi + requests: + cpu: 100m + memory: 200Mi images: - dockerfile_path: openshift/ci-operator/knative-images/heartbeats/Dockerfile from: base @@ -130,23 +148,3 @@ images: - destination_dir: . source_path: /go/bin/k8sevents to: knative-eventing-sources-test-k8sevents -promotion: - name: knative-v0.8.2 - namespace: openshift -resources: - '*': - limits: - memory: 4Gi - requests: - cpu: 100m - memory: 200Mi -tag_specification: - cluster: https://api.ci.openshift.org - name: "4.1" - namespace: ocp -test_binary_build_commands: make test-install -tests: -- as: e2e-aws-ocp-41 - commands: make test-e2e - openshift_installer_src: - cluster_profile: aws diff --git a/ci-operator/config/openshift/knative-eventing-contrib/openshift-knative-eventing-contrib-release-v0.9.0.yaml b/ci-operator/config/openshift/knative-eventing-contrib/openshift-knative-eventing-contrib-release-v0.9.0.yaml index 182208d862c21..0018a11fd114d 100644 --- a/ci-operator/config/openshift/knative-eventing-contrib/openshift-knative-eventing-contrib-release-v0.9.0.yaml +++ b/ci-operator/config/openshift/knative-eventing-contrib/openshift-knative-eventing-contrib-release-v0.9.0.yaml @@ -1,14 +1,33 @@ +tag_specification: + name: '4.1' + namespace: ocp +promotion: + cluster: https://api.ci.openshift.org + namespace: openshift + name: knative-v0.9.0 base_images: base: - cluster: https://api.ci.openshift.org - name: "4.1" + name: '4.1' namespace: ocp tag: base -binary_build_commands: make install build_root: project_image: dockerfile_path: openshift/ci-operator/build-image/Dockerfile canonical_go_repository: knative.dev/eventing-contrib +binary_build_commands: make install +test_binary_build_commands: make test-install +tests: +- as: e2e-aws-ocp-41 + commands: "make test-e2e" + openshift_installer_src: + cluster_profile: aws +resources: + '*': + limits: + memory: 4Gi + requests: + cpu: 100m + memory: 200Mi images: - dockerfile_path: openshift/ci-operator/knative-images/kafka-channel-controller/Dockerfile from: base @@ -106,23 +125,3 @@ images: - destination_dir: . source_path: /go/bin/github-source-controller to: knative-eventing-sources-github-source-controller -promotion: - name: knative-v0.9.0 - namespace: openshift -resources: - '*': - limits: - memory: 4Gi - requests: - cpu: 100m - memory: 200Mi -tag_specification: - cluster: https://api.ci.openshift.org - name: "4.1" - namespace: ocp -test_binary_build_commands: make test-install -tests: -- as: e2e-aws-ocp-41 - commands: make test-e2e - openshift_installer_src: - cluster_profile: aws diff --git a/ci-operator/config/openshift/knative-eventing-contrib/openshift-knative-eventing-contrib-release-v0.9.0__43.yaml b/ci-operator/config/openshift/knative-eventing-contrib/openshift-knative-eventing-contrib-release-v0.9.0__43.yaml index df1895d0a3e41..96cf8754cab79 100644 --- a/ci-operator/config/openshift/knative-eventing-contrib/openshift-knative-eventing-contrib-release-v0.9.0__43.yaml +++ b/ci-operator/config/openshift/knative-eventing-contrib/openshift-knative-eventing-contrib-release-v0.9.0__43.yaml @@ -1,14 +1,33 @@ +tag_specification: + name: '4.3' + namespace: ocp +promotion: + cluster: https://api.ci.openshift.org + namespace: openshift + name: knative-v0.9.0 base_images: base: - cluster: https://api.ci.openshift.org - name: "4.3" + name: '4.3' namespace: ocp tag: base -binary_build_commands: make install build_root: project_image: dockerfile_path: openshift/ci-operator/build-image/Dockerfile canonical_go_repository: knative.dev/eventing-contrib +binary_build_commands: make install +test_binary_build_commands: make test-install +tests: +- as: e2e-aws-ocp-43 + commands: "make test-e2e" + openshift_installer_src: + cluster_profile: aws +resources: + '*': + limits: + memory: 4Gi + requests: + cpu: 100m + memory: 200Mi images: - dockerfile_path: openshift/ci-operator/knative-images/kafka-channel-controller/Dockerfile from: base @@ -106,23 +125,3 @@ images: - destination_dir: . source_path: /go/bin/github-source-controller to: knative-eventing-sources-github-source-controller -promotion: - name: knative-v0.9.0 - namespace: openshift -resources: - '*': - limits: - memory: 4Gi - requests: - cpu: 100m - memory: 200Mi -tag_specification: - cluster: https://api.ci.openshift.org - name: "4.3" - namespace: ocp -test_binary_build_commands: make test-install -tests: -- as: e2e-aws-ocp-43 - commands: make test-e2e - openshift_installer_src: - cluster_profile: aws diff --git a/ci-operator/config/openshift/knative-eventing-contrib/openshift-knative-eventing-contrib-release-v0.9.0__variant.yaml b/ci-operator/config/openshift/knative-eventing-contrib/openshift-knative-eventing-contrib-release-v0.9.0__variant.yaml index 16bb32f1c857b..5bcf16a07be47 100644 --- a/ci-operator/config/openshift/knative-eventing-contrib/openshift-knative-eventing-contrib-release-v0.9.0__variant.yaml +++ b/ci-operator/config/openshift/knative-eventing-contrib/openshift-knative-eventing-contrib-release-v0.9.0__variant.yaml @@ -1,14 +1,33 @@ +tag_specification: + name: '4.2' + namespace: ocp +promotion: + cluster: https://api.ci.openshift.org + namespace: openshift + name: knative-v0.9.0 base_images: base: - cluster: https://api.ci.openshift.org - name: "4.2" + name: '4.2' namespace: ocp tag: base -binary_build_commands: make install build_root: project_image: dockerfile_path: openshift/ci-operator/build-image/Dockerfile canonical_go_repository: knative.dev/eventing-contrib +binary_build_commands: make install +test_binary_build_commands: make test-install +tests: +- as: e2e-aws-ocp-42 + commands: "make test-e2e" + openshift_installer_src: + cluster_profile: aws +resources: + '*': + limits: + memory: 4Gi + requests: + cpu: 100m + memory: 200Mi images: - dockerfile_path: openshift/ci-operator/knative-images/kafka-channel-controller/Dockerfile from: base @@ -106,23 +125,3 @@ images: - destination_dir: . source_path: /go/bin/github-source-controller to: knative-eventing-sources-github-source-controller -promotion: - name: knative-v0.9.0 - namespace: openshift -resources: - '*': - limits: - memory: 4Gi - requests: - cpu: 100m - memory: 200Mi -tag_specification: - cluster: https://api.ci.openshift.org - name: "4.2" - namespace: ocp -test_binary_build_commands: make test-install -tests: -- as: e2e-aws-ocp-42 - commands: make test-e2e - openshift_installer_src: - cluster_profile: aws diff --git a/ci-operator/config/openshift/knative-eventing/openshift-knative-eventing-release-0.2.yaml b/ci-operator/config/openshift/knative-eventing/openshift-knative-eventing-release-0.2.yaml index e1df70ae78d66..861c5cb09f579 100644 --- a/ci-operator/config/openshift/knative-eventing/openshift-knative-eventing-release-0.2.yaml +++ b/ci-operator/config/openshift/knative-eventing/openshift-knative-eventing-release-0.2.yaml @@ -1,14 +1,17 @@ +tag_specification: + name: origin-v3.11 + namespace: openshift base_images: base: - cluster: https://api.ci.openshift.org name: origin-v3.11 namespace: openshift tag: base -binary_build_commands: make install build_root: project_image: dockerfile_path: openshift/ci-operator/build-image/Dockerfile canonical_go_repository: github.com/knative/eventing +binary_build_commands: make install +test_binary_build_commands: make test-install images: - dockerfile_path: openshift/ci-operator/knative-images/controller/Dockerfile from: base @@ -59,8 +62,13 @@ images: source_path: /go/bin/k8sevents to: knative-eventing-test-k8sevents promotion: - name: knative-v0.2 namespace: openshift + name: knative-v0.2 +tests: +- as: e2e + commands: "make test-e2e" + openshift_ansible_src: + cluster_profile: gcp resources: '*': limits: @@ -68,13 +76,3 @@ resources: requests: cpu: 100m memory: 200Mi -tag_specification: - cluster: https://api.ci.openshift.org - name: origin-v3.11 - namespace: openshift -test_binary_build_commands: make test-install -tests: -- as: e2e - commands: make test-e2e - openshift_ansible_src: - cluster_profile: gcp diff --git a/ci-operator/config/openshift/knative-eventing/openshift-knative-eventing-release-0.3.yaml b/ci-operator/config/openshift/knative-eventing/openshift-knative-eventing-release-0.3.yaml index 11c4fa2b1f94c..52b6b6ba25c04 100644 --- a/ci-operator/config/openshift/knative-eventing/openshift-knative-eventing-release-0.3.yaml +++ b/ci-operator/config/openshift/knative-eventing/openshift-knative-eventing-release-0.3.yaml @@ -1,14 +1,32 @@ +tag_specification: + name: '4.0' + namespace: ocp +promotion: + namespace: openshift + name: knative-v0.3 base_images: base: - cluster: https://api.ci.openshift.org - name: "4.0" + name: '4.0' namespace: ocp tag: base -binary_build_commands: make install build_root: project_image: dockerfile_path: openshift/ci-operator/build-image/Dockerfile canonical_go_repository: github.com/knative/eventing +binary_build_commands: make install +test_binary_build_commands: make test-install +tests: +- as: e2e-aws + commands: "INTERNAL_REGISTRY=image-registry.openshift-image-registry.svc:5000 ENABLE_ADMISSION_WEBHOOKS=false make test-e2e" + openshift_installer_src: + cluster_profile: aws +resources: + '*': + limits: + memory: 4Gi + requests: + cpu: 100m + memory: 200Mi images: - dockerfile_path: openshift/ci-operator/knative-images/in-memory-channel-controller/Dockerfile from: base @@ -58,24 +76,3 @@ images: - destination_dir: . source_path: /go/bin/k8sevents to: knative-eventing-test-k8sevents -promotion: - name: knative-v0.3 - namespace: openshift -resources: - '*': - limits: - memory: 4Gi - requests: - cpu: 100m - memory: 200Mi -tag_specification: - cluster: https://api.ci.openshift.org - name: "4.0" - namespace: ocp -test_binary_build_commands: make test-install -tests: -- as: e2e-aws - commands: INTERNAL_REGISTRY=image-registry.openshift-image-registry.svc:5000 ENABLE_ADMISSION_WEBHOOKS=false - make test-e2e - openshift_installer_src: - cluster_profile: aws diff --git a/ci-operator/config/openshift/knative-eventing/openshift-knative-eventing-release-next.yaml b/ci-operator/config/openshift/knative-eventing/openshift-knative-eventing-release-next.yaml index a5a08b0a8c5ad..fb8c6c695ce09 100644 --- a/ci-operator/config/openshift/knative-eventing/openshift-knative-eventing-release-next.yaml +++ b/ci-operator/config/openshift/knative-eventing/openshift-knative-eventing-release-next.yaml @@ -1,14 +1,40 @@ +tag_specification: + name: '4.2' + namespace: ocp +promotion: + cluster: https://api.ci.openshift.org + namespace: openshift + name: knative-nightly base_images: base: - cluster: https://api.ci.openshift.org - name: "4.2" + name: '4.2' namespace: ocp tag: base -binary_build_commands: make install build_root: project_image: dockerfile_path: openshift/ci-operator/build-image/Dockerfile canonical_go_repository: knative.dev/eventing +binary_build_commands: make install +test_binary_build_commands: make test-install +tests: +- as: e2e-aws-ocp-42 + commands: "make test-e2e" + openshift_installer_src: + cluster_profile: aws +resources: + '*': + limits: + memory: 6Gi + requests: + cpu: 4 + memory: 6Gi + 'bin': + limits: + memory: 6Gi + requests: + cpu: 4 + memory: 6Gi + images: - dockerfile_path: openshift/ci-operator/knative-images/apiserver_receive_adapter/Dockerfile from: base @@ -170,29 +196,3 @@ images: - destination_dir: . source_path: /go/bin/transformevents to: knative-eventing-test-transformevents -promotion: - name: knative-nightly - namespace: openshift -resources: - '*': - limits: - memory: 6Gi - requests: - cpu: "4" - memory: 6Gi - bin: - limits: - memory: 6Gi - requests: - cpu: "4" - memory: 6Gi -tag_specification: - cluster: https://api.ci.openshift.org - name: "4.2" - namespace: ocp -test_binary_build_commands: make test-install -tests: -- as: e2e-aws-ocp-42 - commands: make test-e2e - openshift_installer_src: - cluster_profile: aws diff --git a/ci-operator/config/openshift/knative-eventing/openshift-knative-eventing-release-next__4.3.yaml b/ci-operator/config/openshift/knative-eventing/openshift-knative-eventing-release-next__4.3.yaml index 60d8c26453483..fa83304666bd8 100644 --- a/ci-operator/config/openshift/knative-eventing/openshift-knative-eventing-release-next__4.3.yaml +++ b/ci-operator/config/openshift/knative-eventing/openshift-knative-eventing-release-next__4.3.yaml @@ -1,14 +1,40 @@ +tag_specification: + name: '4.3' + namespace: ocp +promotion: + cluster: https://api.ci.openshift.org + namespace: openshift + name: knative-nightly base_images: base: - cluster: https://api.ci.openshift.org - name: "4.3" + name: '4.3' namespace: ocp tag: base -binary_build_commands: make install build_root: project_image: dockerfile_path: openshift/ci-operator/build-image/Dockerfile canonical_go_repository: knative.dev/eventing +binary_build_commands: make install +test_binary_build_commands: make test-install +tests: +- as: e2e-aws-ocp-43 + commands: "make test-e2e" + openshift_installer_src: + cluster_profile: aws +resources: + '*': + limits: + memory: 6Gi + requests: + cpu: 4 + memory: 6Gi + 'bin': + limits: + memory: 6Gi + requests: + cpu: 4 + memory: 6Gi + images: - dockerfile_path: openshift/ci-operator/knative-images/apiserver_receive_adapter/Dockerfile from: base @@ -170,29 +196,3 @@ images: - destination_dir: . source_path: /go/bin/transformevents to: knative-eventing-test-transformevents -promotion: - name: knative-nightly - namespace: openshift -resources: - '*': - limits: - memory: 6Gi - requests: - cpu: "4" - memory: 6Gi - bin: - limits: - memory: 6Gi - requests: - cpu: "4" - memory: 6Gi -tag_specification: - cluster: https://api.ci.openshift.org - name: "4.3" - namespace: ocp -test_binary_build_commands: make test-install -tests: -- as: e2e-aws-ocp-43 - commands: make test-e2e - openshift_installer_src: - cluster_profile: aws diff --git a/ci-operator/config/openshift/knative-eventing/openshift-knative-eventing-release-v0.10.0.yaml b/ci-operator/config/openshift/knative-eventing/openshift-knative-eventing-release-v0.10.0.yaml index 74a66b63797ad..df0c8f95016f4 100644 --- a/ci-operator/config/openshift/knative-eventing/openshift-knative-eventing-release-v0.10.0.yaml +++ b/ci-operator/config/openshift/knative-eventing/openshift-knative-eventing-release-v0.10.0.yaml @@ -1,14 +1,40 @@ +tag_specification: + name: '4.2' + namespace: ocp +promotion: + cluster: https://api.ci.openshift.org + namespace: openshift + name: knative-v0.10.0 base_images: base: - cluster: https://api.ci.openshift.org - name: "4.2" + name: '4.2' namespace: ocp tag: base -binary_build_commands: make install build_root: project_image: dockerfile_path: openshift/ci-operator/build-image/Dockerfile canonical_go_repository: knative.dev/eventing +binary_build_commands: make install +test_binary_build_commands: make test-install +tests: +- as: e2e-aws-ocp-42 + commands: "make test-e2e" + openshift_installer_src: + cluster_profile: aws +resources: + '*': + limits: + memory: 6Gi + requests: + cpu: 4 + memory: 6Gi + 'bin': + limits: + memory: 6Gi + requests: + cpu: 4 + memory: 6Gi + images: - dockerfile_path: openshift/ci-operator/knative-images/apiserver_receive_adapter/Dockerfile from: base @@ -170,29 +196,3 @@ images: - destination_dir: . source_path: /go/bin/transformevents to: knative-eventing-test-transformevents -promotion: - name: knative-v0.10.0 - namespace: openshift -resources: - '*': - limits: - memory: 6Gi - requests: - cpu: "4" - memory: 6Gi - bin: - limits: - memory: 6Gi - requests: - cpu: "4" - memory: 6Gi -tag_specification: - cluster: https://api.ci.openshift.org - name: "4.2" - namespace: ocp -test_binary_build_commands: make test-install -tests: -- as: e2e-aws-ocp-42 - commands: make test-e2e - openshift_installer_src: - cluster_profile: aws diff --git a/ci-operator/config/openshift/knative-eventing/openshift-knative-eventing-release-v0.10.0__43.yaml b/ci-operator/config/openshift/knative-eventing/openshift-knative-eventing-release-v0.10.0__43.yaml index 9891fa18b3503..c1d4eb12ea4a8 100644 --- a/ci-operator/config/openshift/knative-eventing/openshift-knative-eventing-release-v0.10.0__43.yaml +++ b/ci-operator/config/openshift/knative-eventing/openshift-knative-eventing-release-v0.10.0__43.yaml @@ -1,14 +1,40 @@ +tag_specification: + name: '4.3' + namespace: ocp +promotion: + cluster: https://api.ci.openshift.org + namespace: openshift + name: knative-v0.10.0 base_images: base: - cluster: https://api.ci.openshift.org - name: "4.3" + name: '4.3' namespace: ocp tag: base -binary_build_commands: make install build_root: project_image: dockerfile_path: openshift/ci-operator/build-image/Dockerfile canonical_go_repository: knative.dev/eventing +binary_build_commands: make install +test_binary_build_commands: make test-install +tests: +- as: e2e-aws-ocp-43 + commands: "make test-e2e" + openshift_installer_src: + cluster_profile: aws +resources: + '*': + limits: + memory: 6Gi + requests: + cpu: 4 + memory: 6Gi + 'bin': + limits: + memory: 6Gi + requests: + cpu: 4 + memory: 6Gi + images: - dockerfile_path: openshift/ci-operator/knative-images/apiserver_receive_adapter/Dockerfile from: base @@ -170,29 +196,3 @@ images: - destination_dir: . source_path: /go/bin/transformevents to: knative-eventing-test-transformevents -promotion: - name: knative-v0.10.0 - namespace: openshift -resources: - '*': - limits: - memory: 6Gi - requests: - cpu: "4" - memory: 6Gi - bin: - limits: - memory: 6Gi - requests: - cpu: "4" - memory: 6Gi -tag_specification: - cluster: https://api.ci.openshift.org - name: "4.3" - namespace: ocp -test_binary_build_commands: make test-install -tests: -- as: e2e-aws-ocp-43 - commands: make test-e2e - openshift_installer_src: - cluster_profile: aws diff --git a/ci-operator/config/openshift/knative-eventing/openshift-knative-eventing-release-v0.4.1.yaml b/ci-operator/config/openshift/knative-eventing/openshift-knative-eventing-release-v0.4.1.yaml index 75e5ce3420e16..4d6a1eb9a49a0 100644 --- a/ci-operator/config/openshift/knative-eventing/openshift-knative-eventing-release-v0.4.1.yaml +++ b/ci-operator/config/openshift/knative-eventing/openshift-knative-eventing-release-v0.4.1.yaml @@ -1,14 +1,32 @@ +tag_specification: + name: '4.0' + namespace: ocp +promotion: + namespace: openshift + name: knative-v0.4.1 base_images: base: - cluster: https://api.ci.openshift.org - name: "4.0" + name: '4.0' namespace: ocp tag: base -binary_build_commands: make install build_root: project_image: dockerfile_path: openshift/ci-operator/build-image/Dockerfile canonical_go_repository: github.com/knative/eventing +binary_build_commands: make install +test_binary_build_commands: make test-install +tests: +- as: e2e-aws + commands: "INTERNAL_REGISTRY=image-registry.openshift-image-registry.svc:5000 ENABLE_ADMISSION_WEBHOOKS=false make test-e2e" + openshift_installer_src: + cluster_profile: aws +resources: + '*': + limits: + memory: 4Gi + requests: + cpu: 100m + memory: 200Mi images: - dockerfile_path: openshift/ci-operator/knative-images/in-memory-channel-controller/Dockerfile from: base @@ -66,24 +84,3 @@ images: - destination_dir: . source_path: /go/bin/sendevent to: knative-eventing-test-sendevent -promotion: - name: knative-v0.4.1 - namespace: openshift -resources: - '*': - limits: - memory: 4Gi - requests: - cpu: 100m - memory: 200Mi -tag_specification: - cluster: https://api.ci.openshift.org - name: "4.0" - namespace: ocp -test_binary_build_commands: make test-install -tests: -- as: e2e-aws - commands: INTERNAL_REGISTRY=image-registry.openshift-image-registry.svc:5000 ENABLE_ADMISSION_WEBHOOKS=false - make test-e2e - openshift_installer_src: - cluster_profile: aws diff --git a/ci-operator/config/openshift/knative-eventing/openshift-knative-eventing-release-v0.5.0.yaml b/ci-operator/config/openshift/knative-eventing/openshift-knative-eventing-release-v0.5.0.yaml index 973b01e9babab..8f2e999ab005e 100644 --- a/ci-operator/config/openshift/knative-eventing/openshift-knative-eventing-release-v0.5.0.yaml +++ b/ci-operator/config/openshift/knative-eventing/openshift-knative-eventing-release-v0.5.0.yaml @@ -1,14 +1,32 @@ +tag_specification: + name: '4.0' + namespace: ocp +promotion: + namespace: openshift + name: knative-v0.5.0 base_images: base: - cluster: https://api.ci.openshift.org - name: "4.0" + name: '4.0' namespace: ocp tag: base -binary_build_commands: make install build_root: project_image: dockerfile_path: openshift/ci-operator/build-image/Dockerfile canonical_go_repository: github.com/knative/eventing +binary_build_commands: make install +test_binary_build_commands: make test-install +tests: +- as: e2e-aws + commands: "INTERNAL_REGISTRY=image-registry.openshift-image-registry.svc:5000 ENABLE_ADMISSION_WEBHOOKS=false make test-e2e" + openshift_installer_src: + cluster_profile: aws +resources: + '*': + limits: + memory: 4Gi + requests: + cpu: 100m + memory: 200Mi images: - dockerfile_path: openshift/ci-operator/knative-images/in-memory-channel-controller/Dockerfile from: base @@ -106,24 +124,3 @@ images: - destination_dir: . source_path: /go/bin/sendevent to: knative-eventing-test-sendevent -promotion: - name: knative-v0.5.0 - namespace: openshift -resources: - '*': - limits: - memory: 4Gi - requests: - cpu: 100m - memory: 200Mi -tag_specification: - cluster: https://api.ci.openshift.org - name: "4.0" - namespace: ocp -test_binary_build_commands: make test-install -tests: -- as: e2e-aws - commands: INTERNAL_REGISTRY=image-registry.openshift-image-registry.svc:5000 ENABLE_ADMISSION_WEBHOOKS=false - make test-e2e - openshift_installer_src: - cluster_profile: aws diff --git a/ci-operator/config/openshift/knative-eventing/openshift-knative-eventing-release-v0.6.0.yaml b/ci-operator/config/openshift/knative-eventing/openshift-knative-eventing-release-v0.6.0.yaml index cd90fde106c09..377ba42256341 100644 --- a/ci-operator/config/openshift/knative-eventing/openshift-knative-eventing-release-v0.6.0.yaml +++ b/ci-operator/config/openshift/knative-eventing/openshift-knative-eventing-release-v0.6.0.yaml @@ -1,14 +1,32 @@ +tag_specification: + name: '4.1' + namespace: ocp +promotion: + namespace: openshift + name: knative-v0.6.0 base_images: base: - cluster: https://api.ci.openshift.org - name: "4.1" + name: '4.1' namespace: ocp tag: base -binary_build_commands: make install build_root: project_image: dockerfile_path: openshift/ci-operator/build-image/Dockerfile canonical_go_repository: github.com/knative/eventing +binary_build_commands: make install +test_binary_build_commands: make test-install +tests: +- as: e2e-aws + commands: "make test-e2e" + openshift_installer_src: + cluster_profile: aws +resources: + '*': + limits: + memory: 4Gi + requests: + cpu: 100m + memory: 200Mi images: - dockerfile_path: openshift/ci-operator/knative-images/in-memory-channel-controller/Dockerfile from: base @@ -138,23 +156,3 @@ images: - destination_dir: . source_path: /go/bin/transformevents to: knative-eventing-test-transformevents -promotion: - name: knative-v0.6.0 - namespace: openshift -resources: - '*': - limits: - memory: 4Gi - requests: - cpu: 100m - memory: 200Mi -tag_specification: - cluster: https://api.ci.openshift.org - name: "4.1" - namespace: ocp -test_binary_build_commands: make test-install -tests: -- as: e2e-aws - commands: make test-e2e - openshift_installer_src: - cluster_profile: aws diff --git a/ci-operator/config/openshift/knative-eventing/openshift-knative-eventing-release-v0.7.0.yaml b/ci-operator/config/openshift/knative-eventing/openshift-knative-eventing-release-v0.7.0.yaml index dd3d61b3a1e49..656e0dbcc73e9 100644 --- a/ci-operator/config/openshift/knative-eventing/openshift-knative-eventing-release-v0.7.0.yaml +++ b/ci-operator/config/openshift/knative-eventing/openshift-knative-eventing-release-v0.7.0.yaml @@ -1,14 +1,32 @@ +tag_specification: + name: '4.1' + namespace: ocp +promotion: + namespace: openshift + name: knative-v0.7.0 base_images: base: - cluster: https://api.ci.openshift.org - name: "4.1" + name: '4.1' namespace: ocp tag: base -binary_build_commands: make install build_root: project_image: dockerfile_path: openshift/ci-operator/build-image/Dockerfile canonical_go_repository: github.com/knative/eventing +binary_build_commands: make install +test_binary_build_commands: make test-install +tests: +- as: e2e-aws + commands: "make test-e2e" + openshift_installer_src: + cluster_profile: aws +resources: + '*': + limits: + memory: 4Gi + requests: + cpu: 100m + memory: 200Mi images: - dockerfile_path: openshift/ci-operator/knative-images/apiserver_receive_adapter/Dockerfile from: base @@ -202,23 +220,3 @@ images: - destination_dir: . source_path: /go/bin/transformevents to: knative-eventing-test-transformevents -promotion: - name: knative-v0.7.0 - namespace: openshift -resources: - '*': - limits: - memory: 4Gi - requests: - cpu: 100m - memory: 200Mi -tag_specification: - cluster: https://api.ci.openshift.org - name: "4.1" - namespace: ocp -test_binary_build_commands: make test-install -tests: -- as: e2e-aws - commands: make test-e2e - openshift_installer_src: - cluster_profile: aws diff --git a/ci-operator/config/openshift/knative-eventing/openshift-knative-eventing-release-v0.7.1.yaml b/ci-operator/config/openshift/knative-eventing/openshift-knative-eventing-release-v0.7.1.yaml index b5bbc6d6894f6..b2dbd1c44d745 100644 --- a/ci-operator/config/openshift/knative-eventing/openshift-knative-eventing-release-v0.7.1.yaml +++ b/ci-operator/config/openshift/knative-eventing/openshift-knative-eventing-release-v0.7.1.yaml @@ -1,14 +1,32 @@ +tag_specification: + name: '4.1' + namespace: ocp +promotion: + namespace: openshift + name: knative-v0.7.1 base_images: base: - cluster: https://api.ci.openshift.org - name: "4.1" + name: '4.1' namespace: ocp tag: base -binary_build_commands: make install build_root: project_image: dockerfile_path: openshift/ci-operator/build-image/Dockerfile canonical_go_repository: github.com/knative/eventing +binary_build_commands: make install +test_binary_build_commands: make test-install +tests: +- as: e2e-aws + commands: "make test-e2e" + openshift_installer_src: + cluster_profile: aws +resources: + '*': + limits: + memory: 4Gi + requests: + cpu: 100m + memory: 200Mi images: - dockerfile_path: openshift/ci-operator/knative-images/apiserver_receive_adapter/Dockerfile from: base @@ -202,23 +220,3 @@ images: - destination_dir: . source_path: /go/bin/transformevents to: knative-eventing-test-transformevents -promotion: - name: knative-v0.7.1 - namespace: openshift -resources: - '*': - limits: - memory: 4Gi - requests: - cpu: 100m - memory: 200Mi -tag_specification: - cluster: https://api.ci.openshift.org - name: "4.1" - namespace: ocp -test_binary_build_commands: make test-install -tests: -- as: e2e-aws - commands: make test-e2e - openshift_installer_src: - cluster_profile: aws diff --git a/ci-operator/config/openshift/knative-eventing/openshift-knative-eventing-release-v0.8.0.yaml b/ci-operator/config/openshift/knative-eventing/openshift-knative-eventing-release-v0.8.0.yaml index 7ee166d8f9007..e7f648b9484f0 100644 --- a/ci-operator/config/openshift/knative-eventing/openshift-knative-eventing-release-v0.8.0.yaml +++ b/ci-operator/config/openshift/knative-eventing/openshift-knative-eventing-release-v0.8.0.yaml @@ -1,14 +1,32 @@ +tag_specification: + name: '4.1' + namespace: ocp +promotion: + namespace: openshift + name: knative-v0.8.0 base_images: base: - cluster: https://api.ci.openshift.org - name: "4.1" + name: '4.1' namespace: ocp tag: base -binary_build_commands: make install build_root: project_image: dockerfile_path: openshift/ci-operator/build-image/Dockerfile canonical_go_repository: github.com/knative/eventing +binary_build_commands: make install +test_binary_build_commands: make test-install +tests: +- as: e2e-aws + commands: "make test-e2e" + openshift_installer_src: + cluster_profile: aws +resources: + '*': + limits: + memory: 4Gi + requests: + cpu: 100m + memory: 200Mi images: - dockerfile_path: openshift/ci-operator/knative-images/in-memory-channel-controller/Dockerfile from: base @@ -178,23 +196,3 @@ images: - destination_dir: . source_path: /go/bin/transformevents to: knative-eventing-test-transformevents -promotion: - name: knative-v0.8.0 - namespace: openshift -resources: - '*': - limits: - memory: 4Gi - requests: - cpu: 100m - memory: 200Mi -tag_specification: - cluster: https://api.ci.openshift.org - name: "4.1" - namespace: ocp -test_binary_build_commands: make test-install -tests: -- as: e2e-aws - commands: make test-e2e - openshift_installer_src: - cluster_profile: aws diff --git a/ci-operator/config/openshift/knative-eventing/openshift-knative-eventing-release-v0.9.0.yaml b/ci-operator/config/openshift/knative-eventing/openshift-knative-eventing-release-v0.9.0.yaml index 7a7d1e68e5804..28a24de47576f 100644 --- a/ci-operator/config/openshift/knative-eventing/openshift-knative-eventing-release-v0.9.0.yaml +++ b/ci-operator/config/openshift/knative-eventing/openshift-knative-eventing-release-v0.9.0.yaml @@ -1,14 +1,39 @@ +tag_specification: + name: '4.1' + namespace: ocp +promotion: + cluster: https://api.ci.openshift.org + namespace: openshift + name: knative-v0.9.0 base_images: base: - cluster: https://api.ci.openshift.org - name: "4.1" + name: '4.1' namespace: ocp tag: base -binary_build_commands: make install build_root: project_image: dockerfile_path: openshift/ci-operator/build-image/Dockerfile canonical_go_repository: knative.dev/eventing +binary_build_commands: make install +test_binary_build_commands: make test-install +tests: +- as: e2e-aws-ocp-41 + commands: "make test-e2e" + openshift_installer_src: + cluster_profile: aws +resources: + '*': + limits: + memory: 6Gi + requests: + cpu: 4 + memory: 6Gi + 'bin': + limits: + memory: 6Gi + requests: + cpu: 4 + memory: 6Gi images: - dockerfile_path: openshift/ci-operator/knative-images/apiserver_receive_adapter/Dockerfile from: base @@ -178,29 +203,3 @@ images: - destination_dir: . source_path: /go/bin/transformevents to: knative-eventing-test-transformevents -promotion: - name: knative-v0.9.0 - namespace: openshift -resources: - '*': - limits: - memory: 6Gi - requests: - cpu: "4" - memory: 6Gi - bin: - limits: - memory: 6Gi - requests: - cpu: "4" - memory: 6Gi -tag_specification: - cluster: https://api.ci.openshift.org - name: "4.1" - namespace: ocp -test_binary_build_commands: make test-install -tests: -- as: e2e-aws-ocp-41 - commands: make test-e2e - openshift_installer_src: - cluster_profile: aws diff --git a/ci-operator/config/openshift/knative-eventing/openshift-knative-eventing-release-v0.9.0__43.yaml b/ci-operator/config/openshift/knative-eventing/openshift-knative-eventing-release-v0.9.0__43.yaml index 7beaba3879b9e..f2bec74a6851c 100644 --- a/ci-operator/config/openshift/knative-eventing/openshift-knative-eventing-release-v0.9.0__43.yaml +++ b/ci-operator/config/openshift/knative-eventing/openshift-knative-eventing-release-v0.9.0__43.yaml @@ -1,14 +1,39 @@ +tag_specification: + name: '4.3' + namespace: ocp +promotion: + cluster: https://api.ci.openshift.org + namespace: openshift + name: knative-v0.9.0 base_images: base: - cluster: https://api.ci.openshift.org - name: "4.3" + name: '4.3' namespace: ocp tag: base -binary_build_commands: make install build_root: project_image: dockerfile_path: openshift/ci-operator/build-image/Dockerfile canonical_go_repository: knative.dev/eventing +binary_build_commands: make install +test_binary_build_commands: make test-install +tests: +- as: e2e-aws-ocp-43 + commands: "make test-e2e" + openshift_installer_src: + cluster_profile: aws +resources: + '*': + limits: + memory: 6Gi + requests: + cpu: 4 + memory: 6Gi + 'bin': + limits: + memory: 6Gi + requests: + cpu: 4 + memory: 6Gi images: - dockerfile_path: openshift/ci-operator/knative-images/apiserver_receive_adapter/Dockerfile from: base @@ -178,29 +203,3 @@ images: - destination_dir: . source_path: /go/bin/transformevents to: knative-eventing-test-transformevents -promotion: - name: knative-v0.9.0 - namespace: openshift -resources: - '*': - limits: - memory: 6Gi - requests: - cpu: "4" - memory: 6Gi - bin: - limits: - memory: 6Gi - requests: - cpu: "4" - memory: 6Gi -tag_specification: - cluster: https://api.ci.openshift.org - name: "4.3" - namespace: ocp -test_binary_build_commands: make test-install -tests: -- as: e2e-aws-ocp-43 - commands: make test-e2e - openshift_installer_src: - cluster_profile: aws diff --git a/ci-operator/config/openshift/knative-eventing/openshift-knative-eventing-release-v0.9.0__variant.yaml b/ci-operator/config/openshift/knative-eventing/openshift-knative-eventing-release-v0.9.0__variant.yaml index 7bb53104734b4..9884cc5601844 100644 --- a/ci-operator/config/openshift/knative-eventing/openshift-knative-eventing-release-v0.9.0__variant.yaml +++ b/ci-operator/config/openshift/knative-eventing/openshift-knative-eventing-release-v0.9.0__variant.yaml @@ -1,14 +1,39 @@ +tag_specification: + name: '4.2' + namespace: ocp +promotion: + cluster: https://api.ci.openshift.org + namespace: openshift + name: knative-v0.9.0 base_images: base: - cluster: https://api.ci.openshift.org - name: "4.2" + name: '4.2' namespace: ocp tag: base -binary_build_commands: make install build_root: project_image: dockerfile_path: openshift/ci-operator/build-image/Dockerfile canonical_go_repository: knative.dev/eventing +binary_build_commands: make install +test_binary_build_commands: make test-install +tests: +- as: e2e-aws-ocp-42 + commands: "make test-e2e" + openshift_installer_src: + cluster_profile: aws +resources: + '*': + limits: + memory: 6Gi + requests: + cpu: 4 + memory: 6Gi + 'bin': + limits: + memory: 6Gi + requests: + cpu: 4 + memory: 6Gi images: - dockerfile_path: openshift/ci-operator/knative-images/apiserver_receive_adapter/Dockerfile from: base @@ -178,29 +203,3 @@ images: - destination_dir: . source_path: /go/bin/transformevents to: knative-eventing-test-transformevents -promotion: - name: knative-v0.9.0 - namespace: openshift -resources: - '*': - limits: - memory: 6Gi - requests: - cpu: "4" - memory: 6Gi - bin: - limits: - memory: 6Gi - requests: - cpu: "4" - memory: 6Gi -tag_specification: - cluster: https://api.ci.openshift.org - name: "4.2" - namespace: ocp -test_binary_build_commands: make test-install -tests: -- as: e2e-aws-ocp-42 - commands: make test-e2e - openshift_installer_src: - cluster_profile: aws diff --git a/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-0.2.yaml b/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-0.2.yaml index 363633b3fa50b..6a478abfc7bc0 100644 --- a/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-0.2.yaml +++ b/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-0.2.yaml @@ -1,14 +1,17 @@ +tag_specification: + name: origin-v3.11 + namespace: openshift base_images: base: - cluster: https://api.ci.openshift.org name: origin-v3.11 namespace: openshift tag: base -binary_build_commands: make install build_root: project_image: dockerfile_path: openshift/ci-operator/build-image/Dockerfile canonical_go_repository: github.com/knative/serving +binary_build_commands: make install +test_binary_build_commands: make test-install images: - dockerfile_path: openshift/ci-operator/knative-images/activator/Dockerfile from: base @@ -115,8 +118,13 @@ images: source_path: /go/bin/singlethreaded to: knative-serving-test-singlethreaded promotion: - name: knative-v0.2 namespace: openshift + name: knative-v0.2 +tests: +- as: e2e + commands: "make test-e2e" + openshift_ansible_src: + cluster_profile: gcp resources: '*': limits: @@ -124,13 +132,3 @@ resources: requests: cpu: 100m memory: 200Mi -tag_specification: - cluster: https://api.ci.openshift.org - name: origin-v3.11 - namespace: openshift -test_binary_build_commands: make test-install -tests: -- as: e2e - commands: make test-e2e - openshift_ansible_src: - cluster_profile: gcp diff --git a/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-0.3.yaml b/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-0.3.yaml index 916798b8689ec..0685b504bef7e 100644 --- a/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-0.3.yaml +++ b/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-0.3.yaml @@ -1,14 +1,32 @@ +tag_specification: + name: '4.0' + namespace: ocp +promotion: + namespace: openshift + name: knative-v0.3 base_images: base: - cluster: https://api.ci.openshift.org - name: "4.0" + name: '4.0' namespace: ocp tag: base -binary_build_commands: make install build_root: project_image: dockerfile_path: openshift/ci-operator/build-image/Dockerfile canonical_go_repository: github.com/knative/serving +binary_build_commands: make install +test_binary_build_commands: make test-install +tests: +- as: e2e-aws + commands: "INTERNAL_REGISTRY=image-registry.openshift-image-registry.svc:5000 ENABLE_ADMISSION_WEBHOOKS=false make test-e2e" + openshift_installer_src: + cluster_profile: aws +resources: + '*': + limits: + memory: 4Gi + requests: + cpu: 100m + memory: 200Mi images: - dockerfile_path: openshift/ci-operator/knative-images/webhook/Dockerfile from: base @@ -154,24 +172,3 @@ images: - destination_dir: . source_path: /go/bin/singlethreaded to: knative-serving-test-singlethreaded -promotion: - name: knative-v0.3 - namespace: openshift -resources: - '*': - limits: - memory: 4Gi - requests: - cpu: 100m - memory: 200Mi -tag_specification: - cluster: https://api.ci.openshift.org - name: "4.0" - namespace: ocp -test_binary_build_commands: make test-install -tests: -- as: e2e-aws - commands: INTERNAL_REGISTRY=image-registry.openshift-image-registry.svc:5000 ENABLE_ADMISSION_WEBHOOKS=false - make test-e2e - openshift_installer_src: - cluster_profile: aws diff --git a/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-next.yaml b/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-next.yaml index f71eabbb1ac1f..b4b96704257da 100644 --- a/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-next.yaml +++ b/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-next.yaml @@ -1,14 +1,32 @@ +tag_specification: + name: '4.2' + namespace: ocp +promotion: + namespace: openshift + name: knative-nightly base_images: base: - cluster: https://api.ci.openshift.org - name: "4.2" + name: '4.2' namespace: ocp tag: base -binary_build_commands: make install build_root: project_image: dockerfile_path: openshift/ci-operator/build-image/Dockerfile canonical_go_repository: knative.dev/serving +binary_build_commands: make install +test_binary_build_commands: make test-install +tests: +- as: e2e-aws-ocp-42 + commands: "make test-e2e" + openshift_installer_src: + cluster_profile: aws +resources: + '*': + limits: + memory: 4Gi + requests: + cpu: 100m + memory: 200Mi images: - dockerfile_path: openshift/ci-operator/knative-images/webhook/Dockerfile from: base @@ -186,23 +204,3 @@ images: - destination_dir: . source_path: /go/bin/hellovolume to: knative-serving-test-hellovolume -promotion: - name: knative-nightly - namespace: openshift -resources: - '*': - limits: - memory: 4Gi - requests: - cpu: 100m - memory: 200Mi -tag_specification: - cluster: https://api.ci.openshift.org - name: "4.2" - namespace: ocp -test_binary_build_commands: make test-install -tests: -- as: e2e-aws-ocp-42 - commands: make test-e2e - openshift_installer_src: - cluster_profile: aws diff --git a/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-next__4.3.yaml b/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-next__4.3.yaml index 38e4a47ddf5d8..10ebfb872b63c 100644 --- a/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-next__4.3.yaml +++ b/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-next__4.3.yaml @@ -1,14 +1,32 @@ +tag_specification: + name: '4.3' + namespace: ocp +promotion: + namespace: openshift + name: knative-nightly base_images: base: - cluster: https://api.ci.openshift.org - name: "4.3" + name: '4.3' namespace: ocp tag: base -binary_build_commands: make install build_root: project_image: dockerfile_path: openshift/ci-operator/build-image/Dockerfile canonical_go_repository: knative.dev/serving +binary_build_commands: make install +test_binary_build_commands: make test-install +tests: +- as: e2e-aws-ocp-43 + commands: "make test-e2e" + openshift_installer_src: + cluster_profile: aws +resources: + '*': + limits: + memory: 4Gi + requests: + cpu: 100m + memory: 200Mi images: - dockerfile_path: openshift/ci-operator/knative-images/webhook/Dockerfile from: base @@ -186,23 +204,3 @@ images: - destination_dir: . source_path: /go/bin/hellovolume to: knative-serving-test-hellovolume -promotion: - name: knative-nightly - namespace: openshift -resources: - '*': - limits: - memory: 4Gi - requests: - cpu: 100m - memory: 200Mi -tag_specification: - cluster: https://api.ci.openshift.org - name: "4.3" - namespace: ocp -test_binary_build_commands: make test-install -tests: -- as: e2e-aws-ocp-43 - commands: make test-e2e - openshift_installer_src: - cluster_profile: aws diff --git a/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-v0.4.1.yaml b/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-v0.4.1.yaml index 15f2d81299e82..4ba04d05f8360 100644 --- a/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-v0.4.1.yaml +++ b/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-v0.4.1.yaml @@ -1,14 +1,32 @@ +tag_specification: + name: '4.0' + namespace: ocp +promotion: + namespace: openshift + name: knative-v0.4.1 base_images: base: - cluster: https://api.ci.openshift.org - name: "4.0" + name: '4.0' namespace: ocp tag: base -binary_build_commands: make install build_root: project_image: dockerfile_path: openshift/ci-operator/build-image/Dockerfile canonical_go_repository: github.com/knative/serving +binary_build_commands: make install +test_binary_build_commands: make test-install +tests: +- as: e2e-aws + commands: "INTERNAL_REGISTRY=image-registry.openshift-image-registry.svc:5000 ENABLE_ADMISSION_WEBHOOKS=false make test-e2e" + openshift_installer_src: + cluster_profile: aws +resources: + '*': + limits: + memory: 4Gi + requests: + cpu: 100m + memory: 200Mi images: - dockerfile_path: openshift/ci-operator/knative-images/webhook/Dockerfile from: base @@ -194,24 +212,3 @@ images: - destination_dir: . source_path: /go/bin/protocols to: knative-serving-test-protocols -promotion: - name: knative-v0.4.1 - namespace: openshift -resources: - '*': - limits: - memory: 4Gi - requests: - cpu: 100m - memory: 200Mi -tag_specification: - cluster: https://api.ci.openshift.org - name: "4.0" - namespace: ocp -test_binary_build_commands: make test-install -tests: -- as: e2e-aws - commands: INTERNAL_REGISTRY=image-registry.openshift-image-registry.svc:5000 ENABLE_ADMISSION_WEBHOOKS=false - make test-e2e - openshift_installer_src: - cluster_profile: aws diff --git a/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-v0.5.0.yaml b/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-v0.5.0.yaml index 83c5b1b22dfdb..7a0e1f8c9d5e1 100644 --- a/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-v0.5.0.yaml +++ b/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-v0.5.0.yaml @@ -1,14 +1,32 @@ +tag_specification: + name: '4.0' + namespace: ocp +promotion: + namespace: openshift + name: knative-v0.5.0 base_images: base: - cluster: https://api.ci.openshift.org - name: "4.0" + name: '4.0' namespace: ocp tag: base -binary_build_commands: make install build_root: project_image: dockerfile_path: openshift/ci-operator/build-image/Dockerfile canonical_go_repository: github.com/knative/serving +binary_build_commands: make install +test_binary_build_commands: make test-install +tests: +- as: e2e-aws + commands: "INTERNAL_REGISTRY=image-registry.openshift-image-registry.svc:5000 ENABLE_ADMISSION_WEBHOOKS=false make test-e2e" + openshift_installer_src: + cluster_profile: aws +resources: + '*': + limits: + memory: 4Gi + requests: + cpu: 100m + memory: 200Mi images: - dockerfile_path: openshift/ci-operator/knative-images/webhook/Dockerfile from: base @@ -194,24 +212,3 @@ images: - destination_dir: . source_path: /go/bin/protocols to: knative-serving-test-protocols -promotion: - name: knative-v0.5.0 - namespace: openshift -resources: - '*': - limits: - memory: 4Gi - requests: - cpu: 100m - memory: 200Mi -tag_specification: - cluster: https://api.ci.openshift.org - name: "4.0" - namespace: ocp -test_binary_build_commands: make test-install -tests: -- as: e2e-aws - commands: INTERNAL_REGISTRY=image-registry.openshift-image-registry.svc:5000 ENABLE_ADMISSION_WEBHOOKS=false - make test-e2e - openshift_installer_src: - cluster_profile: aws diff --git a/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-v0.5.1.yaml b/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-v0.5.1.yaml index 6214a6fc5704c..2c3b657dfd4a0 100644 --- a/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-v0.5.1.yaml +++ b/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-v0.5.1.yaml @@ -1,14 +1,32 @@ +tag_specification: + name: '4.0' + namespace: ocp +promotion: + namespace: openshift + name: knative-v0.5.1 base_images: base: - cluster: https://api.ci.openshift.org - name: "4.0" + name: '4.0' namespace: ocp tag: base -binary_build_commands: make install build_root: project_image: dockerfile_path: openshift/ci-operator/build-image/Dockerfile canonical_go_repository: github.com/knative/serving +binary_build_commands: make install +test_binary_build_commands: make test-install +tests: +- as: e2e-aws + commands: "INTERNAL_REGISTRY=image-registry.openshift-image-registry.svc:5000 ENABLE_ADMISSION_WEBHOOKS=false make test-e2e" + openshift_installer_src: + cluster_profile: aws +resources: + '*': + limits: + memory: 4Gi + requests: + cpu: 100m + memory: 200Mi images: - dockerfile_path: openshift/ci-operator/knative-images/webhook/Dockerfile from: base @@ -194,24 +212,3 @@ images: - destination_dir: . source_path: /go/bin/protocols to: knative-serving-test-protocols -promotion: - name: knative-v0.5.1 - namespace: openshift -resources: - '*': - limits: - memory: 4Gi - requests: - cpu: 100m - memory: 200Mi -tag_specification: - cluster: https://api.ci.openshift.org - name: "4.0" - namespace: ocp -test_binary_build_commands: make test-install -tests: -- as: e2e-aws - commands: INTERNAL_REGISTRY=image-registry.openshift-image-registry.svc:5000 ENABLE_ADMISSION_WEBHOOKS=false - make test-e2e - openshift_installer_src: - cluster_profile: aws diff --git a/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-v0.5.2.yaml b/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-v0.5.2.yaml index c7018c6a449c2..9472827e2824c 100644 --- a/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-v0.5.2.yaml +++ b/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-v0.5.2.yaml @@ -1,14 +1,32 @@ +tag_specification: + name: '4.1' + namespace: ocp +promotion: + namespace: openshift + name: knative-v0.5.2 base_images: base: - cluster: https://api.ci.openshift.org - name: "4.1" + name: '4.1' namespace: ocp tag: base -binary_build_commands: make install build_root: project_image: dockerfile_path: openshift/ci-operator/build-image/Dockerfile canonical_go_repository: github.com/knative/serving +binary_build_commands: make install +test_binary_build_commands: make test-install +tests: +- as: e2e-aws + commands: "INTERNAL_REGISTRY=image-registry.openshift-image-registry.svc:5000 ENABLE_ADMISSION_WEBHOOKS=false make test-e2e" + openshift_installer_src: + cluster_profile: aws +resources: + '*': + limits: + memory: 4Gi + requests: + cpu: 100m + memory: 200Mi images: - dockerfile_path: openshift/ci-operator/knative-images/queue/Dockerfile from: base @@ -194,24 +212,3 @@ images: - destination_dir: . source_path: /go/bin/runtime to: knative-serving-test-runtime -promotion: - name: knative-v0.5.2 - namespace: openshift -resources: - '*': - limits: - memory: 4Gi - requests: - cpu: 100m - memory: 200Mi -tag_specification: - cluster: https://api.ci.openshift.org - name: "4.1" - namespace: ocp -test_binary_build_commands: make test-install -tests: -- as: e2e-aws - commands: INTERNAL_REGISTRY=image-registry.openshift-image-registry.svc:5000 ENABLE_ADMISSION_WEBHOOKS=false - make test-e2e - openshift_installer_src: - cluster_profile: aws diff --git a/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-v0.6.0.yaml b/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-v0.6.0.yaml index b376cdb18b759..0898460cc9390 100644 --- a/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-v0.6.0.yaml +++ b/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-v0.6.0.yaml @@ -1,14 +1,32 @@ +tag_specification: + name: '4.1' + namespace: ocp +promotion: + namespace: openshift + name: knative-v0.6.0 base_images: base: - cluster: https://api.ci.openshift.org - name: "4.1" + name: '4.1' namespace: ocp tag: base -binary_build_commands: make install build_root: project_image: dockerfile_path: openshift/ci-operator/build-image/Dockerfile canonical_go_repository: github.com/knative/serving +binary_build_commands: make install +test_binary_build_commands: make test-install +tests: +- as: e2e-aws + commands: "make test-e2e" + openshift_installer_src: + cluster_profile: aws +resources: + '*': + limits: + memory: 4Gi + requests: + cpu: 100m + memory: 200Mi images: - dockerfile_path: openshift/ci-operator/knative-images/webhook/Dockerfile from: base @@ -218,23 +236,3 @@ images: - destination_dir: . source_path: /go/bin/protocols to: knative-serving-test-protocols -promotion: - name: knative-v0.6.0 - namespace: openshift -resources: - '*': - limits: - memory: 4Gi - requests: - cpu: 100m - memory: 200Mi -tag_specification: - cluster: https://api.ci.openshift.org - name: "4.1" - namespace: ocp -test_binary_build_commands: make test-install -tests: -- as: e2e-aws - commands: make test-e2e - openshift_installer_src: - cluster_profile: aws diff --git a/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-v0.7.1.yaml b/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-v0.7.1.yaml index 59537347bf7dd..246f2cb8b8df5 100644 --- a/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-v0.7.1.yaml +++ b/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-v0.7.1.yaml @@ -1,14 +1,32 @@ +tag_specification: + name: '4.1' + namespace: ocp +promotion: + namespace: openshift + name: knative-v0.7.1 base_images: base: - cluster: https://api.ci.openshift.org - name: "4.1" + name: '4.1' namespace: ocp tag: base -binary_build_commands: make install build_root: project_image: dockerfile_path: openshift/ci-operator/build-image/Dockerfile canonical_go_repository: github.com/knative/serving +binary_build_commands: make install +test_binary_build_commands: make test-install +tests: +- as: e2e-aws + commands: "make test-e2e" + openshift_installer_src: + cluster_profile: aws +resources: + '*': + limits: + memory: 4Gi + requests: + cpu: 100m + memory: 200Mi images: - dockerfile_path: openshift/ci-operator/knative-images/autoscaler/Dockerfile from: base @@ -202,23 +220,3 @@ images: - destination_dir: . source_path: /go/bin/httpproxy to: knative-serving-test-httpproxy -promotion: - name: knative-v0.7.1 - namespace: openshift -resources: - '*': - limits: - memory: 4Gi - requests: - cpu: 100m - memory: 200Mi -tag_specification: - cluster: https://api.ci.openshift.org - name: "4.1" - namespace: ocp -test_binary_build_commands: make test-install -tests: -- as: e2e-aws - commands: make test-e2e - openshift_installer_src: - cluster_profile: aws diff --git a/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-v0.8.1.yaml b/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-v0.8.1.yaml index 37a93c5120d20..8ff9409f74dea 100644 --- a/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-v0.8.1.yaml +++ b/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-v0.8.1.yaml @@ -1,14 +1,32 @@ +tag_specification: + name: '4.1' + namespace: ocp +promotion: + namespace: openshift + name: knative-v0.8.1 base_images: base: - cluster: https://api.ci.openshift.org - name: "4.1" + name: '4.1' namespace: ocp tag: base -binary_build_commands: make install build_root: project_image: dockerfile_path: openshift/ci-operator/build-image/Dockerfile canonical_go_repository: knative.dev/serving +binary_build_commands: make install +test_binary_build_commands: make test-install +tests: +- as: e2e-aws-ocp-41 + commands: "make test-e2e" + openshift_installer_src: + cluster_profile: aws +resources: + '*': + limits: + memory: 4Gi + requests: + cpu: 100m + memory: 200Mi images: - dockerfile_path: openshift/ci-operator/knative-images/autoscaler-hpa/Dockerfile from: base @@ -178,23 +196,3 @@ images: - destination_dir: . source_path: /go/bin/observed-concurrency to: knative-serving-test-observed-concurrency -promotion: - name: knative-v0.8.1 - namespace: openshift -resources: - '*': - limits: - memory: 4Gi - requests: - cpu: 100m - memory: 200Mi -tag_specification: - cluster: https://api.ci.openshift.org - name: "4.1" - namespace: ocp -test_binary_build_commands: make test-install -tests: -- as: e2e-aws-ocp-41 - commands: make test-e2e - openshift_installer_src: - cluster_profile: aws diff --git a/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-v0.8.1__4.3.yaml b/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-v0.8.1__4.3.yaml index 37c6620ab29fc..a8cdf6b99086f 100644 --- a/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-v0.8.1__4.3.yaml +++ b/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-v0.8.1__4.3.yaml @@ -1,14 +1,32 @@ +tag_specification: + name: '4.3' + namespace: ocp +promotion: + namespace: openshift + name: knative-v0.8.1 base_images: base: - cluster: https://api.ci.openshift.org - name: "4.3" + name: '4.3' namespace: ocp tag: base -binary_build_commands: make install build_root: project_image: dockerfile_path: openshift/ci-operator/build-image/Dockerfile canonical_go_repository: knative.dev/serving +binary_build_commands: make install +test_binary_build_commands: make test-install +tests: +- as: e2e-aws-ocp-43 + commands: "make test-e2e" + openshift_installer_src: + cluster_profile: aws +resources: + '*': + limits: + memory: 4Gi + requests: + cpu: 100m + memory: 200Mi images: - dockerfile_path: openshift/ci-operator/knative-images/autoscaler-hpa/Dockerfile from: base @@ -178,23 +196,3 @@ images: - destination_dir: . source_path: /go/bin/observed-concurrency to: knative-serving-test-observed-concurrency -promotion: - name: knative-v0.8.1 - namespace: openshift -resources: - '*': - limits: - memory: 4Gi - requests: - cpu: 100m - memory: 200Mi -tag_specification: - cluster: https://api.ci.openshift.org - name: "4.3" - namespace: ocp -test_binary_build_commands: make test-install -tests: -- as: e2e-aws-ocp-43 - commands: make test-e2e - openshift_installer_src: - cluster_profile: aws diff --git a/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-v0.8.1__variant.yaml b/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-v0.8.1__variant.yaml index 87e57daf8b489..acb0730ed8d44 100644 --- a/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-v0.8.1__variant.yaml +++ b/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-v0.8.1__variant.yaml @@ -1,14 +1,32 @@ +tag_specification: + name: '4.2' + namespace: ocp +promotion: + namespace: openshift + name: knative-v0.8.1 base_images: base: - cluster: https://api.ci.openshift.org - name: "4.2" + name: '4.2' namespace: ocp tag: base -binary_build_commands: make install build_root: project_image: dockerfile_path: openshift/ci-operator/build-image/Dockerfile canonical_go_repository: knative.dev/serving +binary_build_commands: make install +test_binary_build_commands: make test-install +tests: +- as: e2e-aws-ocp-42 + commands: "make test-e2e" + openshift_installer_src: + cluster_profile: aws +resources: + '*': + limits: + memory: 4Gi + requests: + cpu: 100m + memory: 200Mi images: - dockerfile_path: openshift/ci-operator/knative-images/autoscaler-hpa/Dockerfile from: base @@ -178,23 +196,3 @@ images: - destination_dir: . source_path: /go/bin/observed-concurrency to: knative-serving-test-observed-concurrency -promotion: - name: knative-v0.8.1 - namespace: openshift -resources: - '*': - limits: - memory: 4Gi - requests: - cpu: 100m - memory: 200Mi -tag_specification: - cluster: https://api.ci.openshift.org - name: "4.2" - namespace: ocp -test_binary_build_commands: make test-install -tests: -- as: e2e-aws-ocp-42 - commands: make test-e2e - openshift_installer_src: - cluster_profile: aws diff --git a/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-v0.8.1__vsphere.yaml b/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-v0.8.1__vsphere.yaml index d8966eaea3203..630c07bd853f4 100644 --- a/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-v0.8.1__vsphere.yaml +++ b/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-v0.8.1__vsphere.yaml @@ -1,14 +1,30 @@ +tag_specification: + name: '4.2' + namespace: ocp base_images: base: - cluster: https://api.ci.openshift.org - name: "4.2" + name: '4.2' namespace: ocp tag: base -binary_build_commands: make install build_root: project_image: dockerfile_path: openshift/ci-operator/build-image/Dockerfile canonical_go_repository: knative.dev/serving +binary_build_commands: make install +test_binary_build_commands: make test-install +tests: +- as: e2e-vsphere-ocp-42 + commands: "make test-e2e" + cron: '@daily' + openshift_installer_upi: + cluster_profile: vsphere +resources: + '*': + limits: + memory: 4Gi + requests: + cpu: 100m + memory: 200Mi images: - dockerfile_path: openshift/ci-operator/knative-images/autoscaler-hpa/Dockerfile from: base @@ -178,21 +194,3 @@ images: - destination_dir: . source_path: /go/bin/observed-concurrency to: knative-serving-test-observed-concurrency -resources: - '*': - limits: - memory: 4Gi - requests: - cpu: 100m - memory: 200Mi -tag_specification: - cluster: https://api.ci.openshift.org - name: "4.2" - namespace: ocp -test_binary_build_commands: make test-install -tests: -- as: e2e-vsphere-ocp-42 - commands: make test-e2e - cron: '@daily' - openshift_installer_upi: - cluster_profile: vsphere diff --git a/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-v0.9.0.yaml b/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-v0.9.0.yaml index 5f372e80bdfcf..1ef22261e4187 100644 --- a/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-v0.9.0.yaml +++ b/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-v0.9.0.yaml @@ -1,14 +1,32 @@ +tag_specification: + name: '4.1' + namespace: ocp +promotion: + namespace: openshift + name: knative-v0.9.0 base_images: base: - cluster: https://api.ci.openshift.org - name: "4.1" + name: '4.1' namespace: ocp tag: base -binary_build_commands: make install build_root: project_image: dockerfile_path: openshift/ci-operator/build-image/Dockerfile canonical_go_repository: knative.dev/serving +binary_build_commands: make install +test_binary_build_commands: make test-install +tests: +- as: e2e-aws-ocp-41 + commands: "make test-e2e" + openshift_installer_src: + cluster_profile: aws +resources: + '*': + limits: + memory: 4Gi + requests: + cpu: 100m + memory: 200Mi images: - dockerfile_path: openshift/ci-operator/knative-images/webhook/Dockerfile from: base @@ -186,23 +204,3 @@ images: - destination_dir: . source_path: /go/bin/hellovolume to: knative-serving-test-hellovolume -promotion: - name: knative-v0.9.0 - namespace: openshift -resources: - '*': - limits: - memory: 4Gi - requests: - cpu: 100m - memory: 200Mi -tag_specification: - cluster: https://api.ci.openshift.org - name: "4.1" - namespace: ocp -test_binary_build_commands: make test-install -tests: -- as: e2e-aws-ocp-41 - commands: make test-e2e - openshift_installer_src: - cluster_profile: aws diff --git a/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-v0.9.0__4.3.yaml b/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-v0.9.0__4.3.yaml index 2938dd91820c3..9e10a2a0ba1f8 100644 --- a/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-v0.9.0__4.3.yaml +++ b/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-v0.9.0__4.3.yaml @@ -1,14 +1,32 @@ +tag_specification: + name: '4.3' + namespace: ocp +promotion: + namespace: openshift + name: knative-v0.9.0 base_images: base: - cluster: https://api.ci.openshift.org - name: "4.3" + name: '4.3' namespace: ocp tag: base -binary_build_commands: make install build_root: project_image: dockerfile_path: openshift/ci-operator/build-image/Dockerfile canonical_go_repository: knative.dev/serving +binary_build_commands: make install +test_binary_build_commands: make test-install +tests: +- as: e2e-aws-ocp-43 + commands: "make test-e2e" + openshift_installer_src: + cluster_profile: aws +resources: + '*': + limits: + memory: 4Gi + requests: + cpu: 100m + memory: 200Mi images: - dockerfile_path: openshift/ci-operator/knative-images/webhook/Dockerfile from: base @@ -186,23 +204,3 @@ images: - destination_dir: . source_path: /go/bin/hellovolume to: knative-serving-test-hellovolume -promotion: - name: knative-v0.9.0 - namespace: openshift -resources: - '*': - limits: - memory: 4Gi - requests: - cpu: 100m - memory: 200Mi -tag_specification: - cluster: https://api.ci.openshift.org - name: "4.3" - namespace: ocp -test_binary_build_commands: make test-install -tests: -- as: e2e-aws-ocp-43 - commands: make test-e2e - openshift_installer_src: - cluster_profile: aws diff --git a/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-v0.9.0__variant.yaml b/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-v0.9.0__variant.yaml index 39ea39271b6d7..d7cf61e08563e 100644 --- a/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-v0.9.0__variant.yaml +++ b/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-v0.9.0__variant.yaml @@ -1,14 +1,32 @@ +tag_specification: + name: '4.2' + namespace: ocp +promotion: + namespace: openshift + name: knative-v0.9.0 base_images: base: - cluster: https://api.ci.openshift.org - name: "4.2" + name: '4.2' namespace: ocp tag: base -binary_build_commands: make install build_root: project_image: dockerfile_path: openshift/ci-operator/build-image/Dockerfile canonical_go_repository: knative.dev/serving +binary_build_commands: make install +test_binary_build_commands: make test-install +tests: +- as: e2e-aws-ocp-42 + commands: "make test-e2e" + openshift_installer_src: + cluster_profile: aws +resources: + '*': + limits: + memory: 4Gi + requests: + cpu: 100m + memory: 200Mi images: - dockerfile_path: openshift/ci-operator/knative-images/webhook/Dockerfile from: base @@ -186,23 +204,3 @@ images: - destination_dir: . source_path: /go/bin/hellovolume to: knative-serving-test-hellovolume -promotion: - name: knative-v0.9.0 - namespace: openshift -resources: - '*': - limits: - memory: 4Gi - requests: - cpu: 100m - memory: 200Mi -tag_specification: - cluster: https://api.ci.openshift.org - name: "4.2" - namespace: ocp -test_binary_build_commands: make test-install -tests: -- as: e2e-aws-ocp-42 - commands: make test-e2e - openshift_installer_src: - cluster_profile: aws diff --git a/ci-operator/config/openshift/kube-rbac-proxy/openshift-kube-rbac-proxy-master.yaml b/ci-operator/config/openshift/kube-rbac-proxy/openshift-kube-rbac-proxy-master.yaml index 14ea4da466c0a..dedfb067e0ffc 100644 --- a/ci-operator/config/openshift/kube-rbac-proxy/openshift-kube-rbac-proxy-master.yaml +++ b/ci-operator/config/openshift/kube-rbac-proxy/openshift-kube-rbac-proxy-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/kube-rbac-proxy/openshift-kube-rbac-proxy-release-4.1.yaml b/ci-operator/config/openshift/kube-rbac-proxy/openshift-kube-rbac-proxy-release-4.1.yaml index 0d06e483ad4c7..668ad66e090a7 100644 --- a/ci-operator/config/openshift/kube-rbac-proxy/openshift-kube-rbac-proxy-release-4.1.yaml +++ b/ci-operator/config/openshift/kube-rbac-proxy/openshift-kube-rbac-proxy-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/kube-rbac-proxy/openshift-kube-rbac-proxy-release-4.2.yaml b/ci-operator/config/openshift/kube-rbac-proxy/openshift-kube-rbac-proxy-release-4.2.yaml index 03884383e3248..c545dd5934ffe 100644 --- a/ci-operator/config/openshift/kube-rbac-proxy/openshift-kube-rbac-proxy-release-4.2.yaml +++ b/ci-operator/config/openshift/kube-rbac-proxy/openshift-kube-rbac-proxy-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/kube-rbac-proxy/openshift-kube-rbac-proxy-release-4.3.yaml b/ci-operator/config/openshift/kube-rbac-proxy/openshift-kube-rbac-proxy-release-4.3.yaml index a5a025e339b3b..99f6a3cd8dabc 100644 --- a/ci-operator/config/openshift/kube-rbac-proxy/openshift-kube-rbac-proxy-release-4.3.yaml +++ b/ci-operator/config/openshift/kube-rbac-proxy/openshift-kube-rbac-proxy-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/kube-rbac-proxy/openshift-kube-rbac-proxy-release-4.4.yaml b/ci-operator/config/openshift/kube-rbac-proxy/openshift-kube-rbac-proxy-release-4.4.yaml index d967abfb6d8e2..196f996bfcfe2 100644 --- a/ci-operator/config/openshift/kube-rbac-proxy/openshift-kube-rbac-proxy-release-4.4.yaml +++ b/ci-operator/config/openshift/kube-rbac-proxy/openshift-kube-rbac-proxy-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/kube-state-metrics/openshift-kube-state-metrics-master.yaml b/ci-operator/config/openshift/kube-state-metrics/openshift-kube-state-metrics-master.yaml index 9f08abd783a24..c2f5e673f7824 100644 --- a/ci-operator/config/openshift/kube-state-metrics/openshift-kube-state-metrics-master.yaml +++ b/ci-operator/config/openshift/kube-state-metrics/openshift-kube-state-metrics-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/kube-state-metrics/openshift-kube-state-metrics-release-4.1.yaml b/ci-operator/config/openshift/kube-state-metrics/openshift-kube-state-metrics-release-4.1.yaml index a0238dfdc3e5c..b983ff5694103 100644 --- a/ci-operator/config/openshift/kube-state-metrics/openshift-kube-state-metrics-release-4.1.yaml +++ b/ci-operator/config/openshift/kube-state-metrics/openshift-kube-state-metrics-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/kube-state-metrics/openshift-kube-state-metrics-release-4.2.yaml b/ci-operator/config/openshift/kube-state-metrics/openshift-kube-state-metrics-release-4.2.yaml index 365003f0cffb3..1abd6f52d8cb3 100644 --- a/ci-operator/config/openshift/kube-state-metrics/openshift-kube-state-metrics-release-4.2.yaml +++ b/ci-operator/config/openshift/kube-state-metrics/openshift-kube-state-metrics-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/kube-state-metrics/openshift-kube-state-metrics-release-4.3.yaml b/ci-operator/config/openshift/kube-state-metrics/openshift-kube-state-metrics-release-4.3.yaml index c01dbb5be46b9..e97cb66a3f8b7 100644 --- a/ci-operator/config/openshift/kube-state-metrics/openshift-kube-state-metrics-release-4.3.yaml +++ b/ci-operator/config/openshift/kube-state-metrics/openshift-kube-state-metrics-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -27,7 +25,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/kube-state-metrics/openshift-kube-state-metrics-release-4.4.yaml b/ci-operator/config/openshift/kube-state-metrics/openshift-kube-state-metrics-release-4.4.yaml index 1fababfe8aaeb..e4918fcd85787 100644 --- a/ci-operator/config/openshift/kube-state-metrics/openshift-kube-state-metrics-release-4.4.yaml +++ b/ci-operator/config/openshift/kube-state-metrics/openshift-kube-state-metrics-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/kubecsr/openshift-kubecsr-openshift-4.1.yaml b/ci-operator/config/openshift/kubecsr/openshift-kubecsr-openshift-4.1.yaml index c87f09657cd15..062adc1bc6713 100644 --- a/ci-operator/config/openshift/kubecsr/openshift-kubecsr-openshift-4.1.yaml +++ b/ci-operator/config/openshift/kubecsr/openshift-kubecsr-openshift-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -29,7 +27,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/kubecsr/openshift-kubecsr-openshift-4.2.yaml b/ci-operator/config/openshift/kubecsr/openshift-kubecsr-openshift-4.2.yaml index f64ef02c9f146..0978d4432ad7c 100644 --- a/ci-operator/config/openshift/kubecsr/openshift-kubecsr-openshift-4.2.yaml +++ b/ci-operator/config/openshift/kubecsr/openshift-kubecsr-openshift-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -29,7 +27,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/kubecsr/openshift-kubecsr-openshift-4.3.yaml b/ci-operator/config/openshift/kubecsr/openshift-kubecsr-openshift-4.3.yaml index 7e6f580fd1aee..4dfb4baed2a12 100644 --- a/ci-operator/config/openshift/kubecsr/openshift-kubecsr-openshift-4.3.yaml +++ b/ci-operator/config/openshift/kubecsr/openshift-kubecsr-openshift-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -29,7 +27,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/kubecsr/openshift-kubecsr-openshift-4.4.yaml b/ci-operator/config/openshift/kubecsr/openshift-kubecsr-openshift-4.4.yaml index ed976ad70051c..78eaaa9717976 100644 --- a/ci-operator/config/openshift/kubecsr/openshift-kubecsr-openshift-4.4.yaml +++ b/ci-operator/config/openshift/kubecsr/openshift-kubecsr-openshift-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -29,7 +27,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/kubefed-operator/openshift-kubefed-operator-master.yaml b/ci-operator/config/openshift/kubefed-operator/openshift-kubefed-operator-master.yaml index c5ee5ae904ef2..dc749d0260490 100644 --- a/ci-operator/config/openshift/kubefed-operator/openshift-kubefed-operator-master.yaml +++ b/ci-operator/config/openshift/kubefed-operator/openshift-kubefed-operator-master.yaml @@ -1,6 +1,5 @@ build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -19,7 +18,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/kubefed-operator/openshift-kubefed-operator-release-0.1.0-rc3.yaml b/ci-operator/config/openshift/kubefed-operator/openshift-kubefed-operator-release-0.1.0-rc3.yaml index ad36eba1a4fd2..0184382549dfa 100644 --- a/ci-operator/config/openshift/kubefed-operator/openshift-kubefed-operator-release-0.1.0-rc3.yaml +++ b/ci-operator/config/openshift/kubefed-operator/openshift-kubefed-operator-release-0.1.0-rc3.yaml @@ -1,6 +1,5 @@ build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -9,7 +8,7 @@ images: from: root to: kubefed-operator promotion: - name: kubefed-operator-0.1.0-rc3 + name: "kubefed-operator-0.1.0-rc3" namespace: openshift resources: '*': @@ -19,7 +18,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/kubefed-operator/openshift-kubefed-operator-release-0.1.0-rc4.yaml b/ci-operator/config/openshift/kubefed-operator/openshift-kubefed-operator-release-0.1.0-rc4.yaml index b62cde1c7693f..b74323c5ab43f 100644 --- a/ci-operator/config/openshift/kubefed-operator/openshift-kubefed-operator-release-0.1.0-rc4.yaml +++ b/ci-operator/config/openshift/kubefed-operator/openshift-kubefed-operator-release-0.1.0-rc4.yaml @@ -1,6 +1,5 @@ build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -9,7 +8,7 @@ images: from: root to: kubefed-operator promotion: - name: kubefed-operator-0.1.0-rc4 + name: "kubefed-operator-0.1.0-rc4" namespace: openshift resources: '*': @@ -19,7 +18,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/kubefed-operator/openshift-kubefed-operator-release-0.1.0-rc5.yaml b/ci-operator/config/openshift/kubefed-operator/openshift-kubefed-operator-release-0.1.0-rc5.yaml index 90720594625fb..cb35c555d93ee 100644 --- a/ci-operator/config/openshift/kubefed-operator/openshift-kubefed-operator-release-0.1.0-rc5.yaml +++ b/ci-operator/config/openshift/kubefed-operator/openshift-kubefed-operator-release-0.1.0-rc5.yaml @@ -1,6 +1,5 @@ build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -9,7 +8,7 @@ images: from: root to: kubefed-operator promotion: - name: kubefed-operator-0.1.0-rc5 + name: "kubefed-operator-0.1.0-rc5" namespace: openshift resources: '*': @@ -19,7 +18,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/kubefed-operator/openshift-kubefed-operator-release-0.1.0-rc6.yaml b/ci-operator/config/openshift/kubefed-operator/openshift-kubefed-operator-release-0.1.0-rc6.yaml index 8910b5c66556f..520bbd2b5597a 100644 --- a/ci-operator/config/openshift/kubefed-operator/openshift-kubefed-operator-release-0.1.0-rc6.yaml +++ b/ci-operator/config/openshift/kubefed-operator/openshift-kubefed-operator-release-0.1.0-rc6.yaml @@ -1,6 +1,5 @@ build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -9,7 +8,7 @@ images: from: root to: kubefed-operator promotion: - name: kubefed-operator-0.1.0-rc6 + name: "kubefed-operator-0.1.0-rc6" namespace: openshift resources: '*': @@ -19,7 +18,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/kubefed-operator/openshift-kubefed-operator-release-4.2.yaml b/ci-operator/config/openshift/kubefed-operator/openshift-kubefed-operator-release-4.2.yaml index c1f5b5c208ed9..98827965c3d53 100644 --- a/ci-operator/config/openshift/kubefed-operator/openshift-kubefed-operator-release-4.2.yaml +++ b/ci-operator/config/openshift/kubefed-operator/openshift-kubefed-operator-release-4.2.yaml @@ -1,6 +1,5 @@ build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -19,7 +18,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/kubefed-operator/openshift-kubefed-operator-release-4.3.yaml b/ci-operator/config/openshift/kubefed-operator/openshift-kubefed-operator-release-4.3.yaml index 7b592c6a9a9ca..ad703e366f147 100644 --- a/ci-operator/config/openshift/kubefed-operator/openshift-kubefed-operator-release-4.3.yaml +++ b/ci-operator/config/openshift/kubefed-operator/openshift-kubefed-operator-release-4.3.yaml @@ -1,6 +1,5 @@ build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -20,7 +19,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/kubefed-operator/openshift-kubefed-operator-release-4.4.yaml b/ci-operator/config/openshift/kubefed-operator/openshift-kubefed-operator-release-4.4.yaml index ae2475acfcf7a..42070b1ff476f 100644 --- a/ci-operator/config/openshift/kubefed-operator/openshift-kubefed-operator-release-4.4.yaml +++ b/ci-operator/config/openshift/kubefed-operator/openshift-kubefed-operator-release-4.4.yaml @@ -1,6 +1,5 @@ build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -19,7 +18,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/kubefed/openshift-kubefed-master.yaml b/ci-operator/config/openshift/kubefed/openshift-kubefed-master.yaml index c6dda610c5b1d..0683d88b69f7f 100644 --- a/ci-operator/config/openshift/kubefed/openshift-kubefed-master.yaml +++ b/ci-operator/config/openshift/kubefed/openshift-kubefed-master.yaml @@ -1,6 +1,5 @@ build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -20,7 +19,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/kubefed/openshift-kubefed-release-4.2.yaml b/ci-operator/config/openshift/kubefed/openshift-kubefed-release-4.2.yaml index edd74755ad545..547635f11a0b4 100644 --- a/ci-operator/config/openshift/kubefed/openshift-kubefed-release-4.2.yaml +++ b/ci-operator/config/openshift/kubefed/openshift-kubefed-release-4.2.yaml @@ -1,6 +1,5 @@ build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -20,7 +19,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/kubefed/openshift-kubefed-release-4.3.yaml b/ci-operator/config/openshift/kubefed/openshift-kubefed-release-4.3.yaml index 23d7a903f1e0a..fe71c238f6626 100644 --- a/ci-operator/config/openshift/kubefed/openshift-kubefed-release-4.3.yaml +++ b/ci-operator/config/openshift/kubefed/openshift-kubefed-release-4.3.yaml @@ -1,6 +1,5 @@ build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -21,7 +20,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/kubefed/openshift-kubefed-release-4.4.yaml b/ci-operator/config/openshift/kubefed/openshift-kubefed-release-4.4.yaml index c2c8b2e7f47c0..8d978b1a86ffd 100644 --- a/ci-operator/config/openshift/kubefed/openshift-kubefed-release-4.4.yaml +++ b/ci-operator/config/openshift/kubefed/openshift-kubefed-release-4.4.yaml @@ -1,6 +1,5 @@ build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -20,7 +19,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/kubernetes-autoscaler/openshift-kubernetes-autoscaler-master.yaml b/ci-operator/config/openshift/kubernetes-autoscaler/openshift-kubernetes-autoscaler-master.yaml index d38ae39ed1800..0cf8dd8312b28 100644 --- a/ci-operator/config/openshift/kubernetes-autoscaler/openshift-kubernetes-autoscaler-master.yaml +++ b/ci-operator/config/openshift/kubernetes-autoscaler/openshift-kubernetes-autoscaler-master.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base binary_build_commands: make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -55,7 +53,6 @@ resources: cpu: "2" memory: 8Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp test_binary_build_commands: OS_GOFLAGS='-race' make build diff --git a/ci-operator/config/openshift/kubernetes-autoscaler/openshift-kubernetes-autoscaler-release-3.10.yaml b/ci-operator/config/openshift/kubernetes-autoscaler/openshift-kubernetes-autoscaler-release-3.10.yaml index c4f9dc71fb3bd..f4887a09b8340 100644 --- a/ci-operator/config/openshift/kubernetes-autoscaler/openshift-kubernetes-autoscaler-release-3.10.yaml +++ b/ci-operator/config/openshift/kubernetes-autoscaler/openshift-kubernetes-autoscaler-release-3.10.yaml @@ -4,12 +4,6 @@ base_rpm_images: namespace: openshift tag: base binary_build_commands: make build -build_root: - image_stream_tag: - cluster: https://api.ci.openshift.org - name: release - namespace: openshift - tag: golang-1.9 canonical_go_repository: k8s.io/autoscaler images: - context_dir: images/cluster-autoscaler/ @@ -26,25 +20,31 @@ resources: limits: memory: 5Gi requests: - cpu: "2" + cpu: '2' memory: 4Gi test-bin: limits: memory: 5Gi requests: - cpu: "2" + cpu: '2' memory: 4Gi unit: limits: memory: 5Gi requests: - cpu: "2" + cpu: '2' memory: 4Gi rpm_build_commands: make build-rpms tag_specification: - cluster: https://api.ci.openshift.org name: origin-v3.10 namespace: openshift + tag: '' + tag_overrides: {} +build_root: + image_stream_tag: + name: release + namespace: openshift + tag: golang-1.9 test_binary_build_commands: OS_GOFLAGS='-race' make build tests: - artifact_dir: /tmp/artifacts diff --git a/ci-operator/config/openshift/kubernetes-autoscaler/openshift-kubernetes-autoscaler-release-3.11.yaml b/ci-operator/config/openshift/kubernetes-autoscaler/openshift-kubernetes-autoscaler-release-3.11.yaml index 7ba64d7f5daaf..83527d97f15d0 100644 --- a/ci-operator/config/openshift/kubernetes-autoscaler/openshift-kubernetes-autoscaler-release-3.11.yaml +++ b/ci-operator/config/openshift/kubernetes-autoscaler/openshift-kubernetes-autoscaler-release-3.11.yaml @@ -4,12 +4,6 @@ base_rpm_images: namespace: openshift tag: base binary_build_commands: make build -build_root: - image_stream_tag: - cluster: https://api.ci.openshift.org - name: release - namespace: openshift - tag: golang-1.10 canonical_go_repository: k8s.io/autoscaler images: - context_dir: images/cluster-autoscaler/ @@ -26,25 +20,31 @@ resources: limits: memory: 5Gi requests: - cpu: "2" + cpu: '2' memory: 4Gi test-bin: limits: memory: 7Gi requests: - cpu: "2" + cpu: '2' memory: 4Gi unit: limits: memory: 7Gi requests: - cpu: "2" + cpu: '2' memory: 4Gi rpm_build_commands: make build-rpms tag_specification: - cluster: https://api.ci.openshift.org name: origin-v3.11 namespace: openshift + tag: '' + tag_overrides: {} +build_root: + image_stream_tag: + name: release + namespace: openshift + tag: golang-1.10 test_binary_build_commands: OS_GOFLAGS='-race' make build tests: - artifact_dir: /tmp/artifacts diff --git a/ci-operator/config/openshift/kubernetes-autoscaler/openshift-kubernetes-autoscaler-release-4.1.yaml b/ci-operator/config/openshift/kubernetes-autoscaler/openshift-kubernetes-autoscaler-release-4.1.yaml index e0875e785fbcd..2de339a6ee5f9 100644 --- a/ci-operator/config/openshift/kubernetes-autoscaler/openshift-kubernetes-autoscaler-release-4.1.yaml +++ b/ci-operator/config/openshift/kubernetes-autoscaler/openshift-kubernetes-autoscaler-release-4.1.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base binary_build_commands: make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -51,7 +49,6 @@ resources: cpu: "2" memory: 4Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp test_binary_build_commands: OS_GOFLAGS='-race' make build diff --git a/ci-operator/config/openshift/kubernetes-autoscaler/openshift-kubernetes-autoscaler-release-4.2.yaml b/ci-operator/config/openshift/kubernetes-autoscaler/openshift-kubernetes-autoscaler-release-4.2.yaml index 6b21c43218ce8..a6a0e0ee134b7 100644 --- a/ci-operator/config/openshift/kubernetes-autoscaler/openshift-kubernetes-autoscaler-release-4.2.yaml +++ b/ci-operator/config/openshift/kubernetes-autoscaler/openshift-kubernetes-autoscaler-release-4.2.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base binary_build_commands: make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -55,7 +53,6 @@ resources: cpu: "2" memory: 4Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp test_binary_build_commands: OS_GOFLAGS='-race' make build diff --git a/ci-operator/config/openshift/kubernetes-autoscaler/openshift-kubernetes-autoscaler-release-4.3.yaml b/ci-operator/config/openshift/kubernetes-autoscaler/openshift-kubernetes-autoscaler-release-4.3.yaml index ba0f32b37bdfd..4cd70f4d4e428 100644 --- a/ci-operator/config/openshift/kubernetes-autoscaler/openshift-kubernetes-autoscaler-release-4.3.yaml +++ b/ci-operator/config/openshift/kubernetes-autoscaler/openshift-kubernetes-autoscaler-release-4.3.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base binary_build_commands: make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -56,7 +54,6 @@ resources: cpu: "2" memory: 8Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp test_binary_build_commands: OS_GOFLAGS='-race' make build diff --git a/ci-operator/config/openshift/kubernetes-autoscaler/openshift-kubernetes-autoscaler-release-4.4.yaml b/ci-operator/config/openshift/kubernetes-autoscaler/openshift-kubernetes-autoscaler-release-4.4.yaml index a49746f950757..9c4e53640f01b 100644 --- a/ci-operator/config/openshift/kubernetes-autoscaler/openshift-kubernetes-autoscaler-release-4.4.yaml +++ b/ci-operator/config/openshift/kubernetes-autoscaler/openshift-kubernetes-autoscaler-release-4.4.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base binary_build_commands: make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -55,7 +53,6 @@ resources: cpu: "2" memory: 8Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp test_binary_build_commands: OS_GOFLAGS='-race' make build diff --git a/ci-operator/config/openshift/kubernetes-kube-storage-version-migrator/openshift-kubernetes-kube-storage-version-migrator-master.yaml b/ci-operator/config/openshift/kubernetes-kube-storage-version-migrator/openshift-kubernetes-kube-storage-version-migrator-master.yaml index b6f0e4d33216b..7aa7a665847f9 100644 --- a/ci-operator/config/openshift/kubernetes-kube-storage-version-migrator/openshift-kubernetes-kube-storage-version-migrator-master.yaml +++ b/ci-operator/config/openshift/kubernetes-kube-storage-version-migrator/openshift-kubernetes-kube-storage-version-migrator-master.yaml @@ -1,6 +1,5 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base @@ -27,7 +26,6 @@ resources: cpu: "3" memory: 1Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/kubernetes-kube-storage-version-migrator/openshift-kubernetes-kube-storage-version-migrator-release-4.3.yaml b/ci-operator/config/openshift/kubernetes-kube-storage-version-migrator/openshift-kubernetes-kube-storage-version-migrator-release-4.3.yaml index 9bcca49f3a638..6f73fec0760a4 100644 --- a/ci-operator/config/openshift/kubernetes-kube-storage-version-migrator/openshift-kubernetes-kube-storage-version-migrator-release-4.3.yaml +++ b/ci-operator/config/openshift/kubernetes-kube-storage-version-migrator/openshift-kubernetes-kube-storage-version-migrator-release-4.3.yaml @@ -1,6 +1,5 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base @@ -28,7 +27,6 @@ resources: cpu: "3" memory: 1Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/kubernetes-kube-storage-version-migrator/openshift-kubernetes-kube-storage-version-migrator-release-4.4.yaml b/ci-operator/config/openshift/kubernetes-kube-storage-version-migrator/openshift-kubernetes-kube-storage-version-migrator-release-4.4.yaml index a2738693d4a25..1bdb8b5812e7f 100644 --- a/ci-operator/config/openshift/kubernetes-kube-storage-version-migrator/openshift-kubernetes-kube-storage-version-migrator-release-4.4.yaml +++ b/ci-operator/config/openshift/kubernetes-kube-storage-version-migrator/openshift-kubernetes-kube-storage-version-migrator-release-4.4.yaml @@ -1,6 +1,5 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base @@ -27,7 +26,6 @@ resources: cpu: "3" memory: 1Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/kubernetes-metrics-server/openshift-kubernetes-metrics-server-release-3.10.yaml b/ci-operator/config/openshift/kubernetes-metrics-server/openshift-kubernetes-metrics-server-release-3.10.yaml index 3f932e7a61234..1f3de7bdf49db 100644 --- a/ci-operator/config/openshift/kubernetes-metrics-server/openshift-kubernetes-metrics-server-release-3.10.yaml +++ b/ci-operator/config/openshift/kubernetes-metrics-server/openshift-kubernetes-metrics-server-release-3.10.yaml @@ -4,12 +4,6 @@ base_rpm_images: namespace: openshift tag: base binary_build_commands: make build -build_root: - image_stream_tag: - cluster: https://api.ci.openshift.org - name: release - namespace: openshift - tag: golang-1.9 canonical_go_repository: github.com/kubernetes-incubator/metrics-server images: - context_dir: images/metrics-server/ @@ -24,9 +18,15 @@ resources: memory: 200Mi rpm_build_commands: make build-rpms tag_specification: - cluster: https://api.ci.openshift.org name: origin-v3.10 namespace: openshift + tag: '' + tag_overrides: {} +build_root: + image_stream_tag: + name: release + namespace: openshift + tag: golang-1.9 test_binary_build_commands: OS_GOFLAGS='-race' make build tests: - artifact_dir: /tmp/artifacts diff --git a/ci-operator/config/openshift/kubernetes-metrics-server/openshift-kubernetes-metrics-server-release-3.11.yaml b/ci-operator/config/openshift/kubernetes-metrics-server/openshift-kubernetes-metrics-server-release-3.11.yaml index ec0d28baaea52..a37ee08cbc0df 100644 --- a/ci-operator/config/openshift/kubernetes-metrics-server/openshift-kubernetes-metrics-server-release-3.11.yaml +++ b/ci-operator/config/openshift/kubernetes-metrics-server/openshift-kubernetes-metrics-server-release-3.11.yaml @@ -4,12 +4,6 @@ base_rpm_images: namespace: openshift tag: base binary_build_commands: make build -build_root: - image_stream_tag: - cluster: https://api.ci.openshift.org - name: release - namespace: openshift - tag: golang-1.10 canonical_go_repository: github.com/kubernetes-incubator/metrics-server images: - context_dir: images/metrics-server/ @@ -24,9 +18,15 @@ resources: memory: 200Mi rpm_build_commands: make build-rpms tag_specification: - cluster: https://api.ci.openshift.org name: origin-v3.11 namespace: openshift + tag: '' + tag_overrides: {} +build_root: + image_stream_tag: + name: release + namespace: openshift + tag: golang-1.10 test_binary_build_commands: OS_GOFLAGS='-race' make build tests: - artifact_dir: /tmp/artifacts diff --git a/ci-operator/config/openshift/kubernetes/openshift-kubernetes-oc-4.2-kubernetes-1.14.0.yaml b/ci-operator/config/openshift/kubernetes/openshift-kubernetes-oc-4.2-kubernetes-1.14.0.yaml index 769407d354603..6dba107903489 100644 --- a/ci-operator/config/openshift/kubernetes/openshift-kubernetes-oc-4.2-kubernetes-1.14.0.yaml +++ b/ci-operator/config/openshift/kubernetes/openshift-kubernetes-oc-4.2-kubernetes-1.14.0.yaml @@ -1,7 +1,6 @@ binary_build_commands: make build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 diff --git a/ci-operator/config/openshift/kubernetes/openshift-kubernetes-oc-4.3-kubernetes-1.16.2.yaml b/ci-operator/config/openshift/kubernetes/openshift-kubernetes-oc-4.3-kubernetes-1.16.2.yaml index ffa626dd42565..8183833bf670c 100644 --- a/ci-operator/config/openshift/kubernetes/openshift-kubernetes-oc-4.3-kubernetes-1.16.2.yaml +++ b/ci-operator/config/openshift/kubernetes/openshift-kubernetes-oc-4.3-kubernetes-1.16.2.yaml @@ -1,7 +1,6 @@ binary_build_commands: make build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 diff --git a/ci-operator/config/openshift/kubernetes/openshift-kubernetes-origin-4.2-kubernetes-1.14.0.yaml b/ci-operator/config/openshift/kubernetes/openshift-kubernetes-origin-4.2-kubernetes-1.14.0.yaml index 769407d354603..6dba107903489 100644 --- a/ci-operator/config/openshift/kubernetes/openshift-kubernetes-origin-4.2-kubernetes-1.14.0.yaml +++ b/ci-operator/config/openshift/kubernetes/openshift-kubernetes-origin-4.2-kubernetes-1.14.0.yaml @@ -1,7 +1,6 @@ binary_build_commands: make build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 diff --git a/ci-operator/config/openshift/kubernetes/openshift-kubernetes-origin-4.3-kubernetes-1.16.0-beta.2.yaml b/ci-operator/config/openshift/kubernetes/openshift-kubernetes-origin-4.3-kubernetes-1.16.0-beta.2.yaml index 769407d354603..6dba107903489 100644 --- a/ci-operator/config/openshift/kubernetes/openshift-kubernetes-origin-4.3-kubernetes-1.16.0-beta.2.yaml +++ b/ci-operator/config/openshift/kubernetes/openshift-kubernetes-origin-4.3-kubernetes-1.16.0-beta.2.yaml @@ -1,7 +1,6 @@ binary_build_commands: make build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 diff --git a/ci-operator/config/openshift/kubernetes/openshift-kubernetes-sdn-4.2-kubernetes-1.14.0.yaml b/ci-operator/config/openshift/kubernetes/openshift-kubernetes-sdn-4.2-kubernetes-1.14.0.yaml index 769407d354603..6dba107903489 100644 --- a/ci-operator/config/openshift/kubernetes/openshift-kubernetes-sdn-4.2-kubernetes-1.14.0.yaml +++ b/ci-operator/config/openshift/kubernetes/openshift-kubernetes-sdn-4.2-kubernetes-1.14.0.yaml @@ -1,7 +1,6 @@ binary_build_commands: make build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 diff --git a/ci-operator/config/openshift/kuryr-kubernetes/openshift-kuryr-kubernetes-master.yaml b/ci-operator/config/openshift/kuryr-kubernetes/openshift-kuryr-kubernetes-master.yaml index cd7c68e55ea4b..c1157ad65614d 100644 --- a/ci-operator/config/openshift/kuryr-kubernetes/openshift-kuryr-kubernetes-master.yaml +++ b/ci-operator/config/openshift/kuryr-kubernetes/openshift-kuryr-kubernetes-master.yaml @@ -1,6 +1,5 @@ base_images: base: - cluster: https://api.ci.openshift.org name: ubi namespace: ocp tag: "8" @@ -11,7 +10,6 @@ base_rpm_images: tag: "8" build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -46,7 +44,6 @@ resources: rpm_build_commands: tools/build-rpm-rhel8.sh rpm_build_location: _output/RPMS/noarch tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/kuryr-kubernetes/openshift-kuryr-kubernetes-release-3.11.yaml b/ci-operator/config/openshift/kuryr-kubernetes/openshift-kuryr-kubernetes-release-3.11.yaml index a2712fee9b32f..623ca2222506a 100644 --- a/ci-operator/config/openshift/kuryr-kubernetes/openshift-kuryr-kubernetes-release-3.11.yaml +++ b/ci-operator/config/openshift/kuryr-kubernetes/openshift-kuryr-kubernetes-release-3.11.yaml @@ -1,6 +1,5 @@ base_images: base: - cluster: https://api.ci.openshift.org name: origin-v3.11 namespace: openshift tag: base @@ -11,7 +10,6 @@ base_rpm_images: tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -39,9 +37,10 @@ resources: rpm_build_commands: tools/build-rpm.sh rpm_build_location: _output/RPMS/noarch tag_specification: - cluster: https://api.ci.openshift.org name: origin-v3.11 namespace: openshift + tag: '' + tag_overrides: {} tests: - as: unit commands: tox -e py27 diff --git a/ci-operator/config/openshift/kuryr-kubernetes/openshift-kuryr-kubernetes-release-4.2.yaml b/ci-operator/config/openshift/kuryr-kubernetes/openshift-kuryr-kubernetes-release-4.2.yaml index 22a1eb6f94e3f..0efc54eb92320 100644 --- a/ci-operator/config/openshift/kuryr-kubernetes/openshift-kuryr-kubernetes-release-4.2.yaml +++ b/ci-operator/config/openshift/kuryr-kubernetes/openshift-kuryr-kubernetes-release-4.2.yaml @@ -1,6 +1,5 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base @@ -11,7 +10,6 @@ base_rpm_images: tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -45,7 +43,6 @@ resources: rpm_build_commands: tools/build-rpm.sh rpm_build_location: _output/RPMS/noarch tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/kuryr-kubernetes/openshift-kuryr-kubernetes-release-4.3.yaml b/ci-operator/config/openshift/kuryr-kubernetes/openshift-kuryr-kubernetes-release-4.3.yaml index 68ab1a396c72c..e5a2c4fbd8992 100644 --- a/ci-operator/config/openshift/kuryr-kubernetes/openshift-kuryr-kubernetes-release-4.3.yaml +++ b/ci-operator/config/openshift/kuryr-kubernetes/openshift-kuryr-kubernetes-release-4.3.yaml @@ -1,6 +1,5 @@ base_images: base: - cluster: https://api.ci.openshift.org name: ubi namespace: ocp tag: "8" @@ -11,7 +10,6 @@ base_rpm_images: tag: "8" build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -47,7 +45,6 @@ resources: rpm_build_commands: tools/build-rpm-rhel8.sh rpm_build_location: _output/RPMS/noarch tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/kuryr-kubernetes/openshift-kuryr-kubernetes-release-4.4.yaml b/ci-operator/config/openshift/kuryr-kubernetes/openshift-kuryr-kubernetes-release-4.4.yaml index f387bf5099c38..fce42c8b741f8 100644 --- a/ci-operator/config/openshift/kuryr-kubernetes/openshift-kuryr-kubernetes-release-4.4.yaml +++ b/ci-operator/config/openshift/kuryr-kubernetes/openshift-kuryr-kubernetes-release-4.4.yaml @@ -1,6 +1,5 @@ base_images: base: - cluster: https://api.ci.openshift.org name: ubi namespace: ocp tag: "8" @@ -11,7 +10,6 @@ base_rpm_images: tag: "8" build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -46,7 +44,6 @@ resources: rpm_build_commands: tools/build-rpm-rhel8.sh rpm_build_location: _output/RPMS/noarch tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/leader-elector/openshift-leader-elector-master.yaml b/ci-operator/config/openshift/leader-elector/openshift-leader-elector-master.yaml index fc0a6af4a3f96..c9ebd458e568b 100644 --- a/ci-operator/config/openshift/leader-elector/openshift-leader-elector-master.yaml +++ b/ci-operator/config/openshift/leader-elector/openshift-leader-elector-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/leader-elector/openshift-leader-elector-release-4.2.yaml b/ci-operator/config/openshift/leader-elector/openshift-leader-elector-release-4.2.yaml index 0dda890789005..b31f9360c1712 100644 --- a/ci-operator/config/openshift/leader-elector/openshift-leader-elector-release-4.2.yaml +++ b/ci-operator/config/openshift/leader-elector/openshift-leader-elector-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/leader-elector/openshift-leader-elector-release-4.3.yaml b/ci-operator/config/openshift/leader-elector/openshift-leader-elector-release-4.3.yaml index d14001ca1acee..4b6dbd601fa3d 100644 --- a/ci-operator/config/openshift/leader-elector/openshift-leader-elector-release-4.3.yaml +++ b/ci-operator/config/openshift/leader-elector/openshift-leader-elector-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -26,7 +24,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/leader-elector/openshift-leader-elector-release-4.4.yaml b/ci-operator/config/openshift/leader-elector/openshift-leader-elector-release-4.4.yaml index 8bc7083f1a86f..85469728096d0 100644 --- a/ci-operator/config/openshift/leader-elector/openshift-leader-elector-release-4.4.yaml +++ b/ci-operator/config/openshift/leader-elector/openshift-leader-elector-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/library-go/openshift-library-go-master.yaml b/ci-operator/config/openshift/library-go/openshift-library-go-master.yaml index f0c78bea81ed6..065fcc17d0604 100644 --- a/ci-operator/config/openshift/library-go/openshift-library-go-master.yaml +++ b/ci-operator/config/openshift/library-go/openshift-library-go-master.yaml @@ -1,13 +1,11 @@ base_images: os: - cluster: https://api.ci.openshift.org name: centos namespace: openshift tag: "7" binary_build_commands: make build --warn-undefined-variables build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -22,7 +20,6 @@ resources: cpu: "3" memory: 8Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/library-go/openshift-library-go-release-4.1.yaml b/ci-operator/config/openshift/library-go/openshift-library-go-release-4.1.yaml index 29911055e1c95..2305b31298311 100644 --- a/ci-operator/config/openshift/library-go/openshift-library-go-release-4.1.yaml +++ b/ci-operator/config/openshift/library-go/openshift-library-go-release-4.1.yaml @@ -1,13 +1,11 @@ base_images: os: - cluster: https://api.ci.openshift.org name: centos namespace: openshift tag: "7" binary_build_commands: make build --warn-undefined-variables build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.11 @@ -22,7 +20,6 @@ resources: cpu: "3" memory: 3Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/library-go/openshift-library-go-release-4.2.yaml b/ci-operator/config/openshift/library-go/openshift-library-go-release-4.2.yaml index f24ff102cb30f..76702cc083c5a 100644 --- a/ci-operator/config/openshift/library-go/openshift-library-go-release-4.2.yaml +++ b/ci-operator/config/openshift/library-go/openshift-library-go-release-4.2.yaml @@ -1,13 +1,11 @@ base_images: os: - cluster: https://api.ci.openshift.org name: centos namespace: openshift tag: "7" binary_build_commands: make build --warn-undefined-variables build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -22,7 +20,6 @@ resources: cpu: "3" memory: 8Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/library-go/openshift-library-go-release-4.3.yaml b/ci-operator/config/openshift/library-go/openshift-library-go-release-4.3.yaml index 0b29c304633bd..03d2ba1758f19 100644 --- a/ci-operator/config/openshift/library-go/openshift-library-go-release-4.3.yaml +++ b/ci-operator/config/openshift/library-go/openshift-library-go-release-4.3.yaml @@ -1,13 +1,11 @@ base_images: os: - cluster: https://api.ci.openshift.org name: centos namespace: openshift tag: "7" binary_build_commands: make build --warn-undefined-variables build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -23,7 +21,6 @@ resources: cpu: "3" memory: 8Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/library-go/openshift-library-go-release-4.4.yaml b/ci-operator/config/openshift/library-go/openshift-library-go-release-4.4.yaml index 3db8a2fd8661d..fcd943107acc3 100644 --- a/ci-operator/config/openshift/library-go/openshift-library-go-release-4.4.yaml +++ b/ci-operator/config/openshift/library-go/openshift-library-go-release-4.4.yaml @@ -1,13 +1,11 @@ base_images: os: - cluster: https://api.ci.openshift.org name: centos namespace: openshift tag: "7" binary_build_commands: make build --warn-undefined-variables build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -22,7 +20,6 @@ resources: cpu: "3" memory: 8Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/library/openshift-library-master.yaml b/ci-operator/config/openshift/library/openshift-library-master.yaml index a3b581badff0d..6a977f9e27f72 100644 --- a/ci-operator/config/openshift/library/openshift-library-master.yaml +++ b/ci-operator/config/openshift/library/openshift-library-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org - name: python + name: "python" namespace: openshift tag: "3.6" build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.11 diff --git a/ci-operator/config/openshift/linuxptp-daemon/openshift-linuxptp-daemon-master.yaml b/ci-operator/config/openshift/linuxptp-daemon/openshift-linuxptp-daemon-master.yaml index c45b5c7d825f6..3e1606c86cb41 100644 --- a/ci-operator/config/openshift/linuxptp-daemon/openshift-linuxptp-daemon-master.yaml +++ b/ci-operator/config/openshift/linuxptp-daemon/openshift-linuxptp-daemon-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/linuxptp-daemon/openshift-linuxptp-daemon-release-4.3.yaml b/ci-operator/config/openshift/linuxptp-daemon/openshift-linuxptp-daemon-release-4.3.yaml index 7fdc147c14a4b..616e0635a9b78 100644 --- a/ci-operator/config/openshift/linuxptp-daemon/openshift-linuxptp-daemon-release-4.3.yaml +++ b/ci-operator/config/openshift/linuxptp-daemon/openshift-linuxptp-daemon-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/linuxptp-daemon/openshift-linuxptp-daemon-release-4.4.yaml b/ci-operator/config/openshift/linuxptp-daemon/openshift-linuxptp-daemon-release-4.4.yaml index 0bf4403310f2b..95eb18cf34b18 100644 --- a/ci-operator/config/openshift/linuxptp-daemon/openshift-linuxptp-daemon-release-4.4.yaml +++ b/ci-operator/config/openshift/linuxptp-daemon/openshift-linuxptp-daemon-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/local-storage-operator/openshift-local-storage-operator-master.yaml b/ci-operator/config/openshift/local-storage-operator/openshift-local-storage-operator-master.yaml index c3f2c52bd4789..7273af3de5415 100644 --- a/ci-operator/config/openshift/local-storage-operator/openshift-local-storage-operator-master.yaml +++ b/ci-operator/config/openshift/local-storage-operator/openshift-local-storage-operator-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -38,7 +36,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/local-storage-operator/openshift-local-storage-operator-release-4.1.yaml b/ci-operator/config/openshift/local-storage-operator/openshift-local-storage-operator-release-4.1.yaml index 4dded484c82c4..afc9659ff9e4e 100644 --- a/ci-operator/config/openshift/local-storage-operator/openshift-local-storage-operator-release-4.1.yaml +++ b/ci-operator/config/openshift/local-storage-operator/openshift-local-storage-operator-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -38,7 +36,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/local-storage-operator/openshift-local-storage-operator-release-4.2.yaml b/ci-operator/config/openshift/local-storage-operator/openshift-local-storage-operator-release-4.2.yaml index 8ad8592d84080..dfa24905f8b11 100644 --- a/ci-operator/config/openshift/local-storage-operator/openshift-local-storage-operator-release-4.2.yaml +++ b/ci-operator/config/openshift/local-storage-operator/openshift-local-storage-operator-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -38,7 +36,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/local-storage-operator/openshift-local-storage-operator-release-4.3.yaml b/ci-operator/config/openshift/local-storage-operator/openshift-local-storage-operator-release-4.3.yaml index 53cc304f620a3..307ffc3432659 100644 --- a/ci-operator/config/openshift/local-storage-operator/openshift-local-storage-operator-release-4.3.yaml +++ b/ci-operator/config/openshift/local-storage-operator/openshift-local-storage-operator-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -39,7 +37,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/local-storage-operator/openshift-local-storage-operator-release-4.4.yaml b/ci-operator/config/openshift/local-storage-operator/openshift-local-storage-operator-release-4.4.yaml index 35e658c2022b9..dd4f3c432d398 100644 --- a/ci-operator/config/openshift/local-storage-operator/openshift-local-storage-operator-release-4.4.yaml +++ b/ci-operator/config/openshift/local-storage-operator/openshift-local-storage-operator-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -38,7 +36,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/loki/openshift-loki-master.yaml b/ci-operator/config/openshift/loki/openshift-loki-master.yaml index 1a2e01d86af96..3d9e6249ebed1 100644 --- a/ci-operator/config/openshift/loki/openshift-loki-master.yaml +++ b/ci-operator/config/openshift/loki/openshift-loki-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -28,6 +26,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp diff --git a/ci-operator/config/openshift/loki/openshift-loki-release-4.2.yaml b/ci-operator/config/openshift/loki/openshift-loki-release-4.2.yaml index 05e6b98a47061..675a504a08ee5 100644 --- a/ci-operator/config/openshift/loki/openshift-loki-release-4.2.yaml +++ b/ci-operator/config/openshift/loki/openshift-loki-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -28,6 +26,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp diff --git a/ci-operator/config/openshift/loki/openshift-loki-release-4.3.yaml b/ci-operator/config/openshift/loki/openshift-loki-release-4.3.yaml index 624b2c5cb3260..926a8859044d5 100644 --- a/ci-operator/config/openshift/loki/openshift-loki-release-4.3.yaml +++ b/ci-operator/config/openshift/loki/openshift-loki-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -29,6 +27,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp diff --git a/ci-operator/config/openshift/loki/openshift-loki-release-4.4.yaml b/ci-operator/config/openshift/loki/openshift-loki-release-4.4.yaml index 9ec6f5d3694b5..83cefc2b62466 100644 --- a/ci-operator/config/openshift/loki/openshift-loki-release-4.4.yaml +++ b/ci-operator/config/openshift/loki/openshift-loki-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -28,6 +26,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp diff --git a/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-master.yaml b/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-master.yaml index 6b49947a1a751..3c2a6aec63db5 100644 --- a/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-master.yaml +++ b/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-master.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base binary_build_commands: NO_DOCKER=1 make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.1.yaml b/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.1.yaml index ae1891a6e9095..a363cfc778771 100644 --- a/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.1.yaml +++ b/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.1.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base binary_build_commands: NO_DOCKER=1 make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.2.yaml b/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.2.yaml index 12582dfd786b6..64cb1e8967d41 100644 --- a/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.2.yaml +++ b/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.2.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base binary_build_commands: NO_DOCKER=1 make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.3.yaml b/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.3.yaml index 441ff9ba745eb..fab732c6a2e99 100644 --- a/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.3.yaml +++ b/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.3.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base binary_build_commands: NO_DOCKER=1 make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.4.yaml b/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.4.yaml index bf9e6315976e9..a57cdf96f8e67 100644 --- a/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.4.yaml +++ b/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.4.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base binary_build_commands: NO_DOCKER=1 make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-fcos.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-fcos.yaml index 13ee2e9546a19..9e6baef5e6b66 100644 --- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-fcos.yaml +++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-fcos.yaml @@ -1,22 +1,18 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: origin tag: base base-machine: - cluster: https://api.ci.openshift.org name: fedora namespace: openshift tag: "29" machine-os-content-base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: origin tag: machine-os-content build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -24,7 +20,8 @@ images: - dockerfile_path: Dockerfile from: base to: machine-config-operator -- from: base +- context: ci/prow/images/ + from: base inputs: base-machine-with-rpms: as: @@ -72,7 +69,6 @@ rpm_build_commands: |- rm -rf /go/.cache ${RPMBUILD_DIR} rpm_build_location: _rpmbuild/RPMS/ tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: origin tests: diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-master.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-master.yaml index 5815f22927780..323de879ebce1 100644 --- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-master.yaml +++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.1.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.1.yaml index dacac174d96ea..2d8fa21d148ee 100644 --- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.1.yaml +++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -37,7 +35,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.2.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.2.yaml index e77715667c059..b4d2cd1a11d20 100644 --- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.2.yaml +++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.3.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.3.yaml index a65c2b8fd3bd2..c5a0753fb9a1d 100644 --- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.3.yaml +++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.4.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.4.yaml index ef33849565308..a70958fdf1425 100644 --- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.4.yaml +++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/managed-cluster-config/openshift-managed-cluster-config-master.yaml b/ci-operator/config/openshift/managed-cluster-config/openshift-managed-cluster-config-master.yaml index 1226b8f51e932..99b9bd80c0360 100644 --- a/ci-operator/config/openshift/managed-cluster-config/openshift-managed-cluster-config-master.yaml +++ b/ci-operator/config/openshift/managed-cluster-config/openshift-managed-cluster-config-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,6 +23,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp diff --git a/ci-operator/config/openshift/managed-cluster-config/openshift-managed-cluster-config-release-4.2.yaml b/ci-operator/config/openshift/managed-cluster-config/openshift-managed-cluster-config-release-4.2.yaml index cd7df12958b70..43a3fae241b19 100644 --- a/ci-operator/config/openshift/managed-cluster-config/openshift-managed-cluster-config-release-4.2.yaml +++ b/ci-operator/config/openshift/managed-cluster-config/openshift-managed-cluster-config-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,6 +23,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp diff --git a/ci-operator/config/openshift/managed-cluster-config/openshift-managed-cluster-config-release-4.3.yaml b/ci-operator/config/openshift/managed-cluster-config/openshift-managed-cluster-config-release-4.3.yaml index 4e026749a0f80..81474f9c03013 100644 --- a/ci-operator/config/openshift/managed-cluster-config/openshift-managed-cluster-config-release-4.3.yaml +++ b/ci-operator/config/openshift/managed-cluster-config/openshift-managed-cluster-config-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -26,6 +24,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp diff --git a/ci-operator/config/openshift/managed-cluster-config/openshift-managed-cluster-config-release-4.4.yaml b/ci-operator/config/openshift/managed-cluster-config/openshift-managed-cluster-config-release-4.4.yaml index 9f1d58c43fcf3..41efdfa86f849 100644 --- a/ci-operator/config/openshift/managed-cluster-config/openshift-managed-cluster-config-release-4.4.yaml +++ b/ci-operator/config/openshift/managed-cluster-config/openshift-managed-cluster-config-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,6 +23,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp diff --git a/ci-operator/config/openshift/managed-velero-operator/openshift-managed-velero-operator-master.yaml b/ci-operator/config/openshift/managed-velero-operator/openshift-managed-velero-operator-master.yaml index f204504ce4b27..8552da7c74def 100644 --- a/ci-operator/config/openshift/managed-velero-operator/openshift-managed-velero-operator-master.yaml +++ b/ci-operator/config/openshift/managed-velero-operator/openshift-managed-velero-operator-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/managed-velero-operator/openshift-managed-velero-operator-release-4.2.yaml b/ci-operator/config/openshift/managed-velero-operator/openshift-managed-velero-operator-release-4.2.yaml index 469295feb9c93..61bf39a9eb356 100644 --- a/ci-operator/config/openshift/managed-velero-operator/openshift-managed-velero-operator-release-4.2.yaml +++ b/ci-operator/config/openshift/managed-velero-operator/openshift-managed-velero-operator-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/managed-velero-operator/openshift-managed-velero-operator-release-4.3.yaml b/ci-operator/config/openshift/managed-velero-operator/openshift-managed-velero-operator-release-4.3.yaml index a423042345955..8b478a0a9273d 100644 --- a/ci-operator/config/openshift/managed-velero-operator/openshift-managed-velero-operator-release-4.3.yaml +++ b/ci-operator/config/openshift/managed-velero-operator/openshift-managed-velero-operator-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/managed-velero-operator/openshift-managed-velero-operator-release-4.4.yaml b/ci-operator/config/openshift/managed-velero-operator/openshift-managed-velero-operator-release-4.4.yaml index 7d9129ef81305..7f849f081d3cb 100644 --- a/ci-operator/config/openshift/managed-velero-operator/openshift-managed-velero-operator-release-4.4.yaml +++ b/ci-operator/config/openshift/managed-velero-operator/openshift-managed-velero-operator-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/mdns-publisher/openshift-mdns-publisher-master.yaml b/ci-operator/config/openshift/mdns-publisher/openshift-mdns-publisher-master.yaml index b256dff009471..1b0b579ba9dd2 100644 --- a/ci-operator/config/openshift/mdns-publisher/openshift-mdns-publisher-master.yaml +++ b/ci-operator/config/openshift/mdns-publisher/openshift-mdns-publisher-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/mdns-publisher/openshift-mdns-publisher-release-4.2.yaml b/ci-operator/config/openshift/mdns-publisher/openshift-mdns-publisher-release-4.2.yaml index 682e7f2112639..bc656a1ae6b34 100644 --- a/ci-operator/config/openshift/mdns-publisher/openshift-mdns-publisher-release-4.2.yaml +++ b/ci-operator/config/openshift/mdns-publisher/openshift-mdns-publisher-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/mdns-publisher/openshift-mdns-publisher-release-4.3.yaml b/ci-operator/config/openshift/mdns-publisher/openshift-mdns-publisher-release-4.3.yaml index 6aaf1cab9e7e4..ed020a721b760 100644 --- a/ci-operator/config/openshift/mdns-publisher/openshift-mdns-publisher-release-4.3.yaml +++ b/ci-operator/config/openshift/mdns-publisher/openshift-mdns-publisher-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/mdns-publisher/openshift-mdns-publisher-release-4.4.yaml b/ci-operator/config/openshift/mdns-publisher/openshift-mdns-publisher-release-4.4.yaml index 02c9a5da45cec..a023fd68e5251 100644 --- a/ci-operator/config/openshift/mdns-publisher/openshift-mdns-publisher-release-4.4.yaml +++ b/ci-operator/config/openshift/mdns-publisher/openshift-mdns-publisher-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/metal3-smart-exporter/openshift-metal3-smart-exporter-master.yaml b/ci-operator/config/openshift/metal3-smart-exporter/openshift-metal3-smart-exporter-master.yaml index cccb1b3325810..635841b281058 100644 --- a/ci-operator/config/openshift/metal3-smart-exporter/openshift-metal3-smart-exporter-master.yaml +++ b/ci-operator/config/openshift/metal3-smart-exporter/openshift-metal3-smart-exporter-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -25,6 +23,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp diff --git a/ci-operator/config/openshift/metal3-smart-exporter/openshift-metal3-smart-exporter-release-4.2.yaml b/ci-operator/config/openshift/metal3-smart-exporter/openshift-metal3-smart-exporter-release-4.2.yaml index b0d382feb462d..d46b9a90b8819 100644 --- a/ci-operator/config/openshift/metal3-smart-exporter/openshift-metal3-smart-exporter-release-4.2.yaml +++ b/ci-operator/config/openshift/metal3-smart-exporter/openshift-metal3-smart-exporter-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -25,6 +23,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp diff --git a/ci-operator/config/openshift/metal3-smart-exporter/openshift-metal3-smart-exporter-release-4.3.yaml b/ci-operator/config/openshift/metal3-smart-exporter/openshift-metal3-smart-exporter-release-4.3.yaml index 329c75a412d8e..dbd23f2af7956 100644 --- a/ci-operator/config/openshift/metal3-smart-exporter/openshift-metal3-smart-exporter-release-4.3.yaml +++ b/ci-operator/config/openshift/metal3-smart-exporter/openshift-metal3-smart-exporter-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,6 +24,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp diff --git a/ci-operator/config/openshift/metal3-smart-exporter/openshift-metal3-smart-exporter-release-4.4.yaml b/ci-operator/config/openshift/metal3-smart-exporter/openshift-metal3-smart-exporter-release-4.4.yaml index ac15a57a47f61..d1282bddaee6d 100644 --- a/ci-operator/config/openshift/metal3-smart-exporter/openshift-metal3-smart-exporter-release-4.4.yaml +++ b/ci-operator/config/openshift/metal3-smart-exporter/openshift-metal3-smart-exporter-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -25,6 +23,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp diff --git a/ci-operator/config/openshift/multus-admission-controller/openshift-multus-admission-controller-master.yaml b/ci-operator/config/openshift/multus-admission-controller/openshift-multus-admission-controller-master.yaml index 3a132b9583e53..98e191561d397 100644 --- a/ci-operator/config/openshift/multus-admission-controller/openshift-multus-admission-controller-master.yaml +++ b/ci-operator/config/openshift/multus-admission-controller/openshift-multus-admission-controller-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/multus-admission-controller/openshift-multus-admission-controller-release-4.1.yaml b/ci-operator/config/openshift/multus-admission-controller/openshift-multus-admission-controller-release-4.1.yaml index 3b3cb0a1dabfe..c38d07a53275e 100644 --- a/ci-operator/config/openshift/multus-admission-controller/openshift-multus-admission-controller-release-4.1.yaml +++ b/ci-operator/config/openshift/multus-admission-controller/openshift-multus-admission-controller-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/multus-admission-controller/openshift-multus-admission-controller-release-4.2.yaml b/ci-operator/config/openshift/multus-admission-controller/openshift-multus-admission-controller-release-4.2.yaml index aee608df8da83..06a6fecccbf1a 100644 --- a/ci-operator/config/openshift/multus-admission-controller/openshift-multus-admission-controller-release-4.2.yaml +++ b/ci-operator/config/openshift/multus-admission-controller/openshift-multus-admission-controller-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/multus-admission-controller/openshift-multus-admission-controller-release-4.3.yaml b/ci-operator/config/openshift/multus-admission-controller/openshift-multus-admission-controller-release-4.3.yaml index c01efde1b4864..2c93343bd3298 100644 --- a/ci-operator/config/openshift/multus-admission-controller/openshift-multus-admission-controller-release-4.3.yaml +++ b/ci-operator/config/openshift/multus-admission-controller/openshift-multus-admission-controller-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -26,7 +24,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/multus-admission-controller/openshift-multus-admission-controller-release-4.4.yaml b/ci-operator/config/openshift/multus-admission-controller/openshift-multus-admission-controller-release-4.4.yaml index efe61cbf960d2..bba21940776a9 100644 --- a/ci-operator/config/openshift/multus-admission-controller/openshift-multus-admission-controller-release-4.4.yaml +++ b/ci-operator/config/openshift/multus-admission-controller/openshift-multus-admission-controller-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/multus-cni/openshift-multus-cni-master.yaml b/ci-operator/config/openshift/multus-cni/openshift-multus-cni-master.yaml index 91045f4a63f97..d1261f0fe7090 100644 --- a/ci-operator/config/openshift/multus-cni/openshift-multus-cni-master.yaml +++ b/ci-operator/config/openshift/multus-cni/openshift-multus-cni-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/multus-cni/openshift-multus-cni-release-4.1.yaml b/ci-operator/config/openshift/multus-cni/openshift-multus-cni-release-4.1.yaml index ed003e2cd691e..b94c80fc1f3a4 100644 --- a/ci-operator/config/openshift/multus-cni/openshift-multus-cni-release-4.1.yaml +++ b/ci-operator/config/openshift/multus-cni/openshift-multus-cni-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/multus-cni/openshift-multus-cni-release-4.2.yaml b/ci-operator/config/openshift/multus-cni/openshift-multus-cni-release-4.2.yaml index 7e6d3fd46b75d..9003f2fa31633 100644 --- a/ci-operator/config/openshift/multus-cni/openshift-multus-cni-release-4.2.yaml +++ b/ci-operator/config/openshift/multus-cni/openshift-multus-cni-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/multus-cni/openshift-multus-cni-release-4.3.yaml b/ci-operator/config/openshift/multus-cni/openshift-multus-cni-release-4.3.yaml index 93010d207a6d2..058922211ab96 100644 --- a/ci-operator/config/openshift/multus-cni/openshift-multus-cni-release-4.3.yaml +++ b/ci-operator/config/openshift/multus-cni/openshift-multus-cni-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -26,7 +24,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/multus-cni/openshift-multus-cni-release-4.4.yaml b/ci-operator/config/openshift/multus-cni/openshift-multus-cni-release-4.4.yaml index feb2a2814a917..a57db0739f548 100644 --- a/ci-operator/config/openshift/multus-cni/openshift-multus-cni-release-4.4.yaml +++ b/ci-operator/config/openshift/multus-cni/openshift-multus-cni-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/must-gather/openshift-must-gather-master.yaml b/ci-operator/config/openshift/must-gather/openshift-must-gather-master.yaml index db69d39aed0ef..ae0a30aa96502 100644 --- a/ci-operator/config/openshift/must-gather/openshift-must-gather-master.yaml +++ b/ci-operator/config/openshift/must-gather/openshift-must-gather-master.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: cli binary_build_commands: make build --warn-undefined-variables build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: "3" memory: 1Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/must-gather/openshift-must-gather-release-4.1.yaml b/ci-operator/config/openshift/must-gather/openshift-must-gather-release-4.1.yaml index 68469612141ac..6b153e5660188 100644 --- a/ci-operator/config/openshift/must-gather/openshift-must-gather-release-4.1.yaml +++ b/ci-operator/config/openshift/must-gather/openshift-must-gather-release-4.1.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: cli binary_build_commands: make build --warn-undefined-variables build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -26,7 +24,6 @@ resources: cpu: "3" memory: 1Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/must-gather/openshift-must-gather-release-4.2.yaml b/ci-operator/config/openshift/must-gather/openshift-must-gather-release-4.2.yaml index 779ef217f6d36..093d6e5244b28 100644 --- a/ci-operator/config/openshift/must-gather/openshift-must-gather-release-4.2.yaml +++ b/ci-operator/config/openshift/must-gather/openshift-must-gather-release-4.2.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: cli binary_build_commands: make build --warn-undefined-variables build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: "3" memory: 1Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/must-gather/openshift-must-gather-release-4.3.yaml b/ci-operator/config/openshift/must-gather/openshift-must-gather-release-4.3.yaml index c3ee0c1064816..f0e83db2a4372 100644 --- a/ci-operator/config/openshift/must-gather/openshift-must-gather-release-4.3.yaml +++ b/ci-operator/config/openshift/must-gather/openshift-must-gather-release-4.3.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: cli binary_build_commands: make build --warn-undefined-variables build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -27,7 +25,6 @@ resources: cpu: "3" memory: 1Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/must-gather/openshift-must-gather-release-4.4.yaml b/ci-operator/config/openshift/must-gather/openshift-must-gather-release-4.4.yaml index 5aa4e4e7adc24..395e6673646de 100644 --- a/ci-operator/config/openshift/must-gather/openshift-must-gather-release-4.4.yaml +++ b/ci-operator/config/openshift/must-gather/openshift-must-gather-release-4.4.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: cli binary_build_commands: make build --warn-undefined-variables build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: "3" memory: 1Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/node-feature-discovery/openshift-node-feature-discovery-master.yaml b/ci-operator/config/openshift/node-feature-discovery/openshift-node-feature-discovery-master.yaml index 3729d892e486c..7600e4874e6c1 100644 --- a/ci-operator/config/openshift/node-feature-discovery/openshift-node-feature-discovery-master.yaml +++ b/ci-operator/config/openshift/node-feature-discovery/openshift-node-feature-discovery-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -29,7 +27,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/node-feature-discovery/openshift-node-feature-discovery-release-4.1.yaml b/ci-operator/config/openshift/node-feature-discovery/openshift-node-feature-discovery-release-4.1.yaml index 41b51623dba41..0b6c0ea84ceb6 100644 --- a/ci-operator/config/openshift/node-feature-discovery/openshift-node-feature-discovery-release-4.1.yaml +++ b/ci-operator/config/openshift/node-feature-discovery/openshift-node-feature-discovery-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -30,7 +28,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/node-feature-discovery/openshift-node-feature-discovery-release-4.2.yaml b/ci-operator/config/openshift/node-feature-discovery/openshift-node-feature-discovery-release-4.2.yaml index 54809037da068..a42d08589548a 100644 --- a/ci-operator/config/openshift/node-feature-discovery/openshift-node-feature-discovery-release-4.2.yaml +++ b/ci-operator/config/openshift/node-feature-discovery/openshift-node-feature-discovery-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -29,7 +27,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/node-feature-discovery/openshift-node-feature-discovery-release-4.3.yaml b/ci-operator/config/openshift/node-feature-discovery/openshift-node-feature-discovery-release-4.3.yaml index 98d40bdbae203..8db8b45c39364 100644 --- a/ci-operator/config/openshift/node-feature-discovery/openshift-node-feature-discovery-release-4.3.yaml +++ b/ci-operator/config/openshift/node-feature-discovery/openshift-node-feature-discovery-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -30,7 +28,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/node-feature-discovery/openshift-node-feature-discovery-release-4.4.yaml b/ci-operator/config/openshift/node-feature-discovery/openshift-node-feature-discovery-release-4.4.yaml index 8ce5aee3716c4..b9e1a1e4b57ee 100644 --- a/ci-operator/config/openshift/node-feature-discovery/openshift-node-feature-discovery-release-4.4.yaml +++ b/ci-operator/config/openshift/node-feature-discovery/openshift-node-feature-discovery-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -29,7 +27,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/node-problem-detector-operator/openshift-node-problem-detector-operator-master.yaml b/ci-operator/config/openshift/node-problem-detector-operator/openshift-node-problem-detector-operator-master.yaml index c816c5d04b1a1..771a88580db13 100644 --- a/ci-operator/config/openshift/node-problem-detector-operator/openshift-node-problem-detector-operator-master.yaml +++ b/ci-operator/config/openshift/node-problem-detector-operator/openshift-node-problem-detector-operator-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -24,6 +22,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp diff --git a/ci-operator/config/openshift/node-problem-detector-operator/openshift-node-problem-detector-operator-release-4.1.yaml b/ci-operator/config/openshift/node-problem-detector-operator/openshift-node-problem-detector-operator-release-4.1.yaml index bbb6f741a41e1..6a345cfc9d599 100644 --- a/ci-operator/config/openshift/node-problem-detector-operator/openshift-node-problem-detector-operator-release-4.1.yaml +++ b/ci-operator/config/openshift/node-problem-detector-operator/openshift-node-problem-detector-operator-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -24,6 +22,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp diff --git a/ci-operator/config/openshift/node-problem-detector-operator/openshift-node-problem-detector-operator-release-4.2.yaml b/ci-operator/config/openshift/node-problem-detector-operator/openshift-node-problem-detector-operator-release-4.2.yaml index 99d37c393713b..9696c669160b2 100644 --- a/ci-operator/config/openshift/node-problem-detector-operator/openshift-node-problem-detector-operator-release-4.2.yaml +++ b/ci-operator/config/openshift/node-problem-detector-operator/openshift-node-problem-detector-operator-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -24,6 +22,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp diff --git a/ci-operator/config/openshift/node-problem-detector-operator/openshift-node-problem-detector-operator-release-4.3.yaml b/ci-operator/config/openshift/node-problem-detector-operator/openshift-node-problem-detector-operator-release-4.3.yaml index 30008322d168d..110e659ceae6e 100644 --- a/ci-operator/config/openshift/node-problem-detector-operator/openshift-node-problem-detector-operator-release-4.3.yaml +++ b/ci-operator/config/openshift/node-problem-detector-operator/openshift-node-problem-detector-operator-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,6 +23,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp diff --git a/ci-operator/config/openshift/node-problem-detector-operator/openshift-node-problem-detector-operator-release-4.4.yaml b/ci-operator/config/openshift/node-problem-detector-operator/openshift-node-problem-detector-operator-release-4.4.yaml index 2e71b11e6c87b..fd0c7629a7c90 100644 --- a/ci-operator/config/openshift/node-problem-detector-operator/openshift-node-problem-detector-operator-release-4.4.yaml +++ b/ci-operator/config/openshift/node-problem-detector-operator/openshift-node-problem-detector-operator-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -24,6 +22,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp diff --git a/ci-operator/config/openshift/node-problem-detector/openshift-node-problem-detector-master.yaml b/ci-operator/config/openshift/node-problem-detector/openshift-node-problem-detector-master.yaml index ad8007b654ade..62b24b822431f 100644 --- a/ci-operator/config/openshift/node-problem-detector/openshift-node-problem-detector-master.yaml +++ b/ci-operator/config/openshift/node-problem-detector/openshift-node-problem-detector-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,6 +23,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp diff --git a/ci-operator/config/openshift/node-problem-detector/openshift-node-problem-detector-release-4.1.yaml b/ci-operator/config/openshift/node-problem-detector/openshift-node-problem-detector-release-4.1.yaml index 8a43e3b5ad72c..d1284d9dc80c5 100644 --- a/ci-operator/config/openshift/node-problem-detector/openshift-node-problem-detector-release-4.1.yaml +++ b/ci-operator/config/openshift/node-problem-detector/openshift-node-problem-detector-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,6 +23,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp diff --git a/ci-operator/config/openshift/node-problem-detector/openshift-node-problem-detector-release-4.2.yaml b/ci-operator/config/openshift/node-problem-detector/openshift-node-problem-detector-release-4.2.yaml index 40b3a9bc21632..18c9b99d7abff 100644 --- a/ci-operator/config/openshift/node-problem-detector/openshift-node-problem-detector-release-4.2.yaml +++ b/ci-operator/config/openshift/node-problem-detector/openshift-node-problem-detector-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,6 +23,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp diff --git a/ci-operator/config/openshift/node-problem-detector/openshift-node-problem-detector-release-4.3.yaml b/ci-operator/config/openshift/node-problem-detector/openshift-node-problem-detector-release-4.3.yaml index 830382f28edce..b4eb2ebf03b21 100644 --- a/ci-operator/config/openshift/node-problem-detector/openshift-node-problem-detector-release-4.3.yaml +++ b/ci-operator/config/openshift/node-problem-detector/openshift-node-problem-detector-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -26,6 +24,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp diff --git a/ci-operator/config/openshift/node-problem-detector/openshift-node-problem-detector-release-4.4.yaml b/ci-operator/config/openshift/node-problem-detector/openshift-node-problem-detector-release-4.4.yaml index e3aba9d59eb5c..6911b42a39497 100644 --- a/ci-operator/config/openshift/node-problem-detector/openshift-node-problem-detector-release-4.4.yaml +++ b/ci-operator/config/openshift/node-problem-detector/openshift-node-problem-detector-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,6 +23,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp diff --git a/ci-operator/config/openshift/node_exporter/openshift-node_exporter-master.yaml b/ci-operator/config/openshift/node_exporter/openshift-node_exporter-master.yaml index 0a45181e5dfe1..78f264028002e 100644 --- a/ci-operator/config/openshift/node_exporter/openshift-node_exporter-master.yaml +++ b/ci-operator/config/openshift/node_exporter/openshift-node_exporter-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/node_exporter/openshift-node_exporter-release-3.11.yaml b/ci-operator/config/openshift/node_exporter/openshift-node_exporter-release-3.11.yaml index f1d6786cc1970..18f2107bf9d8f 100644 --- a/ci-operator/config/openshift/node_exporter/openshift-node_exporter-release-3.11.yaml +++ b/ci-operator/config/openshift/node_exporter/openshift-node_exporter-release-3.11.yaml @@ -1,15 +1,8 @@ base_images: base: - cluster: https://api.ci.openshift.org name: origin-v3.11 namespace: openshift tag: base -build_root: - image_stream_tag: - cluster: https://api.ci.openshift.org - name: release - namespace: openshift - tag: golang-1.10 images: - from: base to: prometheus-node-exporter @@ -21,6 +14,12 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: origin-v3.11 namespace: openshift + tag: '' + tag_overrides: {} +build_root: + image_stream_tag: + name: release + namespace: openshift + tag: golang-1.10 diff --git a/ci-operator/config/openshift/node_exporter/openshift-node_exporter-release-4.1.yaml b/ci-operator/config/openshift/node_exporter/openshift-node_exporter-release-4.1.yaml index 81b2889b39595..c797084d46a67 100644 --- a/ci-operator/config/openshift/node_exporter/openshift-node_exporter-release-4.1.yaml +++ b/ci-operator/config/openshift/node_exporter/openshift-node_exporter-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/node_exporter/openshift-node_exporter-release-4.2.yaml b/ci-operator/config/openshift/node_exporter/openshift-node_exporter-release-4.2.yaml index f038a0480c93d..fe142d7336eff 100644 --- a/ci-operator/config/openshift/node_exporter/openshift-node_exporter-release-4.2.yaml +++ b/ci-operator/config/openshift/node_exporter/openshift-node_exporter-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/node_exporter/openshift-node_exporter-release-4.3.yaml b/ci-operator/config/openshift/node_exporter/openshift-node_exporter-release-4.3.yaml index 856aa1fcd5f6a..9028f7120f15e 100644 --- a/ci-operator/config/openshift/node_exporter/openshift-node_exporter-release-4.3.yaml +++ b/ci-operator/config/openshift/node_exporter/openshift-node_exporter-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/node_exporter/openshift-node_exporter-release-4.4.yaml b/ci-operator/config/openshift/node_exporter/openshift-node_exporter-release-4.4.yaml index d408ac65e7a75..ab181f3b41df0 100644 --- a/ci-operator/config/openshift/node_exporter/openshift-node_exporter-release-4.4.yaml +++ b/ci-operator/config/openshift/node_exporter/openshift-node_exporter-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/oauth-proxy/openshift-oauth-proxy-master.yaml b/ci-operator/config/openshift/oauth-proxy/openshift-oauth-proxy-master.yaml index e11a52266a26f..4fa65971cd6c4 100644 --- a/ci-operator/config/openshift/oauth-proxy/openshift-oauth-proxy-master.yaml +++ b/ci-operator/config/openshift/oauth-proxy/openshift-oauth-proxy-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/oauth-proxy/openshift-oauth-proxy-release-3.11.yaml b/ci-operator/config/openshift/oauth-proxy/openshift-oauth-proxy-release-3.11.yaml index fcdb836f252ed..7195d9cd76a7b 100644 --- a/ci-operator/config/openshift/oauth-proxy/openshift-oauth-proxy-release-3.11.yaml +++ b/ci-operator/config/openshift/oauth-proxy/openshift-oauth-proxy-release-3.11.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: origin-v3.11 namespace: openshift tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -24,6 +22,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: origin-v3.11 namespace: openshift diff --git a/ci-operator/config/openshift/oauth-proxy/openshift-oauth-proxy-release-4.1.yaml b/ci-operator/config/openshift/oauth-proxy/openshift-oauth-proxy-release-4.1.yaml index c56ee34a67c77..4af63d41e7c3f 100644 --- a/ci-operator/config/openshift/oauth-proxy/openshift-oauth-proxy-release-4.1.yaml +++ b/ci-operator/config/openshift/oauth-proxy/openshift-oauth-proxy-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/oauth-proxy/openshift-oauth-proxy-release-4.2.yaml b/ci-operator/config/openshift/oauth-proxy/openshift-oauth-proxy-release-4.2.yaml index a3f36b017f9d6..251843f00c28c 100644 --- a/ci-operator/config/openshift/oauth-proxy/openshift-oauth-proxy-release-4.2.yaml +++ b/ci-operator/config/openshift/oauth-proxy/openshift-oauth-proxy-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/oauth-proxy/openshift-oauth-proxy-release-4.3.yaml b/ci-operator/config/openshift/oauth-proxy/openshift-oauth-proxy-release-4.3.yaml index 2d9e5cd942d00..3f1901728f8a6 100644 --- a/ci-operator/config/openshift/oauth-proxy/openshift-oauth-proxy-release-4.3.yaml +++ b/ci-operator/config/openshift/oauth-proxy/openshift-oauth-proxy-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/oauth-proxy/openshift-oauth-proxy-release-4.4.yaml b/ci-operator/config/openshift/oauth-proxy/openshift-oauth-proxy-release-4.4.yaml index b5c61509a5a0b..7071835ba590e 100644 --- a/ci-operator/config/openshift/oauth-proxy/openshift-oauth-proxy-release-4.4.yaml +++ b/ci-operator/config/openshift/oauth-proxy/openshift-oauth-proxy-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/oauth-server/openshift-oauth-server-master.yaml b/ci-operator/config/openshift/oauth-server/openshift-oauth-server-master.yaml index 06f2807153421..c3daea1677a88 100644 --- a/ci-operator/config/openshift/oauth-server/openshift-oauth-server-master.yaml +++ b/ci-operator/config/openshift/oauth-server/openshift-oauth-server-master.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base binary_build_commands: make build --warn-undefined-variables build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: "3" memory: 6Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/oauth-server/openshift-oauth-server-release-4.2.yaml b/ci-operator/config/openshift/oauth-server/openshift-oauth-server-release-4.2.yaml index 6919650143c20..499f863346e12 100644 --- a/ci-operator/config/openshift/oauth-server/openshift-oauth-server-release-4.2.yaml +++ b/ci-operator/config/openshift/oauth-server/openshift-oauth-server-release-4.2.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base binary_build_commands: make build --warn-undefined-variables build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: "3" memory: 6Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/oauth-server/openshift-oauth-server-release-4.3.yaml b/ci-operator/config/openshift/oauth-server/openshift-oauth-server-release-4.3.yaml index eb8fe1f9a39a2..cdefcb91a2268 100644 --- a/ci-operator/config/openshift/oauth-server/openshift-oauth-server-release-4.3.yaml +++ b/ci-operator/config/openshift/oauth-server/openshift-oauth-server-release-4.3.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base binary_build_commands: make build --warn-undefined-variables build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -27,7 +25,6 @@ resources: cpu: "3" memory: 6Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/oauth-server/openshift-oauth-server-release-4.4.yaml b/ci-operator/config/openshift/oauth-server/openshift-oauth-server-release-4.4.yaml index bb336e8ef828e..e7a638e0559fc 100644 --- a/ci-operator/config/openshift/oauth-server/openshift-oauth-server-release-4.4.yaml +++ b/ci-operator/config/openshift/oauth-server/openshift-oauth-server-release-4.4.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base binary_build_commands: make build --warn-undefined-variables build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: "3" memory: 6Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/oc/openshift-oc-master.yaml b/ci-operator/config/openshift/oc/openshift-oc-master.yaml index 67a62f32420a5..fe4c0a9f90ef4 100644 --- a/ci-operator/config/openshift/oc/openshift-oc-master.yaml +++ b/ci-operator/config/openshift/oc/openshift-oc-master.yaml @@ -1,23 +1,19 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base must-gather-base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: must-gather tests-base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: tests binary_build_commands: make build --warn-undefined-variables build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -94,7 +90,6 @@ rpm_build_commands: |- rpmbuild -ba --nodeps --define "_topdir $( pwd )/${RPMBUILD_DIR}" ${RPMBUILD_DIR}/SPECS/oc.spec --define 'os_git_vars ignore' rpm_build_location: _rpmbuild/RPMS/ tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/oc/openshift-oc-release-4.2.yaml b/ci-operator/config/openshift/oc/openshift-oc-release-4.2.yaml index dc5be468ef301..2732f544dfdbd 100644 --- a/ci-operator/config/openshift/oc/openshift-oc-release-4.2.yaml +++ b/ci-operator/config/openshift/oc/openshift-oc-release-4.2.yaml @@ -1,18 +1,15 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base tests-base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: tests binary_build_commands: make build --warn-undefined-variables build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -80,7 +77,6 @@ rpm_build_commands: |- rpmbuild -ba --nodeps --define "_topdir $( pwd )/${RPMBUILD_DIR}" ${RPMBUILD_DIR}/SPECS/oc.spec --define 'os_git_vars ignore' rpm_build_location: _rpmbuild/RPMS/ tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/oc/openshift-oc-release-4.3.yaml b/ci-operator/config/openshift/oc/openshift-oc-release-4.3.yaml index 1e874334166d6..dad34f5459e98 100644 --- a/ci-operator/config/openshift/oc/openshift-oc-release-4.3.yaml +++ b/ci-operator/config/openshift/oc/openshift-oc-release-4.3.yaml @@ -1,23 +1,19 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base must-gather-base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: must-gather tests-base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: tests binary_build_commands: make build --warn-undefined-variables build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -95,7 +91,6 @@ rpm_build_commands: |- rpmbuild -ba --nodeps --define "_topdir $( pwd )/${RPMBUILD_DIR}" ${RPMBUILD_DIR}/SPECS/oc.spec --define 'os_git_vars ignore' rpm_build_location: _rpmbuild/RPMS/ tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/oc/openshift-oc-release-4.4.yaml b/ci-operator/config/openshift/oc/openshift-oc-release-4.4.yaml index 5bf75f891cbe4..fe47201440270 100644 --- a/ci-operator/config/openshift/oc/openshift-oc-release-4.4.yaml +++ b/ci-operator/config/openshift/oc/openshift-oc-release-4.4.yaml @@ -1,23 +1,19 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base must-gather-base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: must-gather tests-base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: tests binary_build_commands: make build --warn-undefined-variables build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -94,7 +90,6 @@ rpm_build_commands: |- rpmbuild -ba --nodeps --define "_topdir $( pwd )/${RPMBUILD_DIR}" ${RPMBUILD_DIR}/SPECS/oc.spec --define 'os_git_vars ignore' rpm_build_location: _rpmbuild/RPMS/ tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/ocp-release-operator-sdk/openshift-ocp-release-operator-sdk-master.yaml b/ci-operator/config/openshift/ocp-release-operator-sdk/openshift-ocp-release-operator-sdk-master.yaml index c29f20f5b59e8..ec571ec1641c4 100644 --- a/ci-operator/config/openshift/ocp-release-operator-sdk/openshift-ocp-release-operator-sdk-master.yaml +++ b/ci-operator/config/openshift/ocp-release-operator-sdk/openshift-ocp-release-operator-sdk-master.yaml @@ -1,12 +1,10 @@ base_images: os: - cluster: https://api.ci.openshift.org name: ubi namespace: ocp tag: "7" build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.13 @@ -49,7 +47,6 @@ resources: cpu: 200m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp test_binary_build_commands: make build/operator-sdk-dev-x86_64-linux-gnu diff --git a/ci-operator/config/openshift/ocp-release-operator-sdk/openshift-ocp-release-operator-sdk-release-4.1.yaml b/ci-operator/config/openshift/ocp-release-operator-sdk/openshift-ocp-release-operator-sdk-release-4.1.yaml index 6bfae5fd87d95..10b873d85cba9 100644 --- a/ci-operator/config/openshift/ocp-release-operator-sdk/openshift-ocp-release-operator-sdk-release-4.1.yaml +++ b/ci-operator/config/openshift/ocp-release-operator-sdk/openshift-ocp-release-operator-sdk-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: ansible_runner: - cluster: https://api.ci.openshift.org name: ansible-runner namespace: openshift tag: latest build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,7 +23,6 @@ resources: cpu: 200m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp test_binary_build_commands: make build/operator-sdk-dev-x86_64-linux-gnu diff --git a/ci-operator/config/openshift/ocp-release-operator-sdk/openshift-ocp-release-operator-sdk-release-4.2.yaml b/ci-operator/config/openshift/ocp-release-operator-sdk/openshift-ocp-release-operator-sdk-release-4.2.yaml index d2f77e600ff90..961ca6e4788f6 100644 --- a/ci-operator/config/openshift/ocp-release-operator-sdk/openshift-ocp-release-operator-sdk-release-4.2.yaml +++ b/ci-operator/config/openshift/ocp-release-operator-sdk/openshift-ocp-release-operator-sdk-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: os: - cluster: https://api.ci.openshift.org name: ubi namespace: ocp tag: "7" build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -49,7 +47,6 @@ resources: cpu: 200m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp test_binary_build_commands: make build/operator-sdk-dev-x86_64-linux-gnu diff --git a/ci-operator/config/openshift/ocp-release-operator-sdk/openshift-ocp-release-operator-sdk-release-4.3.yaml b/ci-operator/config/openshift/ocp-release-operator-sdk/openshift-ocp-release-operator-sdk-release-4.3.yaml index 24f5a10aeee2e..dd5653555371b 100644 --- a/ci-operator/config/openshift/ocp-release-operator-sdk/openshift-ocp-release-operator-sdk-release-4.3.yaml +++ b/ci-operator/config/openshift/ocp-release-operator-sdk/openshift-ocp-release-operator-sdk-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: os: - cluster: https://api.ci.openshift.org name: ubi namespace: ocp tag: "7" build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.13 @@ -50,7 +48,6 @@ resources: cpu: 200m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp test_binary_build_commands: make build/operator-sdk-dev-x86_64-linux-gnu diff --git a/ci-operator/config/openshift/ocp-release-operator-sdk/openshift-ocp-release-operator-sdk-release-4.4.yaml b/ci-operator/config/openshift/ocp-release-operator-sdk/openshift-ocp-release-operator-sdk-release-4.4.yaml index 67dda460eb0cb..10c3a1b59431e 100644 --- a/ci-operator/config/openshift/ocp-release-operator-sdk/openshift-ocp-release-operator-sdk-release-4.4.yaml +++ b/ci-operator/config/openshift/ocp-release-operator-sdk/openshift-ocp-release-operator-sdk-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: os: - cluster: https://api.ci.openshift.org name: ubi namespace: ocp tag: "7" build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.13 @@ -49,7 +47,6 @@ resources: cpu: 200m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp test_binary_build_commands: make build/operator-sdk-dev-x86_64-linux-gnu diff --git a/ci-operator/config/openshift/ocs-operator/openshift-ocs-operator-master.yaml b/ci-operator/config/openshift/ocs-operator/openshift-ocs-operator-master.yaml index 8522657effc41..b20e0984415c8 100644 --- a/ci-operator/config/openshift/ocs-operator/openshift-ocs-operator-master.yaml +++ b/ci-operator/config/openshift/ocs-operator/openshift-ocs-operator-master.yaml @@ -1,16 +1,13 @@ base_images: must-gather: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: must-gather operator-registry: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: operator-registry os: - cluster: https://api.ci.openshift.org name: ubi namespace: ocp tag: "7" @@ -72,7 +69,7 @@ promotion: - ocs-operator - operator-registry-base - ocs-registry - name: ocs-4.3 + name: "ocs-4.3" namespace: ocp resources: '*': @@ -82,7 +79,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/ocs-operator/openshift-ocs-operator-release-4.2.yaml b/ci-operator/config/openshift/ocs-operator/openshift-ocs-operator-release-4.2.yaml index 7836cb12e74dc..9042cb8f79041 100644 --- a/ci-operator/config/openshift/ocs-operator/openshift-ocs-operator-release-4.2.yaml +++ b/ci-operator/config/openshift/ocs-operator/openshift-ocs-operator-release-4.2.yaml @@ -1,23 +1,23 @@ base_images: - must-gather: - cluster: https://api.ci.openshift.org - name: "4.3" - namespace: ocp - tag: must-gather operator-registry: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: operator-registry os: - cluster: https://api.ci.openshift.org name: ubi namespace: ocp tag: "7" + must-gather: + name: "4.3" + namespace: ocp + tag: must-gather + binary_build_commands: make build + build_root: project_image: dockerfile_path: openshift-ci/Dockerfile.tools + images: - dockerfile_path: openshift-ci/Dockerfile.deploy from: os @@ -27,12 +27,15 @@ images: - destination_dir: . source_path: /go/src/github.com/openshift/ocs-operator/build/_output/bin/ocs-operator to: ocs-operator + - dockerfile_path: openshift-ci/Dockerfile.registry.intermediate from: operator-registry to: operator-registry-base + - dockerfile_path: openshift-ci/Dockerfile.registry.build from: operator-registry-base to: ocs-registry + - dockerfile_path: build/Dockerfile from: os inputs: @@ -41,6 +44,7 @@ images: - destination_dir: _output/bin source_path: /go/src/github.com/openshift/ocs-operator/build/_output/bin/ocs-operator to: ocs-operator-quay + - dockerfile_path: deploy/Dockerfile from: operator-registry inputs: @@ -51,6 +55,7 @@ images: - destination_dir: . source_path: /go/src/github.com/openshift/ocs-operator/deploy/olm-catalog to: ocs-registry-quay + - dockerfile_path: must-gather/Dockerfile from: must-gather inputs: @@ -65,6 +70,7 @@ images: - destination_dir: . source_path: /go/src/github.com/openshift/ocs-operator/must-gather/templates to: ocs-must-gather-quay + promotion: additional_images: ocs-operator-tests: src @@ -72,8 +78,9 @@ promotion: - ocs-operator - operator-registry-base - ocs-registry - name: ocs-4.2 + name: "ocs-4.2" namespace: ocp + resources: '*': limits: @@ -81,21 +88,24 @@ resources: requests: cpu: 100m memory: 200Mi + tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp + tests: - as: ocs-operator-ci commands: | make ocs-operator-ci container: from: src + - as: ocs-operator-e2e-aws commands: | make functest openshift_installer_src: cluster_profile: aws + - as: red-hat-storage-ocs-ci-e2e-aws commands: | export REDHAT_OCS_CI_FORCE_TOOL_POD_INSTALL="true" && make cluster-deploy && make red-hat-storage-ocs-ci diff --git a/ci-operator/config/openshift/ocs-operator/openshift-ocs-operator-release-4.3.yaml b/ci-operator/config/openshift/ocs-operator/openshift-ocs-operator-release-4.3.yaml index 1dab24f73ab23..26403b87b95d0 100644 --- a/ci-operator/config/openshift/ocs-operator/openshift-ocs-operator-release-4.3.yaml +++ b/ci-operator/config/openshift/ocs-operator/openshift-ocs-operator-release-4.3.yaml @@ -1,16 +1,13 @@ base_images: must-gather: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: must-gather operator-registry: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: operator-registry os: - cluster: https://api.ci.openshift.org name: ubi namespace: ocp tag: "7" @@ -73,7 +70,7 @@ promotion: - ocs-operator - operator-registry-base - ocs-registry - name: ocs-4.3 + name: "ocs-4.3" namespace: ocp resources: '*': @@ -83,7 +80,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/ocs-operator/openshift-ocs-operator-release-4.4.yaml b/ci-operator/config/openshift/ocs-operator/openshift-ocs-operator-release-4.4.yaml index b78da8d2a45ce..744b7bceeea89 100644 --- a/ci-operator/config/openshift/ocs-operator/openshift-ocs-operator-release-4.4.yaml +++ b/ci-operator/config/openshift/ocs-operator/openshift-ocs-operator-release-4.4.yaml @@ -1,16 +1,13 @@ base_images: must-gather: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: must-gather operator-registry: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: operator-registry os: - cluster: https://api.ci.openshift.org name: ubi namespace: ocp tag: "7" @@ -72,7 +69,7 @@ promotion: - ocs-operator - operator-registry-base - ocs-registry - name: ocs-4.4 + name: "ocs-4.4" namespace: ocp resources: '*': @@ -82,7 +79,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/odo/openshift-odo-master__v4.1.yaml b/ci-operator/config/openshift/odo/openshift-odo-master__v4.1.yaml index 2bd497c416632..5f6c57decdbb3 100644 --- a/ci-operator/config/openshift/odo/openshift-odo-master__v4.1.yaml +++ b/ci-operator/config/openshift/odo/openshift-odo-master__v4.1.yaml @@ -1,32 +1,38 @@ -binary_build_commands: make bin -build_root: - project_image: - dockerfile_path: openshift-ci/build-root/Dockerfile + resources: '*': - limits: null requests: - cpu: "3" memory: 5Gi + cpu: "3" + +build_root: + project_image: + dockerfile_path: openshift-ci/build-root/Dockerfile + tag_specification: - cluster: https://api.ci.openshift.org - name: "4.1" + name: '4.1' namespace: ocp + +binary_build_commands: make bin + tests: - artifact_dir: /tmp/artifacts as: unit commands: make openshiftci-presubmit-unittests container: from: src -- as: integration - commands: scripts/openshiftci-presubmit-integrationtests.sh +- artifacts_dir: /tmp/artifacts + as: integration openshift_installer_src: cluster_profile: aws -- as: e2e-scenarios - commands: scripts/openshiftci-presubmit-e2etests.sh + commands: scripts/openshiftci-presubmit-integrationtests.sh +- artifacts_dir: /tmp/artifacts + as: e2e-scenarios openshift_installer_src: cluster_profile: aws + commands: scripts/openshiftci-presubmit-e2etests.sh - as: benchmark + artifacts_dir: /tmp/artifacts commands: scripts/openshiftci-presubmit-benchmark.sh openshift_installer_src: - cluster_profile: aws + cluster_profile: aws \ No newline at end of file diff --git a/ci-operator/config/openshift/odo/openshift-odo-master__v4.2.yaml b/ci-operator/config/openshift/odo/openshift-odo-master__v4.2.yaml index 67c97e1447c69..34457913f63c0 100644 --- a/ci-operator/config/openshift/odo/openshift-odo-master__v4.2.yaml +++ b/ci-operator/config/openshift/odo/openshift-odo-master__v4.2.yaml @@ -1,27 +1,33 @@ -binary_build_commands: make bin -build_root: - project_image: - dockerfile_path: openshift-ci/build-root/Dockerfile + resources: '*': - limits: null requests: - cpu: "3" memory: 5Gi + cpu: "3" + +build_root: + project_image: + dockerfile_path: openshift-ci/build-root/Dockerfile + tag_specification: - cluster: https://api.ci.openshift.org - name: "4.2" + name: '4.2' namespace: ocp + +binary_build_commands: make bin + tests: -- as: integration - commands: scripts/openshiftci-presubmit-integrationtests.sh +- artifacts_dir: /tmp/artifacts + as: integration openshift_installer_src: cluster_profile: aws -- as: e2e-scenarios - commands: scripts/openshiftci-presubmit-e2etests.sh + commands: scripts/openshiftci-presubmit-integrationtests.sh +- artifacts_dir: /tmp/artifacts + as: e2e-scenarios openshift_installer_src: cluster_profile: aws + commands: scripts/openshiftci-presubmit-e2etests.sh - as: benchmark + artifacts_dir: /tmp/artifacts commands: scripts/openshiftci-presubmit-benchmark.sh openshift_installer_src: - cluster_profile: aws + cluster_profile: aws \ No newline at end of file diff --git a/ci-operator/config/openshift/odo/openshift-odo-master__v4.3.yaml b/ci-operator/config/openshift/odo/openshift-odo-master__v4.3.yaml index c363365358c96..c292ae3a859b5 100644 --- a/ci-operator/config/openshift/odo/openshift-odo-master__v4.3.yaml +++ b/ci-operator/config/openshift/odo/openshift-odo-master__v4.3.yaml @@ -1,27 +1,33 @@ -binary_build_commands: make bin -build_root: - project_image: - dockerfile_path: openshift-ci/build-root/Dockerfile + resources: '*': - limits: null requests: - cpu: "3" memory: 5Gi + cpu: "3" + +build_root: + project_image: + dockerfile_path: openshift-ci/build-root/Dockerfile + tag_specification: - cluster: https://api.ci.openshift.org - name: "4.3" + name: '4.3' namespace: ocp + +binary_build_commands: make bin + tests: -- as: integration - commands: scripts/openshiftci-presubmit-integrationtests.sh +- artifacts_dir: /tmp/artifacts + as: integration openshift_installer_src: cluster_profile: aws -- as: e2e-scenarios - commands: scripts/openshiftci-presubmit-e2etests.sh + commands: scripts/openshiftci-presubmit-integrationtests.sh +- artifacts_dir: /tmp/artifacts + as: e2e-scenarios openshift_installer_src: cluster_profile: aws + commands: scripts/openshiftci-presubmit-e2etests.sh - as: benchmark + artifacts_dir: /tmp/artifacts commands: scripts/openshiftci-presubmit-benchmark.sh openshift_installer_src: - cluster_profile: aws + cluster_profile: aws \ No newline at end of file diff --git a/ci-operator/config/openshift/openshift-ansible/openshift-openshift-ansible-master.yaml b/ci-operator/config/openshift/openshift-ansible/openshift-openshift-ansible-master.yaml index c394d1db2358a..097741101d8a3 100644 --- a/ci-operator/config/openshift/openshift-ansible/openshift-openshift-ansible-master.yaml +++ b/ci-operator/config/openshift/openshift-ansible/openshift-openshift-ansible-master.yaml @@ -5,7 +5,6 @@ base_rpm_images: tag: "7" build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -57,7 +56,6 @@ rpm_build_commands: tito tag --offline --accept-auto-changelog --use-release '99 -p _output/local/releases/rpms; mv _output/local/releases/noarch/* _output/local/releases/rpms; createrepo _output/local/releases/rpms tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp test_binary_build_commands: | diff --git a/ci-operator/config/openshift/openshift-ansible/openshift-openshift-ansible-release-3.10.yaml b/ci-operator/config/openshift/openshift-ansible/openshift-openshift-ansible-release-3.10.yaml index dad39abd0e104..9a8ab7c0dd1e9 100644 --- a/ci-operator/config/openshift/openshift-ansible/openshift-openshift-ansible-release-3.10.yaml +++ b/ci-operator/config/openshift/openshift-ansible/openshift-openshift-ansible-release-3.10.yaml @@ -3,12 +3,6 @@ base_rpm_images: name: origin-v3.10 namespace: openshift tag: base -build_root: - image_stream_tag: - cluster: https://api.ci.openshift.org - name: release - namespace: openshift - tag: golang-1.9 images: - dockerfile_path: images/installer/Dockerfile from: base @@ -24,16 +18,21 @@ resources: limits: memory: 3Gi requests: - cpu: "1" + cpu: '1' memory: 1.5Gi rpm_build_commands: tito tag --offline --accept-auto-changelog --use-release '9999%{?dist}'; - tito build --output="_output/local/releases" --rpm --test --offline --quiet; mkdir - -p _output/local/releases/rpms; mv _output/local/releases/noarch/* _output/local/releases/rpms; - createrepo _output/local/releases/rpms + tito build --output="_output/local/releases" --rpm --test --offline --quiet; mkdir -p _output/local/releases/rpms; mv + _output/local/releases/noarch/* _output/local/releases/rpms; createrepo _output/local/releases/rpms tag_specification: - cluster: https://api.ci.openshift.org name: origin-v3.10 namespace: openshift + tag: '' + tag_overrides: {} +build_root: + image_stream_tag: + name: release + namespace: openshift + tag: golang-1.9 test_binary_build_commands: | set -eo pipefail yum install -y gcc libffi-devel python-devel openssl-devel diff --git a/ci-operator/config/openshift/openshift-ansible/openshift-openshift-ansible-release-3.11.yaml b/ci-operator/config/openshift/openshift-ansible/openshift-openshift-ansible-release-3.11.yaml index 60a8d016b0131..b25ae5d243a26 100644 --- a/ci-operator/config/openshift/openshift-ansible/openshift-openshift-ansible-release-3.11.yaml +++ b/ci-operator/config/openshift/openshift-ansible/openshift-openshift-ansible-release-3.11.yaml @@ -3,12 +3,6 @@ base_rpm_images: name: origin-v3.11 namespace: openshift tag: base -build_root: - image_stream_tag: - cluster: https://api.ci.openshift.org - name: release - namespace: openshift - tag: golang-1.10 images: - dockerfile_path: images/installer/Dockerfile from: base @@ -24,16 +18,21 @@ resources: limits: memory: 3Gi requests: - cpu: "1" + cpu: '1' memory: 1.5Gi rpm_build_commands: tito tag --offline --accept-auto-changelog --use-release '9999%{?dist}'; - tito build --output="_output/local/releases" --rpm --test --offline --quiet; mkdir - -p _output/local/releases/rpms; mv _output/local/releases/noarch/* _output/local/releases/rpms; - createrepo _output/local/releases/rpms + tito build --output="_output/local/releases" --rpm --test --offline --quiet; mkdir -p _output/local/releases/rpms; mv + _output/local/releases/noarch/* _output/local/releases/rpms; createrepo _output/local/releases/rpms tag_specification: - cluster: https://api.ci.openshift.org name: origin-v3.11 namespace: openshift + tag: '' + tag_overrides: {} +build_root: + image_stream_tag: + name: release + namespace: openshift + tag: golang-1.10 test_binary_build_commands: | set -eo pipefail yum install -y gcc libffi-devel python-devel openssl-devel diff --git a/ci-operator/config/openshift/openshift-ansible/openshift-openshift-ansible-release-4.1.yaml b/ci-operator/config/openshift/openshift-ansible/openshift-openshift-ansible-release-4.1.yaml index 3ce59c7f0fe77..3cc3d50780a32 100644 --- a/ci-operator/config/openshift/openshift-ansible/openshift-openshift-ansible-release-4.1.yaml +++ b/ci-operator/config/openshift/openshift-ansible/openshift-openshift-ansible-release-4.1.yaml @@ -5,7 +5,6 @@ base_rpm_images: tag: "7" build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -57,7 +56,6 @@ rpm_build_commands: tito tag --offline --accept-auto-changelog --use-release '99 -p _output/local/releases/rpms; mv _output/local/releases/noarch/* _output/local/releases/rpms; createrepo _output/local/releases/rpms tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp test_binary_build_commands: | diff --git a/ci-operator/config/openshift/openshift-ansible/openshift-openshift-ansible-release-4.2.yaml b/ci-operator/config/openshift/openshift-ansible/openshift-openshift-ansible-release-4.2.yaml index a3ff39f2a17ab..516502d24130f 100644 --- a/ci-operator/config/openshift/openshift-ansible/openshift-openshift-ansible-release-4.2.yaml +++ b/ci-operator/config/openshift/openshift-ansible/openshift-openshift-ansible-release-4.2.yaml @@ -5,7 +5,6 @@ base_rpm_images: tag: "7" build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -57,7 +56,6 @@ rpm_build_commands: tito tag --offline --accept-auto-changelog --use-release '99 -p _output/local/releases/rpms; mv _output/local/releases/noarch/* _output/local/releases/rpms; createrepo _output/local/releases/rpms tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp test_binary_build_commands: | diff --git a/ci-operator/config/openshift/openshift-ansible/openshift-openshift-ansible-release-4.3.yaml b/ci-operator/config/openshift/openshift-ansible/openshift-openshift-ansible-release-4.3.yaml index 0b8abfc58c1d8..0b421100f7c0f 100644 --- a/ci-operator/config/openshift/openshift-ansible/openshift-openshift-ansible-release-4.3.yaml +++ b/ci-operator/config/openshift/openshift-ansible/openshift-openshift-ansible-release-4.3.yaml @@ -5,7 +5,6 @@ base_rpm_images: tag: "7" build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -58,7 +57,6 @@ rpm_build_commands: tito tag --offline --accept-auto-changelog --use-release '99 -p _output/local/releases/rpms; mv _output/local/releases/noarch/* _output/local/releases/rpms; createrepo _output/local/releases/rpms tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp test_binary_build_commands: | diff --git a/ci-operator/config/openshift/openshift-ansible/openshift-openshift-ansible-release-4.4.yaml b/ci-operator/config/openshift/openshift-ansible/openshift-openshift-ansible-release-4.4.yaml index 5a7aa27494c21..4ceaa7d6a8a5a 100644 --- a/ci-operator/config/openshift/openshift-ansible/openshift-openshift-ansible-release-4.4.yaml +++ b/ci-operator/config/openshift/openshift-ansible/openshift-openshift-ansible-release-4.4.yaml @@ -5,7 +5,6 @@ base_rpm_images: tag: "7" build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -57,7 +56,6 @@ rpm_build_commands: tito tag --offline --accept-auto-changelog --use-release '99 -p _output/local/releases/rpms; mv _output/local/releases/noarch/* _output/local/releases/rpms; createrepo _output/local/releases/rpms tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp test_binary_build_commands: | diff --git a/ci-operator/config/openshift/openshift-apiserver/openshift-openshift-apiserver-master.yaml b/ci-operator/config/openshift/openshift-apiserver/openshift-openshift-apiserver-master.yaml index c87dcfec370cc..b2494b250cad9 100644 --- a/ci-operator/config/openshift/openshift-apiserver/openshift-openshift-apiserver-master.yaml +++ b/ci-operator/config/openshift/openshift-apiserver/openshift-openshift-apiserver-master.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base binary_build_commands: make build --warn-undefined-variables build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -31,7 +29,6 @@ resources: cpu: "3" memory: 6Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/openshift-apiserver/openshift-openshift-apiserver-release-4.2.yaml b/ci-operator/config/openshift/openshift-apiserver/openshift-openshift-apiserver-release-4.2.yaml index 680c13e6998ae..34a9eb622f1b1 100644 --- a/ci-operator/config/openshift/openshift-apiserver/openshift-openshift-apiserver-release-4.2.yaml +++ b/ci-operator/config/openshift/openshift-apiserver/openshift-openshift-apiserver-release-4.2.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base binary_build_commands: make build --warn-undefined-variables build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -31,7 +29,6 @@ resources: cpu: "3" memory: 6Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/openshift-apiserver/openshift-openshift-apiserver-release-4.3.yaml b/ci-operator/config/openshift/openshift-apiserver/openshift-openshift-apiserver-release-4.3.yaml index 17644584ed431..1b17d9d051475 100644 --- a/ci-operator/config/openshift/openshift-apiserver/openshift-openshift-apiserver-release-4.3.yaml +++ b/ci-operator/config/openshift/openshift-apiserver/openshift-openshift-apiserver-release-4.3.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base binary_build_commands: make build --warn-undefined-variables build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -32,7 +30,6 @@ resources: cpu: "3" memory: 6Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/openshift-apiserver/openshift-openshift-apiserver-release-4.4.yaml b/ci-operator/config/openshift/openshift-apiserver/openshift-openshift-apiserver-release-4.4.yaml index 678e7548952e3..029211f31081b 100644 --- a/ci-operator/config/openshift/openshift-apiserver/openshift-openshift-apiserver-release-4.4.yaml +++ b/ci-operator/config/openshift/openshift-apiserver/openshift-openshift-apiserver-release-4.4.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base binary_build_commands: make build --warn-undefined-variables build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -31,7 +29,6 @@ resources: cpu: "3" memory: 6Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/openshift-azure/openshift-openshift-azure-master.yaml b/ci-operator/config/openshift/openshift-azure/openshift-openshift-azure-master.yaml index 3093807e327d0..6698185c1184a 100644 --- a/ci-operator/config/openshift/openshift-azure/openshift-openshift-azure-master.yaml +++ b/ci-operator/config/openshift/openshift-azure/openshift-openshift-azure-master.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: plugin-base namespace: azure tag: latest binary_build_commands: make all build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: test-base namespace: azure tag: latest @@ -25,10 +23,9 @@ promotion: namespace: azure resources: '*': - limits: null requests: cpu: 10m tag_specification: - cluster: https://api.ci.openshift.org name: origin-v3.11 namespace: openshift +tests: [] diff --git a/ci-operator/config/openshift/openshift-azure/openshift-openshift-azure-release-v10.yaml b/ci-operator/config/openshift/openshift-azure/openshift-openshift-azure-release-v10.yaml index 7771485f607aa..02f5da47598c5 100644 --- a/ci-operator/config/openshift/openshift-azure/openshift-openshift-azure-release-v10.yaml +++ b/ci-operator/config/openshift/openshift-azure/openshift-openshift-azure-release-v10.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: plugin-base namespace: azure tag: latest binary_build_commands: make all build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: test-base namespace: azure tag: latest @@ -22,10 +20,9 @@ images: to: azure resources: '*': - limits: null requests: cpu: 10m tag_specification: - cluster: https://api.ci.openshift.org name: origin-v3.11 namespace: openshift +tests: [] diff --git a/ci-operator/config/openshift/openshift-azure/openshift-openshift-azure-release-v11.yaml b/ci-operator/config/openshift/openshift-azure/openshift-openshift-azure-release-v11.yaml index 7771485f607aa..02f5da47598c5 100644 --- a/ci-operator/config/openshift/openshift-azure/openshift-openshift-azure-release-v11.yaml +++ b/ci-operator/config/openshift/openshift-azure/openshift-openshift-azure-release-v11.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: plugin-base namespace: azure tag: latest binary_build_commands: make all build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: test-base namespace: azure tag: latest @@ -22,10 +20,9 @@ images: to: azure resources: '*': - limits: null requests: cpu: 10m tag_specification: - cluster: https://api.ci.openshift.org name: origin-v3.11 namespace: openshift +tests: [] diff --git a/ci-operator/config/openshift/openshift-azure/openshift-openshift-azure-release-v7.yaml b/ci-operator/config/openshift/openshift-azure/openshift-openshift-azure-release-v7.yaml index 7771485f607aa..02f5da47598c5 100644 --- a/ci-operator/config/openshift/openshift-azure/openshift-openshift-azure-release-v7.yaml +++ b/ci-operator/config/openshift/openshift-azure/openshift-openshift-azure-release-v7.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: plugin-base namespace: azure tag: latest binary_build_commands: make all build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: test-base namespace: azure tag: latest @@ -22,10 +20,9 @@ images: to: azure resources: '*': - limits: null requests: cpu: 10m tag_specification: - cluster: https://api.ci.openshift.org name: origin-v3.11 namespace: openshift +tests: [] diff --git a/ci-operator/config/openshift/openshift-azure/openshift-openshift-azure-release-v9.yaml b/ci-operator/config/openshift/openshift-azure/openshift-openshift-azure-release-v9.yaml index 7771485f607aa..02f5da47598c5 100644 --- a/ci-operator/config/openshift/openshift-azure/openshift-openshift-azure-release-v9.yaml +++ b/ci-operator/config/openshift/openshift-azure/openshift-openshift-azure-release-v9.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: plugin-base namespace: azure tag: latest binary_build_commands: make all build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: test-base namespace: azure tag: latest @@ -22,10 +20,9 @@ images: to: azure resources: '*': - limits: null requests: cpu: 10m tag_specification: - cluster: https://api.ci.openshift.org name: origin-v3.11 namespace: openshift +tests: [] diff --git a/ci-operator/config/openshift/openshift-controller-manager/openshift-openshift-controller-manager-master.yaml b/ci-operator/config/openshift/openshift-controller-manager/openshift-openshift-controller-manager-master.yaml index f8a15a4b79f2c..5de7e28cad826 100644 --- a/ci-operator/config/openshift/openshift-controller-manager/openshift-openshift-controller-manager-master.yaml +++ b/ci-operator/config/openshift/openshift-controller-manager/openshift-openshift-controller-manager-master.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base binary_build_commands: make build --warn-undefined-variables build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -31,7 +29,6 @@ resources: cpu: "3" memory: 6Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/openshift-controller-manager/openshift-openshift-controller-manager-release-4.2.yaml b/ci-operator/config/openshift/openshift-controller-manager/openshift-openshift-controller-manager-release-4.2.yaml index 0001a01e8a58a..4bf2bc6fa9d49 100644 --- a/ci-operator/config/openshift/openshift-controller-manager/openshift-openshift-controller-manager-release-4.2.yaml +++ b/ci-operator/config/openshift/openshift-controller-manager/openshift-openshift-controller-manager-release-4.2.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base binary_build_commands: make build --warn-undefined-variables build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -31,7 +29,6 @@ resources: cpu: "3" memory: 6Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/openshift-controller-manager/openshift-openshift-controller-manager-release-4.3.yaml b/ci-operator/config/openshift/openshift-controller-manager/openshift-openshift-controller-manager-release-4.3.yaml index dac9d49c6e44f..c05b089123186 100644 --- a/ci-operator/config/openshift/openshift-controller-manager/openshift-openshift-controller-manager-release-4.3.yaml +++ b/ci-operator/config/openshift/openshift-controller-manager/openshift-openshift-controller-manager-release-4.3.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base binary_build_commands: make build --warn-undefined-variables build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -32,7 +30,6 @@ resources: cpu: "3" memory: 6Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/openshift-controller-manager/openshift-openshift-controller-manager-release-4.4.yaml b/ci-operator/config/openshift/openshift-controller-manager/openshift-openshift-controller-manager-release-4.4.yaml index d1d6d3c1c114a..c11e0d46fe5c0 100644 --- a/ci-operator/config/openshift/openshift-controller-manager/openshift-openshift-controller-manager-release-4.4.yaml +++ b/ci-operator/config/openshift/openshift-controller-manager/openshift-openshift-controller-manager-release-4.4.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base binary_build_commands: make build --warn-undefined-variables build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -31,7 +29,6 @@ resources: cpu: "3" memory: 6Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/openshift-state-metrics/openshift-openshift-state-metrics-master.yaml b/ci-operator/config/openshift/openshift-state-metrics/openshift-openshift-state-metrics-master.yaml index a99322c10dc3a..e2f0b4c899c89 100644 --- a/ci-operator/config/openshift/openshift-state-metrics/openshift-openshift-state-metrics-master.yaml +++ b/ci-operator/config/openshift/openshift-state-metrics/openshift-openshift-state-metrics-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.11 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/openshift-state-metrics/openshift-openshift-state-metrics-release-4.1.yaml b/ci-operator/config/openshift/openshift-state-metrics/openshift-openshift-state-metrics-release-4.1.yaml index 80f925b5bb694..feb6a4b730d90 100644 --- a/ci-operator/config/openshift/openshift-state-metrics/openshift-openshift-state-metrics-release-4.1.yaml +++ b/ci-operator/config/openshift/openshift-state-metrics/openshift-openshift-state-metrics-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.11 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/openshift-state-metrics/openshift-openshift-state-metrics-release-4.2.yaml b/ci-operator/config/openshift/openshift-state-metrics/openshift-openshift-state-metrics-release-4.2.yaml index 3a9a89e90ceb4..780cb80fb8fd3 100644 --- a/ci-operator/config/openshift/openshift-state-metrics/openshift-openshift-state-metrics-release-4.2.yaml +++ b/ci-operator/config/openshift/openshift-state-metrics/openshift-openshift-state-metrics-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.11 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/openshift-state-metrics/openshift-openshift-state-metrics-release-4.3.yaml b/ci-operator/config/openshift/openshift-state-metrics/openshift-openshift-state-metrics-release-4.3.yaml index dbc736b20b2e5..b76d1f59594bc 100644 --- a/ci-operator/config/openshift/openshift-state-metrics/openshift-openshift-state-metrics-release-4.3.yaml +++ b/ci-operator/config/openshift/openshift-state-metrics/openshift-openshift-state-metrics-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.11 @@ -26,7 +24,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/openshift-state-metrics/openshift-openshift-state-metrics-release-4.4.yaml b/ci-operator/config/openshift/openshift-state-metrics/openshift-openshift-state-metrics-release-4.4.yaml index 9ac46796f4115..afb74102b7b12 100644 --- a/ci-operator/config/openshift/openshift-state-metrics/openshift-openshift-state-metrics-release-4.4.yaml +++ b/ci-operator/config/openshift/openshift-state-metrics/openshift-openshift-state-metrics-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.11 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/openshift-tuned/openshift-openshift-tuned-master.yaml b/ci-operator/config/openshift/openshift-tuned/openshift-openshift-tuned-master.yaml index 8aae3e1df9c49..0ad42fadd6450 100644 --- a/ci-operator/config/openshift/openshift-tuned/openshift-openshift-tuned-master.yaml +++ b/ci-operator/config/openshift/openshift-tuned/openshift-openshift-tuned-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -30,7 +28,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/openshift-tuned/openshift-openshift-tuned-release-4.1.yaml b/ci-operator/config/openshift/openshift-tuned/openshift-openshift-tuned-release-4.1.yaml index 8a1315bfacbaf..bbe3242bef99b 100644 --- a/ci-operator/config/openshift/openshift-tuned/openshift-openshift-tuned-release-4.1.yaml +++ b/ci-operator/config/openshift/openshift-tuned/openshift-openshift-tuned-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -29,7 +27,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/openshift-tuned/openshift-openshift-tuned-release-4.2.yaml b/ci-operator/config/openshift/openshift-tuned/openshift-openshift-tuned-release-4.2.yaml index 138f53b69bb6c..0b3df617612fc 100644 --- a/ci-operator/config/openshift/openshift-tuned/openshift-openshift-tuned-release-4.2.yaml +++ b/ci-operator/config/openshift/openshift-tuned/openshift-openshift-tuned-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -30,7 +28,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/openshift-tuned/openshift-openshift-tuned-release-4.3.yaml b/ci-operator/config/openshift/openshift-tuned/openshift-openshift-tuned-release-4.3.yaml index 4017fbf88433b..955a9d1f5098d 100644 --- a/ci-operator/config/openshift/openshift-tuned/openshift-openshift-tuned-release-4.3.yaml +++ b/ci-operator/config/openshift/openshift-tuned/openshift-openshift-tuned-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -31,7 +29,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/openshift-tuned/openshift-openshift-tuned-release-4.4.yaml b/ci-operator/config/openshift/openshift-tuned/openshift-openshift-tuned-release-4.4.yaml index 3a12925846c2d..c10c6c819a6f7 100644 --- a/ci-operator/config/openshift/openshift-tuned/openshift-openshift-tuned-release-4.4.yaml +++ b/ci-operator/config/openshift/openshift-tuned/openshift-openshift-tuned-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -30,7 +28,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/origin-aggregated-logging/openshift-origin-aggregated-logging-master.yaml b/ci-operator/config/openshift/origin-aggregated-logging/openshift-origin-aggregated-logging-master.yaml index c1caf99cb381e..50b23af32ec07 100644 --- a/ci-operator/config/openshift/origin-aggregated-logging/openshift-origin-aggregated-logging-master.yaml +++ b/ci-operator/config/openshift/origin-aggregated-logging/openshift-origin-aggregated-logging-master.yaml @@ -1,27 +1,22 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base base-npm: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: nodejs-8 base_centos: - cluster: https://api.ci.openshift.org name: centos namespace: openshift tag: "7" ruby-25: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: ruby-25 build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -72,7 +67,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/origin-aggregated-logging/openshift-origin-aggregated-logging-release-3.11.yaml b/ci-operator/config/openshift/origin-aggregated-logging/openshift-origin-aggregated-logging-release-3.11.yaml index f0f06f4339e0f..fb60fea852095 100644 --- a/ci-operator/config/openshift/origin-aggregated-logging/openshift-origin-aggregated-logging-release-3.11.yaml +++ b/ci-operator/config/openshift/origin-aggregated-logging/openshift-origin-aggregated-logging-release-3.11.yaml @@ -1,20 +1,12 @@ base_images: base: - cluster: https://api.ci.openshift.org name: origin-v3.11 namespace: openshift tag: base base-npm: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: nodejs-8 -build_root: - image_stream_tag: - cluster: https://api.ci.openshift.org - name: release - namespace: openshift - tag: golang-1.10 images: - context_dir: fluentd/ dockerfile_path: Dockerfile.centos7 @@ -36,15 +28,12 @@ images: dockerfile_path: Dockerfile.centos7 from: base to: logging-eventrouter -promotion: - name: origin-v3.11 - namespace: openshift resources: '*': limits: memory: 5Gi requests: - cpu: "1" + cpu: '1' memory: 200Mi src: limits: @@ -52,7 +41,16 @@ resources: requests: cpu: 100m memory: 200Mi +promotion: + name: origin-v3.11 + namespace: openshift tag_specification: - cluster: https://api.ci.openshift.org name: origin-v3.11 namespace: openshift + tag: '' + tag_overrides: {} +build_root: + image_stream_tag: + name: release + namespace: openshift + tag: golang-1.10 diff --git a/ci-operator/config/openshift/origin-aggregated-logging/openshift-origin-aggregated-logging-release-4.1.yaml b/ci-operator/config/openshift/origin-aggregated-logging/openshift-origin-aggregated-logging-release-4.1.yaml index 9efeccc896b89..dfc2e90e83e4c 100644 --- a/ci-operator/config/openshift/origin-aggregated-logging/openshift-origin-aggregated-logging-release-4.1.yaml +++ b/ci-operator/config/openshift/origin-aggregated-logging/openshift-origin-aggregated-logging-release-4.1.yaml @@ -1,27 +1,22 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base base-npm: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: nodejs-8 base_centos: - cluster: https://api.ci.openshift.org name: centos namespace: openshift tag: "7" ruby-25: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: ruby-25 build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -67,7 +62,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/origin-aggregated-logging/openshift-origin-aggregated-logging-release-4.2.yaml b/ci-operator/config/openshift/origin-aggregated-logging/openshift-origin-aggregated-logging-release-4.2.yaml index f0b3f45238ae4..16076a2b36bef 100644 --- a/ci-operator/config/openshift/origin-aggregated-logging/openshift-origin-aggregated-logging-release-4.2.yaml +++ b/ci-operator/config/openshift/origin-aggregated-logging/openshift-origin-aggregated-logging-release-4.2.yaml @@ -1,27 +1,22 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base base-npm: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: nodejs-8 base_centos: - cluster: https://api.ci.openshift.org name: centos namespace: openshift tag: "7" ruby-25: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: ruby-25 build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -72,7 +67,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/origin-aggregated-logging/openshift-origin-aggregated-logging-release-4.3.yaml b/ci-operator/config/openshift/origin-aggregated-logging/openshift-origin-aggregated-logging-release-4.3.yaml index 3c423ed3c7d6a..68fde8aabb242 100644 --- a/ci-operator/config/openshift/origin-aggregated-logging/openshift-origin-aggregated-logging-release-4.3.yaml +++ b/ci-operator/config/openshift/origin-aggregated-logging/openshift-origin-aggregated-logging-release-4.3.yaml @@ -1,27 +1,22 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base base-npm: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: nodejs-8 base_centos: - cluster: https://api.ci.openshift.org name: centos namespace: openshift tag: "7" ruby-25: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: ruby-25 build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -73,7 +68,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/origin-aggregated-logging/openshift-origin-aggregated-logging-release-4.4.yaml b/ci-operator/config/openshift/origin-aggregated-logging/openshift-origin-aggregated-logging-release-4.4.yaml index 5fe57e3fad01c..6911f3499ac83 100644 --- a/ci-operator/config/openshift/origin-aggregated-logging/openshift-origin-aggregated-logging-release-4.4.yaml +++ b/ci-operator/config/openshift/origin-aggregated-logging/openshift-origin-aggregated-logging-release-4.4.yaml @@ -1,27 +1,22 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base base-npm: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: nodejs-8 base_centos: - cluster: https://api.ci.openshift.org name: centos namespace: openshift tag: "7" ruby-25: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: ruby-25 build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -72,7 +67,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/origin-branding/openshift-origin-branding-master.yaml b/ci-operator/config/openshift/origin-branding/openshift-origin-branding-master.yaml index bb0095ae93a23..47474be89eb52 100644 --- a/ci-operator/config/openshift/origin-branding/openshift-origin-branding-master.yaml +++ b/ci-operator/config/openshift/origin-branding/openshift-origin-branding-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 4Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/origin-branding/openshift-origin-branding-release-4.3.yaml b/ci-operator/config/openshift/origin-branding/openshift-origin-branding-release-4.3.yaml index bb0095ae93a23..47474be89eb52 100644 --- a/ci-operator/config/openshift/origin-branding/openshift-origin-branding-release-4.3.yaml +++ b/ci-operator/config/openshift/origin-branding/openshift-origin-branding-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 4Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/origin-branding/openshift-origin-branding-release-4.4.yaml b/ci-operator/config/openshift/origin-branding/openshift-origin-branding-release-4.4.yaml index f6a3a2be396a6..b76f236abc8ac 100644 --- a/ci-operator/config/openshift/origin-branding/openshift-origin-branding-release-4.4.yaml +++ b/ci-operator/config/openshift/origin-branding/openshift-origin-branding-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 4Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/origin-metrics/openshift-origin-metrics-release-3.10.yaml b/ci-operator/config/openshift/origin-metrics/openshift-origin-metrics-release-3.10.yaml index 18870bc8ab9fc..fbfefb040830b 100644 --- a/ci-operator/config/openshift/origin-metrics/openshift-origin-metrics-release-3.10.yaml +++ b/ci-operator/config/openshift/origin-metrics/openshift-origin-metrics-release-3.10.yaml @@ -1,31 +1,21 @@ base_images: base: - cluster: https://api.ci.openshift.org name: centos namespace: openshift - tag: "7" + tag: '7' base-java: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: jdk-8 cli: - cluster: https://api.ci.openshift.org name: origin-v3.10 namespace: openshift tag: cli -build_root: - image_stream_tag: - cluster: https://api.ci.openshift.org - name: release - namespace: openshift - tag: golang-1.10 images: - context_dir: cassandra/ from: base-java to: metrics-cassandra - context_dir: hawkular-metrics/ - from: "" to: metrics-hawkular-metrics - context_dir: heapster/ from: heapster-base @@ -43,7 +33,7 @@ resources: limits: memory: 5Gi requests: - cpu: "1" + cpu: '1' memory: 200Mi src: limits: @@ -52,6 +42,10 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: origin-v3.10 namespace: openshift +build_root: + image_stream_tag: + name: release + namespace: openshift + tag: golang-1.10 diff --git a/ci-operator/config/openshift/origin-metrics/openshift-origin-metrics-release-3.11.yaml b/ci-operator/config/openshift/origin-metrics/openshift-origin-metrics-release-3.11.yaml index 6cd2eb0e194d0..36e7743b06322 100644 --- a/ci-operator/config/openshift/origin-metrics/openshift-origin-metrics-release-3.11.yaml +++ b/ci-operator/config/openshift/origin-metrics/openshift-origin-metrics-release-3.11.yaml @@ -1,25 +1,16 @@ base_images: base: - cluster: https://api.ci.openshift.org name: centos namespace: openshift - tag: "7" + tag: '7' base-java: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: jdk-8 cli: - cluster: https://api.ci.openshift.org name: origin-v3.11 namespace: openshift tag: cli -build_root: - image_stream_tag: - cluster: https://api.ci.openshift.org - name: release - namespace: openshift - tag: golang-1.10 images: - context_dir: cassandra/ from: base-java @@ -28,7 +19,6 @@ images: from: cli to: metrics-deployer - context_dir: hawkular-metrics/ - from: "" to: metrics-hawkular-metrics - context_dir: heapster/ from: heapster-base @@ -46,7 +36,7 @@ resources: limits: memory: 5Gi requests: - cpu: "1" + cpu: '1' memory: 200Mi src: limits: @@ -55,6 +45,10 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: origin-v3.11 namespace: openshift +build_root: + image_stream_tag: + name: release + namespace: openshift + tag: golang-1.10 diff --git a/ci-operator/config/openshift/origin-web-console-server/openshift-origin-web-console-server-release-3.10.yaml b/ci-operator/config/openshift/origin-web-console-server/openshift-origin-web-console-server-release-3.10.yaml index 26b5c2d5c87d7..611e279b6f85e 100644 --- a/ci-operator/config/openshift/origin-web-console-server/openshift-origin-web-console-server-release-3.10.yaml +++ b/ci-operator/config/openshift/origin-web-console-server/openshift-origin-web-console-server-release-3.10.yaml @@ -4,12 +4,6 @@ base_rpm_images: namespace: openshift tag: base binary_build_commands: make build -build_root: - image_stream_tag: - cluster: https://api.ci.openshift.org - name: release - namespace: openshift - tag: golang-1.9 images: - context_dir: images/origin-web-console/ from: base @@ -23,9 +17,15 @@ resources: memory: 200Mi rpm_build_commands: make build-rpms tag_specification: - cluster: https://api.ci.openshift.org name: origin-v3.10 namespace: openshift + tag: '' + tag_overrides: {} +build_root: + image_stream_tag: + name: release + namespace: openshift + tag: golang-1.9 test_binary_build_commands: OS_GOFLAGS='-race' make build tests: - artifact_dir: /tmp/artifacts diff --git a/ci-operator/config/openshift/origin-web-console-server/openshift-origin-web-console-server-release-3.11.yaml b/ci-operator/config/openshift/origin-web-console-server/openshift-origin-web-console-server-release-3.11.yaml index 24999a7c5f820..d285132d11d95 100644 --- a/ci-operator/config/openshift/origin-web-console-server/openshift-origin-web-console-server-release-3.11.yaml +++ b/ci-operator/config/openshift/origin-web-console-server/openshift-origin-web-console-server-release-3.11.yaml @@ -4,12 +4,6 @@ base_rpm_images: namespace: openshift tag: base binary_build_commands: make build -build_root: - image_stream_tag: - cluster: https://api.ci.openshift.org - name: release - namespace: openshift - tag: golang-1.10 images: - context_dir: images/origin-web-console/ from: base @@ -23,9 +17,15 @@ resources: memory: 200Mi rpm_build_commands: make build-rpms tag_specification: - cluster: https://api.ci.openshift.org name: origin-v3.11 namespace: openshift + tag: '' + tag_overrides: {} +build_root: + image_stream_tag: + name: release + namespace: openshift + tag: golang-1.10 test_binary_build_commands: OS_GOFLAGS='-race' make build tests: - artifact_dir: /tmp/artifacts diff --git a/ci-operator/config/openshift/origin-web-console/openshift-origin-web-console-release-3.10.yaml b/ci-operator/config/openshift/origin-web-console/openshift-origin-web-console-release-3.10.yaml index d9a7e6a36be15..1b9d042d478b2 100644 --- a/ci-operator/config/openshift/origin-web-console/openshift-origin-web-console-release-3.10.yaml +++ b/ci-operator/config/openshift/origin-web-console/openshift-origin-web-console-release-3.10.yaml @@ -1,15 +1,8 @@ base_images: base: - cluster: https://api.ci.openshift.org name: origin-v3.10 namespace: openshift tag: base -build_root: - image_stream_tag: - cluster: https://api.ci.openshift.org - name: release - namespace: openshift - tag: nodejs-8-browser-tests resources: '*': limits: @@ -18,9 +11,15 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: origin-v3.10 namespace: openshift + tag: '' + tag_overrides: {} +build_root: + image_stream_tag: + name: release + namespace: openshift + tag: nodejs-8-browser-tests test_binary_build_commands: npm install grunt; hack/install-deps.sh; chmod -R g+rwx $HOME; chgrp -R 0 $HOME tests: diff --git a/ci-operator/config/openshift/origin/openshift-origin-master.yaml b/ci-operator/config/openshift/origin/openshift-origin-master.yaml index 5ed33408e3776..7ad7cfaa3f626 100644 --- a/ci-operator/config/openshift/origin/openshift-origin-master.yaml +++ b/ci-operator/config/openshift/origin/openshift-origin-master.yaml @@ -1,33 +1,27 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base base-machine: - cluster: https://api.ci.openshift.org name: fedora namespace: openshift tag: "29" cli: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: cli machine-os-content-base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: machine-os-content oc-rpms: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: oc-rpms binary_build_commands: make build WHAT='vendor/k8s.io/kubernetes/cmd/hyperkube' build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -188,7 +182,6 @@ resources: memory: 8Gi rpm_build_commands: make build-rpms tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/origin/openshift-origin-release-3.10.yaml b/ci-operator/config/openshift/origin/openshift-origin-release-3.10.yaml index c9884810e45e0..295d62c80b34f 100644 --- a/ci-operator/config/openshift/origin/openshift-origin-release-3.10.yaml +++ b/ci-operator/config/openshift/origin/openshift-origin-release-3.10.yaml @@ -4,12 +4,6 @@ base_rpm_images: namespace: openshift tag: base binary_build_commands: make build -build_root: - image_stream_tag: - cluster: https://api.ci.openshift.org - name: release - namespace: openshift - tag: golang-1.10 images: - context_dir: images/cli/ from: base @@ -37,25 +31,31 @@ resources: limits: memory: 11Gi requests: - cpu: "3" + cpu: '3' memory: 7Gi rpms: limits: memory: 10Gi requests: - cpu: "2" + cpu: '2' memory: 6Gi unit: limits: memory: 11Gi requests: - cpu: "6" + cpu: '6' memory: 8Gi rpm_build_commands: make build-rpms tag_specification: - cluster: https://api.ci.openshift.org name: origin-v3.10 namespace: openshift + tag: '' + tag_overrides: {} +build_root: + image_stream_tag: + name: release + namespace: openshift + tag: golang-1.10 tests: - artifact_dir: /tmp/artifacts as: unit diff --git a/ci-operator/config/openshift/origin/openshift-origin-release-3.11.yaml b/ci-operator/config/openshift/origin/openshift-origin-release-3.11.yaml index ad42ae58b02c0..8dcfc66fd659f 100644 --- a/ci-operator/config/openshift/origin/openshift-origin-release-3.11.yaml +++ b/ci-operator/config/openshift/origin/openshift-origin-release-3.11.yaml @@ -1,16 +1,9 @@ base_images: os: - cluster: https://api.ci.openshift.org name: centos namespace: openshift - tag: "7" + tag: '7' binary_build_commands: make build -build_root: - image_stream_tag: - cluster: https://api.ci.openshift.org - name: release - namespace: openshift - tag: golang-1.10 images: - context_dir: images/base/ from: os @@ -67,11 +60,11 @@ images: from: control-plane to: node promotion: + name: origin-v3.11 + namespace: openshift additional_images: artifacts: artifacts base: base - name: origin-v3.11 - namespace: openshift raw_steps: - pipeline_image_cache_step: commands: mkdir -p _output/local/releases; touch _output/local/releases/CHECKSUM; @@ -92,9 +85,7 @@ raw_steps: rpms: as: - rpms - paths: null - src: - paths: null + src: {} optional: true to: artifacts - output_image_tag_step: @@ -102,7 +93,6 @@ raw_steps: optional: true to: name: stable - namespace: "" tag: artifacts - rpm_image_injection_step: from: base @@ -118,43 +108,49 @@ resources: limits: memory: 11Gi requests: - cpu: "3" + cpu: '3' memory: 7Gi bin-cross: limits: memory: 11Gi requests: - cpu: "3" + cpu: '3' memory: 8Gi integration: limits: memory: 13Gi requests: - cpu: "3" + cpu: '3' memory: 10Gi rpms: limits: memory: 12Gi requests: - cpu: "2" + cpu: '2' memory: 6Gi unit: limits: memory: 20Gi requests: - cpu: "8" + cpu: '8' memory: 16Gi verify: limits: memory: 11Gi requests: - cpu: "2" + cpu: '2' memory: 6Gi rpm_build_commands: make build-rpms tag_specification: - cluster: https://api.ci.openshift.org name: origin-v3.11 namespace: openshift + tag: '' + tag_overrides: {} +build_root: + image_stream_tag: + name: release + namespace: openshift + tag: golang-1.10 tests: - artifact_dir: /tmp/artifacts as: unit @@ -164,8 +160,8 @@ tests: from: src - artifact_dir: /tmp/artifacts as: integration - commands: TMPDIR=/tmp/volume ARTIFACT_DIR=/tmp/artifacts JUNIT_REPORT=1 KUBERNETES_SERVICE_HOST= - make test-integration + commands: TMPDIR=/tmp/volume ARTIFACT_DIR=/tmp/artifacts JUNIT_REPORT=1 KUBERNETES_SERVICE_HOST= make + test-integration container: from: bin memory_backed_volume: diff --git a/ci-operator/config/openshift/origin/openshift-origin-release-4.1.yaml b/ci-operator/config/openshift/origin/openshift-origin-release-4.1.yaml index 149b43d8cad39..0c1cd3c1e1f41 100644 --- a/ci-operator/config/openshift/origin/openshift-origin-release-4.1.yaml +++ b/ci-operator/config/openshift/origin/openshift-origin-release-4.1.yaml @@ -1,23 +1,19 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base base-machine: - cluster: https://api.ci.openshift.org name: fedora namespace: openshift tag: "29" machine-os-content-base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: machine-os-content binary_build_commands: make build WHAT='cmd/hypershift vendor/k8s.io/kubernetes/cmd/hyperkube' build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.11 @@ -220,7 +216,6 @@ resources: memory: 8Gi rpm_build_commands: make build-rpms tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: @@ -263,8 +258,7 @@ tests: openshift_installer: cluster_profile: aws - as: e2e-aws-disruptive - commands: setup_ssh_bastion; TEST_SUITE=openshift/disruptive run-tests; TEST_SUITE=openshift/conformance/parallel - run-tests + commands: setup_ssh_bastion; TEST_SUITE=openshift/disruptive run-tests; TEST_SUITE=openshift/conformance/parallel run-tests openshift_installer: cluster_profile: aws - as: e2e-aws-image-ecosystem diff --git a/ci-operator/config/openshift/origin/openshift-origin-release-4.2.yaml b/ci-operator/config/openshift/origin/openshift-origin-release-4.2.yaml index b09b0ee381f2a..d3839cb778710 100644 --- a/ci-operator/config/openshift/origin/openshift-origin-release-4.2.yaml +++ b/ci-operator/config/openshift/origin/openshift-origin-release-4.2.yaml @@ -1,33 +1,27 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base base-machine: - cluster: https://api.ci.openshift.org name: fedora namespace: openshift tag: "29" cli: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: cli machine-os-content-base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: machine-os-content oc-rpms: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: oc-rpms binary_build_commands: make build WHAT='vendor/k8s.io/kubernetes/cmd/hyperkube' build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -188,7 +182,6 @@ resources: memory: 8Gi rpm_build_commands: make build-rpms tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/origin/openshift-origin-release-4.3.yaml b/ci-operator/config/openshift/origin/openshift-origin-release-4.3.yaml index 2c131f74f01ec..91d0ab6b229fc 100644 --- a/ci-operator/config/openshift/origin/openshift-origin-release-4.3.yaml +++ b/ci-operator/config/openshift/origin/openshift-origin-release-4.3.yaml @@ -1,33 +1,27 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base base-machine: - cluster: https://api.ci.openshift.org name: fedora namespace: openshift tag: "29" cli: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: cli machine-os-content-base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: machine-os-content oc-rpms: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: oc-rpms binary_build_commands: make build WHAT='vendor/k8s.io/kubernetes/cmd/hyperkube' build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -189,7 +183,6 @@ resources: memory: 8Gi rpm_build_commands: make build-rpms tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/origin/openshift-origin-release-4.4.yaml b/ci-operator/config/openshift/origin/openshift-origin-release-4.4.yaml index 9bc075777d303..6a4a3661e9817 100644 --- a/ci-operator/config/openshift/origin/openshift-origin-release-4.4.yaml +++ b/ci-operator/config/openshift/origin/openshift-origin-release-4.4.yaml @@ -1,33 +1,27 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base base-machine: - cluster: https://api.ci.openshift.org name: fedora namespace: openshift tag: "29" cli: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: cli machine-os-content-base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: machine-os-content oc-rpms: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: oc-rpms binary_build_commands: make build WHAT='vendor/k8s.io/kubernetes/cmd/hyperkube' build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -188,7 +182,6 @@ resources: memory: 8Gi rpm_build_commands: make build-rpms tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/osde2e/openshift-osde2e-master.yaml b/ci-operator/config/openshift/osde2e/openshift-osde2e-master.yaml index 0b43e142b6863..f360d9565830a 100644 --- a/ci-operator/config/openshift/osde2e/openshift-osde2e-master.yaml +++ b/ci-operator/config/openshift/osde2e/openshift-osde2e-master.yaml @@ -1,12 +1,12 @@ -binary_build_commands: | - go get -u github.com/Masterminds/glide && glide install --strip-vendor - mkdir -p /tmp/artifacts build_root: image_stream_tag: cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.11 +binary_build_commands: | + go get -u github.com/Masterminds/glide && glide install --strip-vendor + mkdir -p /tmp/artifacts resources: '*': limits: @@ -15,8 +15,10 @@ resources: cpu: 100m memory: 200Mi tests: -- artifact_dir: /tmp/artifacts - as: verify + +# PR check +- as: verify + artifact_dir: /tmp/artifacts commands: | set -o pipefail @@ -27,8 +29,17 @@ tests: ci/prow_pr_check.sh container: from: bin -- artifact_dir: /tmp/artifacts - as: e2e-int-4.1 + +# Tests +# --- Integration +- as: e2e-int-4.1 + artifact_dir: /tmp/artifacts + cron: '* */4 * * *' + secret: + name: osde2e-secrets + mount_path: /usr/local/osde2e-secrets + container: + from: bin commands: | set -o pipefail @@ -41,14 +52,14 @@ tests: export MINOR_TARGET=1 ci/prow_run_tests.sh /usr/local/osde2e-secrets - container: - from: bin +- as: e2e-int-4.2 + artifact_dir: /tmp/artifacts cron: '* */4 * * *' secret: - mount_path: /usr/local/osde2e-secrets name: osde2e-secrets -- artifact_dir: /tmp/artifacts - as: e2e-int-4.2 + mount_path: /usr/local/osde2e-secrets + container: + from: bin commands: | set -o pipefail @@ -61,14 +72,16 @@ tests: export MINOR_TARGET=2 ci/prow_run_tests.sh /usr/local/osde2e-secrets - container: - from: bin + +# --- Stage +- as: e2e-stage-4.1 + artifact_dir: /tmp/artifacts cron: '* */4 * * *' secret: - mount_path: /usr/local/osde2e-secrets name: osde2e-secrets -- artifact_dir: /tmp/artifacts - as: e2e-stage-4.1 + mount_path: /usr/local/osde2e-secrets + container: + from: bin commands: | set -o pipefail @@ -81,14 +94,14 @@ tests: export MINOR_TARGET=1 ci/prow_run_tests.sh /usr/local/osde2e-secrets - container: - from: bin +- as: e2e-stage-4.2 + artifact_dir: /tmp/artifacts cron: '* */4 * * *' secret: - mount_path: /usr/local/osde2e-secrets name: osde2e-secrets -- artifact_dir: /tmp/artifacts - as: e2e-stage-4.2 + mount_path: /usr/local/osde2e-secrets + container: + from: bin commands: | set -o pipefail @@ -101,14 +114,16 @@ tests: export MINOR_TARGET=2 ci/prow_run_tests.sh /usr/local/osde2e-secrets - container: - from: bin + +# --- Production +- as: e2e-prod-4.1 + artifact_dir: /tmp/artifacts cron: '* */4 * * *' secret: - mount_path: /usr/local/osde2e-secrets name: osde2e-secrets -- artifact_dir: /tmp/artifacts - as: e2e-prod-4.1 + mount_path: /usr/local/osde2e-secrets + container: + from: bin commands: | set -o pipefail @@ -121,14 +136,14 @@ tests: export MINOR_TARGET=1 ci/prow_run_tests.sh /usr/local/osde2e-secrets - container: - from: bin +- as: e2e-prod-4.2 + artifact_dir: /tmp/artifacts cron: '* */4 * * *' secret: - mount_path: /usr/local/osde2e-secrets name: osde2e-secrets -- artifact_dir: /tmp/artifacts - as: e2e-prod-4.2 + mount_path: /usr/local/osde2e-secrets + container: + from: bin commands: | set -o pipefail @@ -141,14 +156,17 @@ tests: export MINOR_TARGET=2 ci/prow_run_tests.sh /usr/local/osde2e-secrets - container: - from: bin + +# Upgrades +# --- Integration +- as: e2e-int-4.1-4.1 + artifact_dir: /tmp/artifacts cron: '* */4 * * *' secret: - mount_path: /usr/local/osde2e-secrets name: osde2e-secrets -- artifact_dir: /tmp/artifacts - as: e2e-int-4.1-4.1 + mount_path: /usr/local/osde2e-secrets + container: + from: bin commands: | set -o pipefail @@ -162,14 +180,14 @@ tests: export UPGRADE_RELEASE_STREAM=4.1.0-0.nightly ci/prow_run_tests.sh /usr/local/osde2e-secrets - container: - from: bin +- as: e2e-int-4.1-4.2 + artifact_dir: /tmp/artifacts cron: '* */4 * * *' secret: - mount_path: /usr/local/osde2e-secrets name: osde2e-secrets -- artifact_dir: /tmp/artifacts - as: e2e-int-4.1-4.2 + mount_path: /usr/local/osde2e-secrets + container: + from: bin commands: | set -o pipefail @@ -183,14 +201,14 @@ tests: export UPGRADE_RELEASE_STREAM=4.2.0-0.nightly ci/prow_run_tests.sh /usr/local/osde2e-secrets - container: - from: bin +- as: e2e-int-4.2-4.2 + artifact_dir: /tmp/artifacts cron: '* */4 * * *' secret: - mount_path: /usr/local/osde2e-secrets name: osde2e-secrets -- artifact_dir: /tmp/artifacts - as: e2e-int-4.2-4.2 + mount_path: /usr/local/osde2e-secrets + container: + from: bin commands: | set -o pipefail @@ -204,14 +222,16 @@ tests: export UPGRADE_RELEASE_STREAM=4.2.0-0.nightly ci/prow_run_tests.sh /usr/local/osde2e-secrets - container: - from: bin + +# --- Stage +- as: e2e-stage-4.1-4.1 + artifact_dir: /tmp/artifacts cron: '* */4 * * *' secret: - mount_path: /usr/local/osde2e-secrets name: osde2e-secrets -- artifact_dir: /tmp/artifacts - as: e2e-stage-4.1-4.1 + mount_path: /usr/local/osde2e-secrets + container: + from: bin commands: | set -o pipefail @@ -225,14 +245,14 @@ tests: export UPGRADE_RELEASE_STREAM=stable-4.1 ci/prow_run_tests.sh /usr/local/osde2e-secrets - container: - from: bin +- as: e2e-stage-4.1-4.2 + artifact_dir: /tmp/artifacts cron: '* */4 * * *' secret: - mount_path: /usr/local/osde2e-secrets name: osde2e-secrets -- artifact_dir: /tmp/artifacts - as: e2e-stage-4.1-4.2 + mount_path: /usr/local/osde2e-secrets + container: + from: bin commands: | set -o pipefail @@ -246,14 +266,14 @@ tests: export UPGRADE_RELEASE_STREAM=fast-4.2 ci/prow_run_tests.sh /usr/local/osde2e-secrets - container: - from: bin +- as: e2e-stage-4.2-4.2 + artifact_dir: /tmp/artifacts cron: '* */4 * * *' secret: - mount_path: /usr/local/osde2e-secrets name: osde2e-secrets -- artifact_dir: /tmp/artifacts - as: e2e-stage-4.2-4.2 + mount_path: /usr/local/osde2e-secrets + container: + from: bin commands: | set -o pipefail @@ -267,14 +287,16 @@ tests: export UPGRADE_RELEASE_STREAM=fast-4.2 ci/prow_run_tests.sh /usr/local/osde2e-secrets - container: - from: bin + +# --- Production +- as: e2e-prod-4.1-4.1 + artifact_dir: /tmp/artifacts cron: '* */4 * * *' secret: - mount_path: /usr/local/osde2e-secrets name: osde2e-secrets -- artifact_dir: /tmp/artifacts - as: e2e-prod-4.1-4.1 + mount_path: /usr/local/osde2e-secrets + container: + from: bin commands: | set -o pipefail @@ -288,14 +310,14 @@ tests: export UPGRADE_RELEASE_STREAM=stable-4.1 ci/prow_run_tests.sh /usr/local/osde2e-secrets - container: - from: bin +- as: e2e-prod-4.1-4.2 + artifact_dir: /tmp/artifacts cron: '* */4 * * *' secret: - mount_path: /usr/local/osde2e-secrets name: osde2e-secrets -- artifact_dir: /tmp/artifacts - as: e2e-prod-4.1-4.2 + mount_path: /usr/local/osde2e-secrets + container: + from: bin commands: | set -o pipefail @@ -309,9 +331,24 @@ tests: export UPGRADE_RELEASE_STREAM=fast-4.2 ci/prow_run_tests.sh /usr/local/osde2e-secrets - container: - from: bin - cron: '* */4 * * *' - secret: - mount_path: /usr/local/osde2e-secrets - name: osde2e-secrets +#- as: e2e-prod-4.2-4.2 +# artifact_dir: /tmp/artifacts +# cron: '* */4 * * *' +# secret: +# name: osde2e-secrets +# mount_path: /usr/local/osde2e-secrets +# container: +# from: bin +# commands: | +# set -o pipefail +# +# export HOME=$(mktemp -d) +# +# export REPORT_DIR=/tmp/artifacts +# +# export OSD_ENV=prod +# export MAJOR_TARGET=4 +# export MINOR_TARGET=2 +# export UPGRADE_RELEASE_STREAM=fast-4.2 +# +# ci/prow_run_tests.sh /usr/local/osde2e-secrets diff --git a/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-master.yaml b/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-master.yaml index 7cffdb658e98e..fed0b89ca7b98 100644 --- a/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-master.yaml +++ b/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,6 +23,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp diff --git a/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.1.yaml b/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.1.yaml index 897b717859ec6..7f04b39dff6c9 100644 --- a/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.1.yaml +++ b/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.2.yaml b/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.2.yaml index df18b287cdda6..9013b17bab648 100644 --- a/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.2.yaml +++ b/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,6 +23,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp diff --git a/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.3.yaml b/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.3.yaml index 611a8136e1f2b..38d25ea5b7bb4 100644 --- a/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.3.yaml +++ b/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -26,6 +24,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp diff --git a/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.4.yaml b/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.4.yaml index 343d27f1555e8..553ebe75cbd3b 100644 --- a/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.4.yaml +++ b/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,6 +23,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp diff --git a/ci-operator/config/openshift/pagerduty-operator/openshift-pagerduty-operator-master.yaml b/ci-operator/config/openshift/pagerduty-operator/openshift-pagerduty-operator-master.yaml index 7676504fe57e0..0667d35b5a2ee 100644 --- a/ci-operator/config/openshift/pagerduty-operator/openshift-pagerduty-operator-master.yaml +++ b/ci-operator/config/openshift/pagerduty-operator/openshift-pagerduty-operator-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,6 +23,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp diff --git a/ci-operator/config/openshift/pagerduty-operator/openshift-pagerduty-operator-release-4.1.yaml b/ci-operator/config/openshift/pagerduty-operator/openshift-pagerduty-operator-release-4.1.yaml index 81ba26d0004dc..cae2e16ae4a95 100644 --- a/ci-operator/config/openshift/pagerduty-operator/openshift-pagerduty-operator-release-4.1.yaml +++ b/ci-operator/config/openshift/pagerduty-operator/openshift-pagerduty-operator-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,6 +23,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp diff --git a/ci-operator/config/openshift/pagerduty-operator/openshift-pagerduty-operator-release-4.2.yaml b/ci-operator/config/openshift/pagerduty-operator/openshift-pagerduty-operator-release-4.2.yaml index 66fff66faa8b9..6069a196a83e2 100644 --- a/ci-operator/config/openshift/pagerduty-operator/openshift-pagerduty-operator-release-4.2.yaml +++ b/ci-operator/config/openshift/pagerduty-operator/openshift-pagerduty-operator-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,6 +23,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp diff --git a/ci-operator/config/openshift/pagerduty-operator/openshift-pagerduty-operator-release-4.3.yaml b/ci-operator/config/openshift/pagerduty-operator/openshift-pagerduty-operator-release-4.3.yaml index fd971be32f98e..f1da1f846e527 100644 --- a/ci-operator/config/openshift/pagerduty-operator/openshift-pagerduty-operator-release-4.3.yaml +++ b/ci-operator/config/openshift/pagerduty-operator/openshift-pagerduty-operator-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -26,6 +24,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp diff --git a/ci-operator/config/openshift/pagerduty-operator/openshift-pagerduty-operator-release-4.4.yaml b/ci-operator/config/openshift/pagerduty-operator/openshift-pagerduty-operator-release-4.4.yaml index 637f7a1771232..78e48af38dc97 100644 --- a/ci-operator/config/openshift/pagerduty-operator/openshift-pagerduty-operator-release-4.4.yaml +++ b/ci-operator/config/openshift/pagerduty-operator/openshift-pagerduty-operator-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,6 +23,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp diff --git a/ci-operator/config/openshift/private-ci-testing/openshift-private-ci-testing-master.yaml b/ci-operator/config/openshift/private-ci-testing/openshift-private-ci-testing-master.yaml index e91f248b914ea..8611f2dfe2af3 100644 --- a/ci-operator/config/openshift/private-ci-testing/openshift-private-ci-testing-master.yaml +++ b/ci-operator/config/openshift/private-ci-testing/openshift-private-ci-testing-master.yaml @@ -1,6 +1,5 @@ build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -13,6 +12,6 @@ resources: memory: 200Mi tests: - as: showtime - commands: echo "We are ok boss." + commands: echo "We are ok boss." container: from: src diff --git a/ci-operator/config/openshift/prom-label-proxy/openshift-prom-label-proxy-master.yaml b/ci-operator/config/openshift/prom-label-proxy/openshift-prom-label-proxy-master.yaml index 1b2c60faba093..4be0bbc026281 100644 --- a/ci-operator/config/openshift/prom-label-proxy/openshift-prom-label-proxy-master.yaml +++ b/ci-operator/config/openshift/prom-label-proxy/openshift-prom-label-proxy-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/prom-label-proxy/openshift-prom-label-proxy-release-4.1.yaml b/ci-operator/config/openshift/prom-label-proxy/openshift-prom-label-proxy-release-4.1.yaml index 37990645be567..aa7af296087ef 100644 --- a/ci-operator/config/openshift/prom-label-proxy/openshift-prom-label-proxy-release-4.1.yaml +++ b/ci-operator/config/openshift/prom-label-proxy/openshift-prom-label-proxy-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/prom-label-proxy/openshift-prom-label-proxy-release-4.2.yaml b/ci-operator/config/openshift/prom-label-proxy/openshift-prom-label-proxy-release-4.2.yaml index ac4d212cf4abc..eee47a4daeed9 100644 --- a/ci-operator/config/openshift/prom-label-proxy/openshift-prom-label-proxy-release-4.2.yaml +++ b/ci-operator/config/openshift/prom-label-proxy/openshift-prom-label-proxy-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/prom-label-proxy/openshift-prom-label-proxy-release-4.3.yaml b/ci-operator/config/openshift/prom-label-proxy/openshift-prom-label-proxy-release-4.3.yaml index 2fff5578692ee..f4ad70530dca0 100644 --- a/ci-operator/config/openshift/prom-label-proxy/openshift-prom-label-proxy-release-4.3.yaml +++ b/ci-operator/config/openshift/prom-label-proxy/openshift-prom-label-proxy-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/prom-label-proxy/openshift-prom-label-proxy-release-4.4.yaml b/ci-operator/config/openshift/prom-label-proxy/openshift-prom-label-proxy-release-4.4.yaml index 15b9136cd9745..172f5ce27b174 100644 --- a/ci-operator/config/openshift/prom-label-proxy/openshift-prom-label-proxy-release-4.4.yaml +++ b/ci-operator/config/openshift/prom-label-proxy/openshift-prom-label-proxy-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/prometheus-alertmanager/openshift-prometheus-alertmanager-master.yaml b/ci-operator/config/openshift/prometheus-alertmanager/openshift-prometheus-alertmanager-master.yaml index 4768f16973370..ad3d16fcec560 100644 --- a/ci-operator/config/openshift/prometheus-alertmanager/openshift-prometheus-alertmanager-master.yaml +++ b/ci-operator/config/openshift/prometheus-alertmanager/openshift-prometheus-alertmanager-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/prometheus-alertmanager/openshift-prometheus-alertmanager-release-3.11.yaml b/ci-operator/config/openshift/prometheus-alertmanager/openshift-prometheus-alertmanager-release-3.11.yaml index bafddc5adb6dd..8c34e830b3a57 100644 --- a/ci-operator/config/openshift/prometheus-alertmanager/openshift-prometheus-alertmanager-release-3.11.yaml +++ b/ci-operator/config/openshift/prometheus-alertmanager/openshift-prometheus-alertmanager-release-3.11.yaml @@ -1,15 +1,8 @@ base_images: base: - cluster: https://api.ci.openshift.org name: origin-v3.11 namespace: openshift tag: base -build_root: - image_stream_tag: - cluster: https://api.ci.openshift.org - name: release - namespace: openshift - tag: golang-1.10 images: - from: base to: prometheus-alertmanager @@ -21,6 +14,10 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: origin-v3.11 namespace: openshift +build_root: + image_stream_tag: + name: release + namespace: openshift + tag: golang-1.10 diff --git a/ci-operator/config/openshift/prometheus-alertmanager/openshift-prometheus-alertmanager-release-4.1.yaml b/ci-operator/config/openshift/prometheus-alertmanager/openshift-prometheus-alertmanager-release-4.1.yaml index 5f188d1b704f2..e4759e3277d9e 100644 --- a/ci-operator/config/openshift/prometheus-alertmanager/openshift-prometheus-alertmanager-release-4.1.yaml +++ b/ci-operator/config/openshift/prometheus-alertmanager/openshift-prometheus-alertmanager-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/prometheus-alertmanager/openshift-prometheus-alertmanager-release-4.2.yaml b/ci-operator/config/openshift/prometheus-alertmanager/openshift-prometheus-alertmanager-release-4.2.yaml index 79373551c8463..0661e358b8741 100644 --- a/ci-operator/config/openshift/prometheus-alertmanager/openshift-prometheus-alertmanager-release-4.2.yaml +++ b/ci-operator/config/openshift/prometheus-alertmanager/openshift-prometheus-alertmanager-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/prometheus-alertmanager/openshift-prometheus-alertmanager-release-4.3.yaml b/ci-operator/config/openshift/prometheus-alertmanager/openshift-prometheus-alertmanager-release-4.3.yaml index 60fb4cab9e222..b8d0e39b0a488 100644 --- a/ci-operator/config/openshift/prometheus-alertmanager/openshift-prometheus-alertmanager-release-4.3.yaml +++ b/ci-operator/config/openshift/prometheus-alertmanager/openshift-prometheus-alertmanager-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/prometheus-alertmanager/openshift-prometheus-alertmanager-release-4.4.yaml b/ci-operator/config/openshift/prometheus-alertmanager/openshift-prometheus-alertmanager-release-4.4.yaml index 94e8a49c02cf9..e632b450cf693 100644 --- a/ci-operator/config/openshift/prometheus-alertmanager/openshift-prometheus-alertmanager-release-4.4.yaml +++ b/ci-operator/config/openshift/prometheus-alertmanager/openshift-prometheus-alertmanager-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/prometheus-operator/openshift-prometheus-operator-master.yaml b/ci-operator/config/openshift/prometheus-operator/openshift-prometheus-operator-master.yaml index c55bb9e4d2e58..1f3819b489da9 100644 --- a/ci-operator/config/openshift/prometheus-operator/openshift-prometheus-operator-master.yaml +++ b/ci-operator/config/openshift/prometheus-operator/openshift-prometheus-operator-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -29,7 +27,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/prometheus-operator/openshift-prometheus-operator-release-4.1.yaml b/ci-operator/config/openshift/prometheus-operator/openshift-prometheus-operator-release-4.1.yaml index e082d63a6046e..a1ada7a7785bd 100644 --- a/ci-operator/config/openshift/prometheus-operator/openshift-prometheus-operator-release-4.1.yaml +++ b/ci-operator/config/openshift/prometheus-operator/openshift-prometheus-operator-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -28,7 +26,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/prometheus-operator/openshift-prometheus-operator-release-4.2.yaml b/ci-operator/config/openshift/prometheus-operator/openshift-prometheus-operator-release-4.2.yaml index 46e3bcea6ad83..f9d12ac305907 100644 --- a/ci-operator/config/openshift/prometheus-operator/openshift-prometheus-operator-release-4.2.yaml +++ b/ci-operator/config/openshift/prometheus-operator/openshift-prometheus-operator-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -29,7 +27,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/prometheus-operator/openshift-prometheus-operator-release-4.3.yaml b/ci-operator/config/openshift/prometheus-operator/openshift-prometheus-operator-release-4.3.yaml index 2363df4ef089e..dd74842129f42 100644 --- a/ci-operator/config/openshift/prometheus-operator/openshift-prometheus-operator-release-4.3.yaml +++ b/ci-operator/config/openshift/prometheus-operator/openshift-prometheus-operator-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -30,7 +28,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/prometheus-operator/openshift-prometheus-operator-release-4.4.yaml b/ci-operator/config/openshift/prometheus-operator/openshift-prometheus-operator-release-4.4.yaml index b0a93be3b9de3..fc52a0af7fc72 100644 --- a/ci-operator/config/openshift/prometheus-operator/openshift-prometheus-operator-release-4.4.yaml +++ b/ci-operator/config/openshift/prometheus-operator/openshift-prometheus-operator-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -29,7 +27,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/prometheus/openshift-prometheus-master.yaml b/ci-operator/config/openshift/prometheus/openshift-prometheus-master.yaml index 7ec86baed8ecb..c8b936aae8297 100644 --- a/ci-operator/config/openshift/prometheus/openshift-prometheus-master.yaml +++ b/ci-operator/config/openshift/prometheus/openshift-prometheus-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/prometheus/openshift-prometheus-release-3.11.yaml b/ci-operator/config/openshift/prometheus/openshift-prometheus-release-3.11.yaml index 340ceb8f3243c..879ac3f1ef83c 100644 --- a/ci-operator/config/openshift/prometheus/openshift-prometheus-release-3.11.yaml +++ b/ci-operator/config/openshift/prometheus/openshift-prometheus-release-3.11.yaml @@ -1,15 +1,8 @@ base_images: base: - cluster: https://api.ci.openshift.org name: origin-v3.11 namespace: openshift tag: base -build_root: - image_stream_tag: - cluster: https://api.ci.openshift.org - name: release - namespace: openshift - tag: golang-1.10 images: - from: base to: prometheus @@ -21,6 +14,10 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: origin-v3.11 namespace: openshift +build_root: + image_stream_tag: + name: release + namespace: openshift + tag: golang-1.10 diff --git a/ci-operator/config/openshift/prometheus/openshift-prometheus-release-4.1.yaml b/ci-operator/config/openshift/prometheus/openshift-prometheus-release-4.1.yaml index 4f184bc4b7891..4a94dd6b11248 100644 --- a/ci-operator/config/openshift/prometheus/openshift-prometheus-release-4.1.yaml +++ b/ci-operator/config/openshift/prometheus/openshift-prometheus-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/prometheus/openshift-prometheus-release-4.2.yaml b/ci-operator/config/openshift/prometheus/openshift-prometheus-release-4.2.yaml index ae969fc7b3c81..53c42afc29e6d 100644 --- a/ci-operator/config/openshift/prometheus/openshift-prometheus-release-4.2.yaml +++ b/ci-operator/config/openshift/prometheus/openshift-prometheus-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/prometheus/openshift-prometheus-release-4.3.yaml b/ci-operator/config/openshift/prometheus/openshift-prometheus-release-4.3.yaml index 71f6f64d19a23..f5b2500f557c1 100644 --- a/ci-operator/config/openshift/prometheus/openshift-prometheus-release-4.3.yaml +++ b/ci-operator/config/openshift/prometheus/openshift-prometheus-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/prometheus/openshift-prometheus-release-4.4.yaml b/ci-operator/config/openshift/prometheus/openshift-prometheus-release-4.4.yaml index 24ce5f310b848..d2ddafdff1613 100644 --- a/ci-operator/config/openshift/prometheus/openshift-prometheus-release-4.4.yaml +++ b/ci-operator/config/openshift/prometheus/openshift-prometheus-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/ptp-operator/openshift-ptp-operator-master.yaml b/ci-operator/config/openshift/ptp-operator/openshift-ptp-operator-master.yaml index a5dd07dc0b7d8..e1b6c458f51cb 100644 --- a/ci-operator/config/openshift/ptp-operator/openshift-ptp-operator-master.yaml +++ b/ci-operator/config/openshift/ptp-operator/openshift-ptp-operator-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/ptp-operator/openshift-ptp-operator-release-4.3.yaml b/ci-operator/config/openshift/ptp-operator/openshift-ptp-operator-release-4.3.yaml index 57102464f03ff..633f706fe0fb8 100644 --- a/ci-operator/config/openshift/ptp-operator/openshift-ptp-operator-release-4.3.yaml +++ b/ci-operator/config/openshift/ptp-operator/openshift-ptp-operator-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/ptp-operator/openshift-ptp-operator-release-4.4.yaml b/ci-operator/config/openshift/ptp-operator/openshift-ptp-operator-release-4.4.yaml index f78fe0f2e9b92..ee7e1fd3546cf 100644 --- a/ci-operator/config/openshift/ptp-operator/openshift-ptp-operator-release-4.4.yaml +++ b/ci-operator/config/openshift/ptp-operator/openshift-ptp-operator-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/rbac-permissions-operator/openshift-rbac-permissions-operator-master.yaml b/ci-operator/config/openshift/rbac-permissions-operator/openshift-rbac-permissions-operator-master.yaml index 6c9a3a6587d02..160efac9324c3 100644 --- a/ci-operator/config/openshift/rbac-permissions-operator/openshift-rbac-permissions-operator-master.yaml +++ b/ci-operator/config/openshift/rbac-permissions-operator/openshift-rbac-permissions-operator-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.11 @@ -25,6 +23,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp diff --git a/ci-operator/config/openshift/rbac-permissions-operator/openshift-rbac-permissions-operator-release-4.2.yaml b/ci-operator/config/openshift/rbac-permissions-operator/openshift-rbac-permissions-operator-release-4.2.yaml index a31f9ba3e6d3e..f825f9d4ab201 100644 --- a/ci-operator/config/openshift/rbac-permissions-operator/openshift-rbac-permissions-operator-release-4.2.yaml +++ b/ci-operator/config/openshift/rbac-permissions-operator/openshift-rbac-permissions-operator-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.11 @@ -25,6 +23,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp diff --git a/ci-operator/config/openshift/rbac-permissions-operator/openshift-rbac-permissions-operator-release-4.3.yaml b/ci-operator/config/openshift/rbac-permissions-operator/openshift-rbac-permissions-operator-release-4.3.yaml index ddf8dbf28b96b..76d3cae673664 100644 --- a/ci-operator/config/openshift/rbac-permissions-operator/openshift-rbac-permissions-operator-release-4.3.yaml +++ b/ci-operator/config/openshift/rbac-permissions-operator/openshift-rbac-permissions-operator-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.11 @@ -26,6 +24,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp diff --git a/ci-operator/config/openshift/rbac-permissions-operator/openshift-rbac-permissions-operator-release-4.4.yaml b/ci-operator/config/openshift/rbac-permissions-operator/openshift-rbac-permissions-operator-release-4.4.yaml index ec20fb5fdfde5..f71a33c04c86d 100644 --- a/ci-operator/config/openshift/rbac-permissions-operator/openshift-rbac-permissions-operator-release-4.4.yaml +++ b/ci-operator/config/openshift/rbac-permissions-operator/openshift-rbac-permissions-operator-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.11 @@ -25,6 +23,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp diff --git a/ci-operator/config/openshift/release-controller/openshift-release-controller-master.yaml b/ci-operator/config/openshift/release-controller/openshift-release-controller-master.yaml index 8a507e9290a9e..10c4571c17a20 100644 --- a/ci-operator/config/openshift/release-controller/openshift-release-controller-master.yaml +++ b/ci-operator/config/openshift/release-controller/openshift-release-controller-master.yaml @@ -1,26 +1,17 @@ base_images: os: - cluster: https://api.ci.openshift.org name: centos namespace: openshift - tag: "7" + tag: '7' binary_build_commands: make -build_root: - image_stream_tag: - cluster: https://api.ci.openshift.org - name: release - namespace: openshift - tag: golang-1.13 images: - from: os inputs: root: as: - - "0" - paths: null + - '0' to: release-controller promotion: - name: "" namespace: ci tag: latest resources: @@ -30,6 +21,11 @@ resources: requests: cpu: 100m memory: 200Mi +build_root: + image_stream_tag: + name: release + namespace: openshift + tag: golang-1.13 tests: - artifact_dir: /tmp/artifacts as: unit diff --git a/ci-operator/config/openshift/release/openshift-release-master.yaml b/ci-operator/config/openshift/release/openshift-release-master.yaml index e1d8b32f530d2..5ade70b378a27 100644 --- a/ci-operator/config/openshift/release/openshift-release-master.yaml +++ b/ci-operator/config/openshift/release/openshift-release-master.yaml @@ -1,6 +1,5 @@ build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 diff --git a/ci-operator/config/openshift/router/openshift-router-master.yaml b/ci-operator/config/openshift/router/openshift-router-master.yaml index 8e8b433a0daa2..81518aa0ea58f 100644 --- a/ci-operator/config/openshift/router/openshift-router-master.yaml +++ b/ci-operator/config/openshift/router/openshift-router-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -32,7 +30,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/router/openshift-router-release-4.1.yaml b/ci-operator/config/openshift/router/openshift-router-release-4.1.yaml index 713466bae880c..4b339dc1608ae 100644 --- a/ci-operator/config/openshift/router/openshift-router-release-4.1.yaml +++ b/ci-operator/config/openshift/router/openshift-router-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -32,7 +30,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/router/openshift-router-release-4.2.yaml b/ci-operator/config/openshift/router/openshift-router-release-4.2.yaml index be047a6ae2a38..6ca7e080ea984 100644 --- a/ci-operator/config/openshift/router/openshift-router-release-4.2.yaml +++ b/ci-operator/config/openshift/router/openshift-router-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -32,7 +30,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/router/openshift-router-release-4.3.yaml b/ci-operator/config/openshift/router/openshift-router-release-4.3.yaml index e5b566e886312..af5e9f05fd459 100644 --- a/ci-operator/config/openshift/router/openshift-router-release-4.3.yaml +++ b/ci-operator/config/openshift/router/openshift-router-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -33,7 +31,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/router/openshift-router-release-4.4.yaml b/ci-operator/config/openshift/router/openshift-router-release-4.4.yaml index 55cf5b31e0843..e5d7dfbe690a5 100644 --- a/ci-operator/config/openshift/router/openshift-router-release-4.4.yaml +++ b/ci-operator/config/openshift/router/openshift-router-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -32,7 +30,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/runtime-utils/openshift-runtime-utils-master.yaml b/ci-operator/config/openshift/runtime-utils/openshift-runtime-utils-master.yaml index d1f20e213a2d1..2f6607a681586 100644 --- a/ci-operator/config/openshift/runtime-utils/openshift-runtime-utils-master.yaml +++ b/ci-operator/config/openshift/runtime-utils/openshift-runtime-utils-master.yaml @@ -1,12 +1,10 @@ base_images: os: - cluster: https://api.ci.openshift.org name: centos namespace: openshift tag: "7" build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -21,7 +19,6 @@ resources: cpu: "3" memory: 8Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/runtime-utils/openshift-runtime-utils-release-4.3.yaml b/ci-operator/config/openshift/runtime-utils/openshift-runtime-utils-release-4.3.yaml index 912baad3e04d7..07c84ba37b733 100644 --- a/ci-operator/config/openshift/runtime-utils/openshift-runtime-utils-release-4.3.yaml +++ b/ci-operator/config/openshift/runtime-utils/openshift-runtime-utils-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: os: - cluster: https://api.ci.openshift.org name: centos namespace: openshift tag: "7" build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -22,7 +20,6 @@ resources: cpu: "3" memory: 8Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/runtime-utils/openshift-runtime-utils-release-4.4.yaml b/ci-operator/config/openshift/runtime-utils/openshift-runtime-utils-release-4.4.yaml index 87049155f5c1f..8b789d6382ff4 100644 --- a/ci-operator/config/openshift/runtime-utils/openshift-runtime-utils-release-4.4.yaml +++ b/ci-operator/config/openshift/runtime-utils/openshift-runtime-utils-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: os: - cluster: https://api.ci.openshift.org name: centos namespace: openshift tag: "7" build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -21,7 +19,6 @@ resources: cpu: "3" memory: 8Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/sdn/openshift-sdn-master.yaml b/ci-operator/config/openshift/sdn/openshift-sdn-master.yaml index f2990a9e7e078..93447bce145bc 100644 --- a/ci-operator/config/openshift/sdn/openshift-sdn-master.yaml +++ b/ci-operator/config/openshift/sdn/openshift-sdn-master.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base binary_build_commands: make build --warn-undefined-variables build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -55,7 +53,6 @@ resources: cpu: "3" memory: 6Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/sdn/openshift-sdn-release-4.2.yaml b/ci-operator/config/openshift/sdn/openshift-sdn-release-4.2.yaml index 392799f7fc284..bd26cd56619b1 100644 --- a/ci-operator/config/openshift/sdn/openshift-sdn-release-4.2.yaml +++ b/ci-operator/config/openshift/sdn/openshift-sdn-release-4.2.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base binary_build_commands: make build --warn-undefined-variables build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -47,7 +45,6 @@ resources: cpu: "3" memory: 6Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/sdn/openshift-sdn-release-4.3.yaml b/ci-operator/config/openshift/sdn/openshift-sdn-release-4.3.yaml index d58822f10f6a1..5c2a8d8529a1b 100644 --- a/ci-operator/config/openshift/sdn/openshift-sdn-release-4.3.yaml +++ b/ci-operator/config/openshift/sdn/openshift-sdn-release-4.3.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base binary_build_commands: make build --warn-undefined-variables build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -56,7 +54,6 @@ resources: cpu: "3" memory: 6Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/sdn/openshift-sdn-release-4.4.yaml b/ci-operator/config/openshift/sdn/openshift-sdn-release-4.4.yaml index d3f057b5025e1..2eb821219e652 100644 --- a/ci-operator/config/openshift/sdn/openshift-sdn-release-4.4.yaml +++ b/ci-operator/config/openshift/sdn/openshift-sdn-release-4.4.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base binary_build_commands: make build --warn-undefined-variables build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -55,7 +53,6 @@ resources: cpu: "3" memory: 6Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/service-ca-operator/openshift-service-ca-operator-master.yaml b/ci-operator/config/openshift/service-ca-operator/openshift-service-ca-operator-master.yaml index 2e7f9fe8fbbfc..234f1a3ec27bf 100644 --- a/ci-operator/config/openshift/service-ca-operator/openshift-service-ca-operator-master.yaml +++ b/ci-operator/config/openshift/service-ca-operator/openshift-service-ca-operator-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -29,7 +27,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/service-ca-operator/openshift-service-ca-operator-release-4.1.yaml b/ci-operator/config/openshift/service-ca-operator/openshift-service-ca-operator-release-4.1.yaml index 907296b755945..2228575037e8f 100644 --- a/ci-operator/config/openshift/service-ca-operator/openshift-service-ca-operator-release-4.1.yaml +++ b/ci-operator/config/openshift/service-ca-operator/openshift-service-ca-operator-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -29,7 +27,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/service-ca-operator/openshift-service-ca-operator-release-4.2.yaml b/ci-operator/config/openshift/service-ca-operator/openshift-service-ca-operator-release-4.2.yaml index acfbbfc04d863..1abc8a653103a 100644 --- a/ci-operator/config/openshift/service-ca-operator/openshift-service-ca-operator-release-4.2.yaml +++ b/ci-operator/config/openshift/service-ca-operator/openshift-service-ca-operator-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -29,7 +27,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/service-ca-operator/openshift-service-ca-operator-release-4.3.yaml b/ci-operator/config/openshift/service-ca-operator/openshift-service-ca-operator-release-4.3.yaml index 390e19fa4ecf8..4c1cb96e6a585 100644 --- a/ci-operator/config/openshift/service-ca-operator/openshift-service-ca-operator-release-4.3.yaml +++ b/ci-operator/config/openshift/service-ca-operator/openshift-service-ca-operator-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -30,7 +28,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/service-ca-operator/openshift-service-ca-operator-release-4.4.yaml b/ci-operator/config/openshift/service-ca-operator/openshift-service-ca-operator-release-4.4.yaml index e27c7f44c8fe0..aaaf86ee7dad4 100644 --- a/ci-operator/config/openshift/service-ca-operator/openshift-service-ca-operator-release-4.4.yaml +++ b/ci-operator/config/openshift/service-ca-operator/openshift-service-ca-operator-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -29,7 +27,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/service-catalog/openshift-service-catalog-master.yaml b/ci-operator/config/openshift/service-catalog/openshift-service-catalog-master.yaml index fee2727f6eb94..b91831d890188 100644 --- a/ci-operator/config/openshift/service-catalog/openshift-service-catalog-master.yaml +++ b/ci-operator/config/openshift/service-catalog/openshift-service-catalog-master.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base binary_build_commands: make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -26,7 +24,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp test_binary_build_commands: OS_GOFLAGS='-race' make build diff --git a/ci-operator/config/openshift/service-catalog/openshift-service-catalog-release-3.11.yaml b/ci-operator/config/openshift/service-catalog/openshift-service-catalog-release-3.11.yaml index c34f2cfe5e382..c7e588e4e9f75 100644 --- a/ci-operator/config/openshift/service-catalog/openshift-service-catalog-release-3.11.yaml +++ b/ci-operator/config/openshift/service-catalog/openshift-service-catalog-release-3.11.yaml @@ -4,12 +4,6 @@ base_rpm_images: namespace: openshift tag: base binary_build_commands: make build -build_root: - image_stream_tag: - cluster: https://api.ci.openshift.org - name: release - namespace: openshift - tag: golang-1.10 canonical_go_repository: github.com/kubernetes-incubator/service-catalog images: - context_dir: images/service-catalog/ @@ -24,9 +18,15 @@ resources: memory: 200Mi rpm_build_commands: make build-rpms tag_specification: - cluster: https://api.ci.openshift.org name: origin-v3.11 namespace: openshift + tag: '' + tag_overrides: {} +build_root: + image_stream_tag: + name: release + namespace: openshift + tag: golang-1.10 test_binary_build_commands: OS_GOFLAGS='-race' make build tests: - artifact_dir: /tmp/artifacts diff --git a/ci-operator/config/openshift/service-catalog/openshift-service-catalog-release-4.1.yaml b/ci-operator/config/openshift/service-catalog/openshift-service-catalog-release-4.1.yaml index 16e7ea987d6ef..cf4730ae6aaa4 100644 --- a/ci-operator/config/openshift/service-catalog/openshift-service-catalog-release-4.1.yaml +++ b/ci-operator/config/openshift/service-catalog/openshift-service-catalog-release-4.1.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base binary_build_commands: make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -26,7 +24,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp test_binary_build_commands: OS_GOFLAGS='-race' make build diff --git a/ci-operator/config/openshift/service-catalog/openshift-service-catalog-release-4.2.yaml b/ci-operator/config/openshift/service-catalog/openshift-service-catalog-release-4.2.yaml index 6f0c3afe69b8e..c2861f8753be6 100644 --- a/ci-operator/config/openshift/service-catalog/openshift-service-catalog-release-4.2.yaml +++ b/ci-operator/config/openshift/service-catalog/openshift-service-catalog-release-4.2.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base binary_build_commands: make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -26,7 +24,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp test_binary_build_commands: OS_GOFLAGS='-race' make build diff --git a/ci-operator/config/openshift/service-catalog/openshift-service-catalog-release-4.3.yaml b/ci-operator/config/openshift/service-catalog/openshift-service-catalog-release-4.3.yaml index f8ace274e14b6..738f5dbe0da9f 100644 --- a/ci-operator/config/openshift/service-catalog/openshift-service-catalog-release-4.3.yaml +++ b/ci-operator/config/openshift/service-catalog/openshift-service-catalog-release-4.3.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base binary_build_commands: make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -27,7 +25,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp test_binary_build_commands: OS_GOFLAGS='-race' make build diff --git a/ci-operator/config/openshift/service-catalog/openshift-service-catalog-release-4.4.yaml b/ci-operator/config/openshift/service-catalog/openshift-service-catalog-release-4.4.yaml index c66bf000ae092..69da3160ead2f 100644 --- a/ci-operator/config/openshift/service-catalog/openshift-service-catalog-release-4.4.yaml +++ b/ci-operator/config/openshift/service-catalog/openshift-service-catalog-release-4.4.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base binary_build_commands: make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -26,7 +24,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp test_binary_build_commands: OS_GOFLAGS='-race' make build diff --git a/ci-operator/config/openshift/sig-storage-local-static-provisioner/openshift-sig-storage-local-static-provisioner-master.yaml b/ci-operator/config/openshift/sig-storage-local-static-provisioner/openshift-sig-storage-local-static-provisioner-master.yaml index aa8946c168756..72ecd12ca2097 100644 --- a/ci-operator/config/openshift/sig-storage-local-static-provisioner/openshift-sig-storage-local-static-provisioner-master.yaml +++ b/ci-operator/config/openshift/sig-storage-local-static-provisioner/openshift-sig-storage-local-static-provisioner-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.11 @@ -31,7 +29,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/sig-storage-local-static-provisioner/openshift-sig-storage-local-static-provisioner-release-4.2.yaml b/ci-operator/config/openshift/sig-storage-local-static-provisioner/openshift-sig-storage-local-static-provisioner-release-4.2.yaml index 29514c0894854..951e3b7b931f7 100644 --- a/ci-operator/config/openshift/sig-storage-local-static-provisioner/openshift-sig-storage-local-static-provisioner-release-4.2.yaml +++ b/ci-operator/config/openshift/sig-storage-local-static-provisioner/openshift-sig-storage-local-static-provisioner-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.11 @@ -31,7 +29,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/sig-storage-local-static-provisioner/openshift-sig-storage-local-static-provisioner-release-4.3.yaml b/ci-operator/config/openshift/sig-storage-local-static-provisioner/openshift-sig-storage-local-static-provisioner-release-4.3.yaml index fe8a1d07cbecf..4d35c50c7c705 100644 --- a/ci-operator/config/openshift/sig-storage-local-static-provisioner/openshift-sig-storage-local-static-provisioner-release-4.3.yaml +++ b/ci-operator/config/openshift/sig-storage-local-static-provisioner/openshift-sig-storage-local-static-provisioner-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.11 @@ -32,7 +30,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/sig-storage-local-static-provisioner/openshift-sig-storage-local-static-provisioner-release-4.4.yaml b/ci-operator/config/openshift/sig-storage-local-static-provisioner/openshift-sig-storage-local-static-provisioner-release-4.4.yaml index f29070f09ef2f..c5f38b56d71b7 100644 --- a/ci-operator/config/openshift/sig-storage-local-static-provisioner/openshift-sig-storage-local-static-provisioner-release-4.4.yaml +++ b/ci-operator/config/openshift/sig-storage-local-static-provisioner/openshift-sig-storage-local-static-provisioner-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.11 @@ -31,7 +29,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/source-to-image/openshift-source-to-image-master.yaml b/ci-operator/config/openshift/source-to-image/openshift-source-to-image-master.yaml index 0aa73d1f60faf..bce9ef1cc0aae 100644 --- a/ci-operator/config/openshift/source-to-image/openshift-source-to-image-master.yaml +++ b/ci-operator/config/openshift/source-to-image/openshift-source-to-image-master.yaml @@ -1,10 +1,9 @@ -binary_build_commands: make build build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 +binary_build_commands: make build resources: '*': limits: diff --git a/ci-operator/config/openshift/sriov-cni/openshift-sriov-cni-master.yaml b/ci-operator/config/openshift/sriov-cni/openshift-sriov-cni-master.yaml index 72623750c5173..f7f2abebc3ca1 100644 --- a/ci-operator/config/openshift/sriov-cni/openshift-sriov-cni-master.yaml +++ b/ci-operator/config/openshift/sriov-cni/openshift-sriov-cni-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/sriov-cni/openshift-sriov-cni-release-4.1.yaml b/ci-operator/config/openshift/sriov-cni/openshift-sriov-cni-release-4.1.yaml index 0eacbb4899a48..0057db1524e3b 100644 --- a/ci-operator/config/openshift/sriov-cni/openshift-sriov-cni-release-4.1.yaml +++ b/ci-operator/config/openshift/sriov-cni/openshift-sriov-cni-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/sriov-cni/openshift-sriov-cni-release-4.2.yaml b/ci-operator/config/openshift/sriov-cni/openshift-sriov-cni-release-4.2.yaml index d009793070240..4d2b1ceebbde8 100644 --- a/ci-operator/config/openshift/sriov-cni/openshift-sriov-cni-release-4.2.yaml +++ b/ci-operator/config/openshift/sriov-cni/openshift-sriov-cni-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/sriov-cni/openshift-sriov-cni-release-4.3.yaml b/ci-operator/config/openshift/sriov-cni/openshift-sriov-cni-release-4.3.yaml index ca04cab3fce1a..1499a4a0f8049 100644 --- a/ci-operator/config/openshift/sriov-cni/openshift-sriov-cni-release-4.3.yaml +++ b/ci-operator/config/openshift/sriov-cni/openshift-sriov-cni-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -26,7 +24,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/sriov-cni/openshift-sriov-cni-release-4.4.yaml b/ci-operator/config/openshift/sriov-cni/openshift-sriov-cni-release-4.4.yaml index 933e69ce00130..986cf19124a70 100644 --- a/ci-operator/config/openshift/sriov-cni/openshift-sriov-cni-release-4.4.yaml +++ b/ci-operator/config/openshift/sriov-cni/openshift-sriov-cni-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/sriov-dp-admission-controller/openshift-sriov-dp-admission-controller-master.yaml b/ci-operator/config/openshift/sriov-dp-admission-controller/openshift-sriov-dp-admission-controller-master.yaml index b99e79a577dc3..4ac757f89f904 100644 --- a/ci-operator/config/openshift/sriov-dp-admission-controller/openshift-sriov-dp-admission-controller-master.yaml +++ b/ci-operator/config/openshift/sriov-dp-admission-controller/openshift-sriov-dp-admission-controller-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/sriov-dp-admission-controller/openshift-sriov-dp-admission-controller-release-4.1.yaml b/ci-operator/config/openshift/sriov-dp-admission-controller/openshift-sriov-dp-admission-controller-release-4.1.yaml index 8f4e4662284c1..82c5d95a772a4 100644 --- a/ci-operator/config/openshift/sriov-dp-admission-controller/openshift-sriov-dp-admission-controller-release-4.1.yaml +++ b/ci-operator/config/openshift/sriov-dp-admission-controller/openshift-sriov-dp-admission-controller-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/sriov-dp-admission-controller/openshift-sriov-dp-admission-controller-release-4.2.yaml b/ci-operator/config/openshift/sriov-dp-admission-controller/openshift-sriov-dp-admission-controller-release-4.2.yaml index a6ae5a558cdfb..01ba60a467515 100644 --- a/ci-operator/config/openshift/sriov-dp-admission-controller/openshift-sriov-dp-admission-controller-release-4.2.yaml +++ b/ci-operator/config/openshift/sriov-dp-admission-controller/openshift-sriov-dp-admission-controller-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/sriov-dp-admission-controller/openshift-sriov-dp-admission-controller-release-4.3.yaml b/ci-operator/config/openshift/sriov-dp-admission-controller/openshift-sriov-dp-admission-controller-release-4.3.yaml index bf0ef8fca7d1b..7303ad86601a1 100644 --- a/ci-operator/config/openshift/sriov-dp-admission-controller/openshift-sriov-dp-admission-controller-release-4.3.yaml +++ b/ci-operator/config/openshift/sriov-dp-admission-controller/openshift-sriov-dp-admission-controller-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -26,7 +24,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/sriov-dp-admission-controller/openshift-sriov-dp-admission-controller-release-4.4.yaml b/ci-operator/config/openshift/sriov-dp-admission-controller/openshift-sriov-dp-admission-controller-release-4.4.yaml index 1652c831f25f7..7cbd352e2e979 100644 --- a/ci-operator/config/openshift/sriov-dp-admission-controller/openshift-sriov-dp-admission-controller-release-4.4.yaml +++ b/ci-operator/config/openshift/sriov-dp-admission-controller/openshift-sriov-dp-admission-controller-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/sriov-network-device-plugin/openshift-sriov-network-device-plugin-master.yaml b/ci-operator/config/openshift/sriov-network-device-plugin/openshift-sriov-network-device-plugin-master.yaml index 337ad19919ae6..d9ba8a2a0aa39 100644 --- a/ci-operator/config/openshift/sriov-network-device-plugin/openshift-sriov-network-device-plugin-master.yaml +++ b/ci-operator/config/openshift/sriov-network-device-plugin/openshift-sriov-network-device-plugin-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/sriov-network-device-plugin/openshift-sriov-network-device-plugin-release-4.1.yaml b/ci-operator/config/openshift/sriov-network-device-plugin/openshift-sriov-network-device-plugin-release-4.1.yaml index cbb2d9551e727..34fc4e949e3b0 100644 --- a/ci-operator/config/openshift/sriov-network-device-plugin/openshift-sriov-network-device-plugin-release-4.1.yaml +++ b/ci-operator/config/openshift/sriov-network-device-plugin/openshift-sriov-network-device-plugin-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/sriov-network-device-plugin/openshift-sriov-network-device-plugin-release-4.2.yaml b/ci-operator/config/openshift/sriov-network-device-plugin/openshift-sriov-network-device-plugin-release-4.2.yaml index 9b7b64291fd62..245cd0e8f8af3 100644 --- a/ci-operator/config/openshift/sriov-network-device-plugin/openshift-sriov-network-device-plugin-release-4.2.yaml +++ b/ci-operator/config/openshift/sriov-network-device-plugin/openshift-sriov-network-device-plugin-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/sriov-network-device-plugin/openshift-sriov-network-device-plugin-release-4.3.yaml b/ci-operator/config/openshift/sriov-network-device-plugin/openshift-sriov-network-device-plugin-release-4.3.yaml index c6909211a2e73..a789ef1818a34 100644 --- a/ci-operator/config/openshift/sriov-network-device-plugin/openshift-sriov-network-device-plugin-release-4.3.yaml +++ b/ci-operator/config/openshift/sriov-network-device-plugin/openshift-sriov-network-device-plugin-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -26,7 +24,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/sriov-network-device-plugin/openshift-sriov-network-device-plugin-release-4.4.yaml b/ci-operator/config/openshift/sriov-network-device-plugin/openshift-sriov-network-device-plugin-release-4.4.yaml index c4d1b15e8628b..03e4ee41c61f8 100644 --- a/ci-operator/config/openshift/sriov-network-device-plugin/openshift-sriov-network-device-plugin-release-4.4.yaml +++ b/ci-operator/config/openshift/sriov-network-device-plugin/openshift-sriov-network-device-plugin-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/sriov-network-operator/openshift-sriov-network-operator-master.yaml b/ci-operator/config/openshift/sriov-network-operator/openshift-sriov-network-operator-master.yaml index 1fab70747255f..0d652bd3c1e74 100644 --- a/ci-operator/config/openshift/sriov-network-operator/openshift-sriov-network-operator-master.yaml +++ b/ci-operator/config/openshift/sriov-network-operator/openshift-sriov-network-operator-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -31,7 +29,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/sriov-network-operator/openshift-sriov-network-operator-release-4.2.yaml b/ci-operator/config/openshift/sriov-network-operator/openshift-sriov-network-operator-release-4.2.yaml index b5683c56c757f..299d52cb47019 100644 --- a/ci-operator/config/openshift/sriov-network-operator/openshift-sriov-network-operator-release-4.2.yaml +++ b/ci-operator/config/openshift/sriov-network-operator/openshift-sriov-network-operator-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -28,7 +26,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/sriov-network-operator/openshift-sriov-network-operator-release-4.3.yaml b/ci-operator/config/openshift/sriov-network-operator/openshift-sriov-network-operator-release-4.3.yaml index 020b3fe2fc8eb..d68c75d1184e1 100644 --- a/ci-operator/config/openshift/sriov-network-operator/openshift-sriov-network-operator-release-4.3.yaml +++ b/ci-operator/config/openshift/sriov-network-operator/openshift-sriov-network-operator-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -32,7 +30,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/sriov-network-operator/openshift-sriov-network-operator-release-4.4.yaml b/ci-operator/config/openshift/sriov-network-operator/openshift-sriov-network-operator-release-4.4.yaml index 0e043745762a3..6a00fa603dae7 100644 --- a/ci-operator/config/openshift/sriov-network-operator/openshift-sriov-network-operator-release-4.4.yaml +++ b/ci-operator/config/openshift/sriov-network-operator/openshift-sriov-network-operator-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -31,7 +29,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/tektoncd-catalog/openshift-tektoncd-catalog-release-next.yaml b/ci-operator/config/openshift/tektoncd-catalog/openshift-tektoncd-catalog-release-next.yaml index 6bf36c28135e6..5da8423143da4 100644 --- a/ci-operator/config/openshift/tektoncd-catalog/openshift-tektoncd-catalog-release-next.yaml +++ b/ci-operator/config/openshift/tektoncd-catalog/openshift-tektoncd-catalog-release-next.yaml @@ -1,12 +1,21 @@ +tag_specification: + name: '4.2' + namespace: ocp + +promotion: + namespace: openshift + name: release-next + base_images: base: - cluster: https://api.ci.openshift.org - name: "4.2" + name: '4.2' namespace: ocp tag: base + build_root: project_image: dockerfile_path: openshift/Dockerfile + images: - dockerfile_path: Dockerfile from: base @@ -16,22 +25,21 @@ images: - destination_dir: . source_path: /go/src/github.com/openshift/tektoncd-catalog/s2i/. to: tektoncd-catalog-s2i + promotion: - name: tektoncd-next namespace: openshift + name: tektoncd-next + +tests: +- as: e2e + commands: "LOCAL_CI_RUN=true ./test/e2e-tests.sh" + openshift_installer_src: + cluster_profile: aws + resources: '*': limits: memory: 6Gi requests: - cpu: 100m memory: 250Mi -tag_specification: - cluster: https://api.ci.openshift.org - name: "4.2" - namespace: ocp -tests: -- as: e2e - commands: LOCAL_CI_RUN=true ./test/e2e-tests.sh - openshift_installer_src: - cluster_profile: aws + cpu: 100m diff --git a/ci-operator/config/openshift/tektoncd-cli/openshift-tektoncd-cli-release-next.yaml b/ci-operator/config/openshift/tektoncd-cli/openshift-tektoncd-cli-release-next.yaml index 5e142bed3ebf7..3d69fc12f0911 100644 --- a/ci-operator/config/openshift/tektoncd-cli/openshift-tektoncd-cli-release-next.yaml +++ b/ci-operator/config/openshift/tektoncd-cli/openshift-tektoncd-cli-release-next.yaml @@ -1,30 +1,34 @@ +tag_specification: + name: '4.2' + namespace: ocp +promotion: + namespace: openshift + name: release-next base_images: base: - cluster: https://api.ci.openshift.org - name: "4.2" + name: '4.2' namespace: ocp tag: base -binary_build_commands: make build_root: project_image: dockerfile_path: openshift/Dockerfile canonical_go_repository: github.com/tektoncd/cli +binary_build_commands: make + promotion: - name: tektoncd-next namespace: openshift + name: tektoncd-next + +tests: +- as: e2e + commands: "make -C openshift test-e2e-downstream-stable" + openshift_installer_src: + cluster_profile: aws + resources: '*': limits: memory: 6Gi requests: - cpu: 100m memory: 250Mi -tag_specification: - cluster: https://api.ci.openshift.org - name: "4.2" - namespace: ocp -tests: -- as: e2e - commands: make -C openshift test-e2e-downstream-stable - openshift_installer_src: - cluster_profile: aws + cpu: 100m diff --git a/ci-operator/config/openshift/tektoncd-cli/openshift-tektoncd-cli-release-next__variant.yaml b/ci-operator/config/openshift/tektoncd-cli/openshift-tektoncd-cli-release-next__variant.yaml index dc108071fcb71..9809e8a09b201 100644 --- a/ci-operator/config/openshift/tektoncd-cli/openshift-tektoncd-cli-release-next__variant.yaml +++ b/ci-operator/config/openshift/tektoncd-cli/openshift-tektoncd-cli-release-next__variant.yaml @@ -1,30 +1,34 @@ +tag_specification: + name: '4.2' + namespace: ocp +promotion: + namespace: openshift + name: release-next base_images: base: - cluster: https://api.ci.openshift.org - name: "4.2" + name: '4.2' namespace: ocp tag: base -binary_build_commands: make build_root: project_image: dockerfile_path: openshift/Dockerfile canonical_go_repository: github.com/tektoncd/cli +binary_build_commands: make + promotion: - name: tektoncd-next namespace: openshift + name: tektoncd-next + +tests: +- as: e2e-pipeline-nightly + commands: "make -C openshift test-e2e-downstream-nightly" + openshift_installer_src: + cluster_profile: aws + resources: '*': limits: memory: 6Gi requests: - cpu: 100m memory: 250Mi -tag_specification: - cluster: https://api.ci.openshift.org - name: "4.2" - namespace: ocp -tests: -- as: e2e-pipeline-nightly - commands: make -C openshift test-e2e-downstream-nightly - openshift_installer_src: - cluster_profile: aws + cpu: 100m diff --git a/ci-operator/config/openshift/tektoncd-pipeline-operator/openshift-tektoncd-pipeline-operator-master.yaml b/ci-operator/config/openshift/tektoncd-pipeline-operator/openshift-tektoncd-pipeline-operator-master.yaml index 1b3b9a1b5d662..d8385c629cd0e 100644 --- a/ci-operator/config/openshift/tektoncd-pipeline-operator/openshift-tektoncd-pipeline-operator-master.yaml +++ b/ci-operator/config/openshift/tektoncd-pipeline-operator/openshift-tektoncd-pipeline-operator-master.yaml @@ -1,50 +1,55 @@ + base_images: + os: + name: centos + namespace: openshift + tag: '7' operator-registry: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: operator-registry - os: - cluster: https://api.ci.openshift.org - name: centos - namespace: openshift - tag: "7" -binary_build_commands: make build -build_root: - project_image: - dockerfile_path: openshift-ci/Dockerfile.tools + +resources: + '*': + limits: + memory: 6Gi + requests: + memory: 250Mi + cpu: 100m + images: -- dockerfile_path: openshift-ci/Dockerfile.deploy - from: os +- from: os inputs: bin: paths: - destination_dir: . source_path: /go/src/github.com/openshift/tektoncd-pipeline-operator/out/operator + dockerfile_path: openshift-ci/Dockerfile.deploy to: tektoncd-pipeline-operator -- dockerfile_path: openshift-ci/Dockerfile.registry.intermediate - from: operator-registry +- from: operator-registry + dockerfile_path: openshift-ci/Dockerfile.registry.intermediate to: operator-registry-base -- dockerfile_path: openshift-ci/Dockerfile.registry.build - from: operator-registry-base +- from: operator-registry-base + dockerfile_path: openshift-ci/Dockerfile.registry.build to: tektoncd-pipeline-operator-registry -- dockerfile_path: openshift-ci/Dockerfile.upgrade.build - from: src +- from: src + dockerfile_path: openshift-ci/Dockerfile.upgrade.build to: upgrade-manifest-build + promotion: - name: tektoncd-pipeline namespace: openshift -resources: - '*': - limits: - memory: 6Gi - requests: - cpu: 100m - memory: 250Mi + name: tektoncd-pipeline + +build_root: + project_image: + dockerfile_path: openshift-ci/Dockerfile.tools + +binary_build_commands: make build + tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp + tests: - as: lint commands: VERBOSE=2 make lint @@ -54,8 +59,8 @@ tests: commands: make test-e2e openshift_installer_src: cluster_profile: aws -- artifact_dir: /tmp/artifacts - as: csv +- as: csv commands: VERBOSE=2 make test-csv container: from: src + artifact_dir: /tmp/artifacts diff --git a/ci-operator/config/openshift/tektoncd-pipeline/openshift-tektoncd-pipeline-release-next.yaml b/ci-operator/config/openshift/tektoncd-pipeline/openshift-tektoncd-pipeline-release-next.yaml index 4441af9e32411..1b6d577785359 100644 --- a/ci-operator/config/openshift/tektoncd-pipeline/openshift-tektoncd-pipeline-release-next.yaml +++ b/ci-operator/config/openshift/tektoncd-pipeline/openshift-tektoncd-pipeline-release-next.yaml @@ -1,14 +1,19 @@ +tag_specification: + name: '4.2' + namespace: ocp +promotion: + namespace: openshift + name: tektoncd-next base_images: base: - cluster: https://api.ci.openshift.org - name: "4.2" + name: '4.2' namespace: ocp tag: base -binary_build_commands: make install build_root: project_image: dockerfile_path: openshift/ci-operator/build-image/Dockerfile canonical_go_repository: github.com/tektoncd/pipeline +binary_build_commands: make install images: - dockerfile_path: openshift/ci-operator/knative-images/controller/Dockerfile from: base @@ -82,9 +87,11 @@ images: - destination_dir: . source_path: /go/bin/. to: tektoncd-pipeline-gcs-fetcher -promotion: - name: tektoncd-next - namespace: openshift +tests: +- as: e2e-aws-ocp-42 + commands: "make test-e2e" + openshift_installer_src: + cluster_profile: aws resources: '*': limits: @@ -92,12 +99,3 @@ resources: requests: cpu: 100m memory: 200Mi -tag_specification: - cluster: https://api.ci.openshift.org - name: "4.2" - namespace: ocp -tests: -- as: e2e-aws-ocp-42 - commands: make test-e2e - openshift_installer_src: - cluster_profile: aws diff --git a/ci-operator/config/openshift/tektoncd-pipeline/openshift-tektoncd-pipeline-release-next__variant.yaml b/ci-operator/config/openshift/tektoncd-pipeline/openshift-tektoncd-pipeline-release-next__variant.yaml index 99207764ada09..b93922efb915f 100644 --- a/ci-operator/config/openshift/tektoncd-pipeline/openshift-tektoncd-pipeline-release-next__variant.yaml +++ b/ci-operator/config/openshift/tektoncd-pipeline/openshift-tektoncd-pipeline-release-next__variant.yaml @@ -1,14 +1,19 @@ +tag_specification: + name: '4.3' + namespace: ocp +promotion: + namespace: openshift + name: release-next-variant base_images: base: - cluster: https://api.ci.openshift.org - name: "4.3" + name: '4.3' namespace: ocp tag: base -binary_build_commands: make install build_root: project_image: dockerfile_path: openshift/ci-operator/build-image/Dockerfile canonical_go_repository: github.com/tektoncd/pipeline +binary_build_commands: make install images: - dockerfile_path: openshift/ci-operator/knative-images/controller/Dockerfile from: base @@ -74,9 +79,11 @@ images: - destination_dir: . source_path: /go/bin/. to: tektoncd-pipeline-webhook -promotion: - name: release-next-variant - namespace: openshift +tests: +- as: e2e-aws-ocp-43 + commands: "make test-e2e" + openshift_installer_src: + cluster_profile: aws resources: '*': limits: @@ -84,12 +91,3 @@ resources: requests: cpu: 100m memory: 200Mi -tag_specification: - cluster: https://api.ci.openshift.org - name: "4.3" - namespace: ocp -tests: -- as: e2e-aws-ocp-43 - commands: make test-e2e - openshift_installer_src: - cluster_profile: aws diff --git a/ci-operator/config/openshift/tektoncd-pipeline/openshift-tektoncd-pipeline-release-v0.2.0.yaml b/ci-operator/config/openshift/tektoncd-pipeline/openshift-tektoncd-pipeline-release-v0.2.0.yaml index f5f960dfea6c4..75652d78cf9a3 100644 --- a/ci-operator/config/openshift/tektoncd-pipeline/openshift-tektoncd-pipeline-release-v0.2.0.yaml +++ b/ci-operator/config/openshift/tektoncd-pipeline/openshift-tektoncd-pipeline-release-v0.2.0.yaml @@ -1,14 +1,19 @@ +tag_specification: + name: '4.0' + namespace: ocp +promotion: + namespace: openshift + name: tektoncd-v0.2.0 base_images: base: - cluster: https://api.ci.openshift.org - name: "4.0" + name: '4.0' namespace: ocp tag: base -binary_build_commands: make install build_root: project_image: dockerfile_path: openshift/ci-operator/build-image/Dockerfile canonical_go_repository: github.com/tektoncd/pipeline +binary_build_commands: make install images: - dockerfile_path: openshift/ci-operator/knative-images/bash/Dockerfile from: base @@ -75,8 +80,13 @@ images: source_path: /go/bin/. to: tektoncd-pipeline-webhook promotion: - name: tektoncd-v0.2.0 namespace: openshift + name: tektoncd-v0.2.0 +tests: +- as: e2e + commands: "make test-e2e" + openshift_installer_src: + cluster_profile: aws resources: '*': limits: @@ -84,12 +94,3 @@ resources: requests: cpu: 100m memory: 200Mi -tag_specification: - cluster: https://api.ci.openshift.org - name: "4.0" - namespace: ocp -tests: -- as: e2e - commands: make test-e2e - openshift_installer_src: - cluster_profile: aws diff --git a/ci-operator/config/openshift/tektoncd-pipeline/openshift-tektoncd-pipeline-release-v0.3.0.yaml b/ci-operator/config/openshift/tektoncd-pipeline/openshift-tektoncd-pipeline-release-v0.3.0.yaml index 5776e964bedb7..a91208692690a 100644 --- a/ci-operator/config/openshift/tektoncd-pipeline/openshift-tektoncd-pipeline-release-v0.3.0.yaml +++ b/ci-operator/config/openshift/tektoncd-pipeline/openshift-tektoncd-pipeline-release-v0.3.0.yaml @@ -1,14 +1,19 @@ +tag_specification: + name: '4.0' + namespace: ocp +promotion: + namespace: openshift + name: tektoncd-v0.3.0 base_images: base: - cluster: https://api.ci.openshift.org - name: "4.0" + name: '4.0' namespace: ocp tag: base -binary_build_commands: make install build_root: project_image: dockerfile_path: openshift/ci-operator/build-image/Dockerfile canonical_go_repository: github.com/tektoncd/pipeline +binary_build_commands: make install images: - dockerfile_path: openshift/ci-operator/knative-images/bash/Dockerfile from: base @@ -75,8 +80,13 @@ images: source_path: /go/bin/. to: tektoncd-pipeline-webhook promotion: - name: tektoncd-v0.3.0 namespace: openshift + name: tektoncd-v0.3.0 +tests: +- as: e2e + commands: "make test-e2e" + openshift_installer_src: + cluster_profile: aws resources: '*': limits: @@ -84,12 +94,3 @@ resources: requests: cpu: 100m memory: 200Mi -tag_specification: - cluster: https://api.ci.openshift.org - name: "4.0" - namespace: ocp -tests: -- as: e2e - commands: make test-e2e - openshift_installer_src: - cluster_profile: aws diff --git a/ci-operator/config/openshift/tektoncd-pipeline/openshift-tektoncd-pipeline-release-v0.3.1.yaml b/ci-operator/config/openshift/tektoncd-pipeline/openshift-tektoncd-pipeline-release-v0.3.1.yaml index 6a7de7668ca7b..a80c980a92489 100644 --- a/ci-operator/config/openshift/tektoncd-pipeline/openshift-tektoncd-pipeline-release-v0.3.1.yaml +++ b/ci-operator/config/openshift/tektoncd-pipeline/openshift-tektoncd-pipeline-release-v0.3.1.yaml @@ -1,14 +1,19 @@ +tag_specification: + name: '4.0' + namespace: ocp +promotion: + namespace: openshift + name: tektoncd-v0.3.1 base_images: base: - cluster: https://api.ci.openshift.org - name: "4.0" + name: '4.0' namespace: ocp tag: base -binary_build_commands: make install build_root: project_image: dockerfile_path: openshift/ci-operator/build-image/Dockerfile canonical_go_repository: github.com/tektoncd/pipeline +binary_build_commands: make install images: - dockerfile_path: openshift/ci-operator/knative-images/bash/Dockerfile from: base @@ -75,8 +80,13 @@ images: source_path: /go/bin/. to: tektoncd-pipeline-webhook promotion: - name: knative namespace: openshift + name: knative +tests: +- as: e2e + commands: "make test-e2e" + openshift_installer_src: + cluster_profile: aws resources: '*': limits: @@ -84,12 +94,3 @@ resources: requests: cpu: 100m memory: 200Mi -tag_specification: - cluster: https://api.ci.openshift.org - name: "4.0" - namespace: ocp -tests: -- as: e2e - commands: make test-e2e - openshift_installer_src: - cluster_profile: aws diff --git a/ci-operator/config/openshift/tektoncd-pipeline/openshift-tektoncd-pipeline-release-v0.4.0.yaml b/ci-operator/config/openshift/tektoncd-pipeline/openshift-tektoncd-pipeline-release-v0.4.0.yaml index 9d8ee444defea..4d630727a78d8 100644 --- a/ci-operator/config/openshift/tektoncd-pipeline/openshift-tektoncd-pipeline-release-v0.4.0.yaml +++ b/ci-operator/config/openshift/tektoncd-pipeline/openshift-tektoncd-pipeline-release-v0.4.0.yaml @@ -1,14 +1,19 @@ +tag_specification: + name: '4.0' + namespace: ocp +promotion: + namespace: openshift + name: tektoncd-v0.4.0 base_images: base: - cluster: https://api.ci.openshift.org - name: "4.0" + name: '4.0' namespace: ocp tag: base -binary_build_commands: make install build_root: project_image: dockerfile_path: openshift/ci-operator/build-image/Dockerfile canonical_go_repository: github.com/tektoncd/pipeline +binary_build_commands: make install images: - dockerfile_path: openshift/ci-operator/knative-images/bash/Dockerfile from: base @@ -91,8 +96,13 @@ images: source_path: /go/bin/. to: tektoncd-pipeline-webhook promotion: - name: tektoncd-v0.4.0 namespace: openshift + name: tektoncd-v0.4.0 +tests: +- as: e2e + commands: "make test-e2e" + openshift_installer_src: + cluster_profile: aws resources: '*': limits: @@ -100,12 +110,3 @@ resources: requests: cpu: 100m memory: 200Mi -tag_specification: - cluster: https://api.ci.openshift.org - name: "4.0" - namespace: ocp -tests: -- as: e2e - commands: make test-e2e - openshift_installer_src: - cluster_profile: aws diff --git a/ci-operator/config/openshift/tektoncd-pipeline/openshift-tektoncd-pipeline-release-v0.5.2.yaml b/ci-operator/config/openshift/tektoncd-pipeline/openshift-tektoncd-pipeline-release-v0.5.2.yaml index 19a6558b9a983..700d2b82c788c 100644 --- a/ci-operator/config/openshift/tektoncd-pipeline/openshift-tektoncd-pipeline-release-v0.5.2.yaml +++ b/ci-operator/config/openshift/tektoncd-pipeline/openshift-tektoncd-pipeline-release-v0.5.2.yaml @@ -1,14 +1,19 @@ +tag_specification: + name: '4.0' + namespace: ocp +promotion: + namespace: openshift + name: tektoncd-v0.5.2 base_images: base: - cluster: https://api.ci.openshift.org - name: "4.0" + name: '4.0' namespace: ocp tag: base -binary_build_commands: make install build_root: project_image: dockerfile_path: openshift/ci-operator/build-image/Dockerfile canonical_go_repository: github.com/tektoncd/pipeline +binary_build_commands: make install images: - dockerfile_path: openshift/ci-operator/knative-images/bash/Dockerfile from: base @@ -99,8 +104,13 @@ images: source_path: /go/bin/. to: tektoncd-pipeline-pullrequest-init promotion: - name: tektoncd-v0.5.2 namespace: openshift + name: tektoncd-v0.5.2 +tests: +- as: e2e + commands: "make test-e2e" + openshift_installer_src: + cluster_profile: aws resources: '*': limits: @@ -108,12 +118,3 @@ resources: requests: cpu: 100m memory: 200Mi -tag_specification: - cluster: https://api.ci.openshift.org - name: "4.0" - namespace: ocp -tests: -- as: e2e - commands: make test-e2e - openshift_installer_src: - cluster_profile: aws diff --git a/ci-operator/config/openshift/tektoncd-pipeline/openshift-tektoncd-pipeline-release-v0.7.0.yaml b/ci-operator/config/openshift/tektoncd-pipeline/openshift-tektoncd-pipeline-release-v0.7.0.yaml index 1534fe01800f5..60a58dc1c116b 100644 --- a/ci-operator/config/openshift/tektoncd-pipeline/openshift-tektoncd-pipeline-release-v0.7.0.yaml +++ b/ci-operator/config/openshift/tektoncd-pipeline/openshift-tektoncd-pipeline-release-v0.7.0.yaml @@ -1,14 +1,19 @@ +tag_specification: + name: '4.1' + namespace: ocp +promotion: + namespace: openshift + name: tektoncd-v0.7.0 base_images: base: - cluster: https://api.ci.openshift.org - name: "4.1" + name: '4.1' namespace: ocp tag: base -binary_build_commands: make install build_root: project_image: dockerfile_path: openshift/ci-operator/build-image/Dockerfile canonical_go_repository: github.com/tektoncd/pipeline +binary_build_commands: make install images: - dockerfile_path: openshift/ci-operator/knative-images/bash/Dockerfile from: base @@ -106,9 +111,11 @@ images: - destination_dir: . source_path: /go/bin/. to: tektoncd-pipeline-gcs-fetcher -promotion: - name: tektoncd-v0.7.0 - namespace: openshift +tests: +- as: e2e + commands: "make test-e2e" + openshift_installer_src: + cluster_profile: aws resources: '*': limits: @@ -116,12 +123,3 @@ resources: requests: cpu: 100m memory: 200Mi -tag_specification: - cluster: https://api.ci.openshift.org - name: "4.1" - namespace: ocp -tests: -- as: e2e - commands: make test-e2e - openshift_installer_src: - cluster_profile: aws diff --git a/ci-operator/config/openshift/tektoncd-pipeline/openshift-tektoncd-pipeline-release-v0.8.0.yaml b/ci-operator/config/openshift/tektoncd-pipeline/openshift-tektoncd-pipeline-release-v0.8.0.yaml index 3c3de39892c58..44e1734eab575 100644 --- a/ci-operator/config/openshift/tektoncd-pipeline/openshift-tektoncd-pipeline-release-v0.8.0.yaml +++ b/ci-operator/config/openshift/tektoncd-pipeline/openshift-tektoncd-pipeline-release-v0.8.0.yaml @@ -1,14 +1,19 @@ +tag_specification: + name: '4.2' + namespace: ocp +promotion: + namespace: openshift + name: tektoncd-v0.8.0 base_images: base: - cluster: https://api.ci.openshift.org - name: "4.2" + name: '4.2' namespace: ocp tag: base -binary_build_commands: make install build_root: project_image: dockerfile_path: openshift/ci-operator/build-image/Dockerfile canonical_go_repository: github.com/tektoncd/pipeline +binary_build_commands: make install images: - dockerfile_path: openshift/ci-operator/knative-images/bash/Dockerfile from: base @@ -106,9 +111,11 @@ images: - destination_dir: . source_path: /go/bin/. to: tektoncd-pipeline-gcs-fetcher -promotion: - name: tektoncd-v0.8.0 - namespace: openshift +tests: +- as: e2e + commands: "make test-e2e" + openshift_installer_src: + cluster_profile: aws resources: '*': limits: @@ -116,12 +123,3 @@ resources: requests: cpu: 100m memory: 200Mi -tag_specification: - cluster: https://api.ci.openshift.org - name: "4.2" - namespace: ocp -tests: -- as: e2e - commands: make test-e2e - openshift_installer_src: - cluster_profile: aws diff --git a/ci-operator/config/openshift/telemeter/openshift-telemeter-master.yaml b/ci-operator/config/openshift/telemeter/openshift-telemeter-master.yaml index 53b5abf47db34..7026750e82e11 100644 --- a/ci-operator/config/openshift/telemeter/openshift-telemeter-master.yaml +++ b/ci-operator/config/openshift/telemeter/openshift-telemeter-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -29,7 +27,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/telemeter/openshift-telemeter-release-3.11.yaml b/ci-operator/config/openshift/telemeter/openshift-telemeter-release-3.11.yaml index a19f73f657783..cf86c86d9ae77 100644 --- a/ci-operator/config/openshift/telemeter/openshift-telemeter-release-3.11.yaml +++ b/ci-operator/config/openshift/telemeter/openshift-telemeter-release-3.11.yaml @@ -1,22 +1,14 @@ base_images: base: - cluster: https://api.ci.openshift.org name: origin-v3.11 namespace: openshift tag: base -build_root: - image_stream_tag: - cluster: https://api.ci.openshift.org - name: release - namespace: openshift - tag: golang-1.10 images: - from: base inputs: root: as: - - "0" - paths: null + - '0' to: telemeter resources: '*': @@ -26,9 +18,15 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: origin-v3.11 namespace: openshift + tag: '' + tag_overrides: {} +build_root: + image_stream_tag: + name: release + namespace: openshift + tag: golang-1.10 tests: - as: unit commands: make check diff --git a/ci-operator/config/openshift/telemeter/openshift-telemeter-release-4.1.yaml b/ci-operator/config/openshift/telemeter/openshift-telemeter-release-4.1.yaml index d55b10e392028..fed24314f0702 100644 --- a/ci-operator/config/openshift/telemeter/openshift-telemeter-release-4.1.yaml +++ b/ci-operator/config/openshift/telemeter/openshift-telemeter-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -29,7 +27,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/openshift/telemeter/openshift-telemeter-release-4.2.yaml b/ci-operator/config/openshift/telemeter/openshift-telemeter-release-4.2.yaml index 4a3bbe7557748..acade304b9bd1 100644 --- a/ci-operator/config/openshift/telemeter/openshift-telemeter-release-4.2.yaml +++ b/ci-operator/config/openshift/telemeter/openshift-telemeter-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -29,7 +27,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/telemeter/openshift-telemeter-release-4.3.yaml b/ci-operator/config/openshift/telemeter/openshift-telemeter-release-4.3.yaml index f4cac37afd04d..1fae9043ff4ef 100644 --- a/ci-operator/config/openshift/telemeter/openshift-telemeter-release-4.3.yaml +++ b/ci-operator/config/openshift/telemeter/openshift-telemeter-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -30,7 +28,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/telemeter/openshift-telemeter-release-4.4.yaml b/ci-operator/config/openshift/telemeter/openshift-telemeter-release-4.4.yaml index 4cc6e9563fee5..1e1e163e8b8c3 100644 --- a/ci-operator/config/openshift/telemeter/openshift-telemeter-release-4.4.yaml +++ b/ci-operator/config/openshift/telemeter/openshift-telemeter-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -29,7 +27,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/template-service-broker-operator/openshift-template-service-broker-operator-master.yaml b/ci-operator/config/openshift/template-service-broker-operator/openshift-template-service-broker-operator-master.yaml index 58039f3e943ec..bc375c080aecb 100644 --- a/ci-operator/config/openshift/template-service-broker-operator/openshift-template-service-broker-operator-master.yaml +++ b/ci-operator/config/openshift/template-service-broker-operator/openshift-template-service-broker-operator-master.yaml @@ -1,6 +1,5 @@ base_images: ansible_operator: - cluster: https://api.ci.openshift.org name: "4.0" namespace: ocp tag: ansible-operator @@ -22,7 +21,6 @@ resources: cpu: 200m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp test_binary_build_commands: make openshift-ci-test-container diff --git a/ci-operator/config/openshift/template-service-broker-operator/openshift-template-service-broker-operator-release-4.1.yaml b/ci-operator/config/openshift/template-service-broker-operator/openshift-template-service-broker-operator-release-4.1.yaml index 8374c0ae204c6..77ea20b03b4d8 100644 --- a/ci-operator/config/openshift/template-service-broker-operator/openshift-template-service-broker-operator-release-4.1.yaml +++ b/ci-operator/config/openshift/template-service-broker-operator/openshift-template-service-broker-operator-release-4.1.yaml @@ -1,6 +1,5 @@ base_images: ansible_operator: - cluster: https://api.ci.openshift.org name: "4.0" namespace: ocp tag: ansible-operator @@ -22,7 +21,6 @@ resources: cpu: 200m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp test_binary_build_commands: make openshift-ci-test-container diff --git a/ci-operator/config/openshift/template-service-broker-operator/openshift-template-service-broker-operator-release-4.2.yaml b/ci-operator/config/openshift/template-service-broker-operator/openshift-template-service-broker-operator-release-4.2.yaml index 5e970571f0162..7f86a17bd92d5 100644 --- a/ci-operator/config/openshift/template-service-broker-operator/openshift-template-service-broker-operator-release-4.2.yaml +++ b/ci-operator/config/openshift/template-service-broker-operator/openshift-template-service-broker-operator-release-4.2.yaml @@ -1,6 +1,5 @@ base_images: ansible_operator: - cluster: https://api.ci.openshift.org name: "4.0" namespace: ocp tag: ansible-operator @@ -22,7 +21,6 @@ resources: cpu: 200m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp test_binary_build_commands: make openshift-ci-test-container diff --git a/ci-operator/config/openshift/template-service-broker-operator/openshift-template-service-broker-operator-release-4.3.yaml b/ci-operator/config/openshift/template-service-broker-operator/openshift-template-service-broker-operator-release-4.3.yaml index 86a0e218e1f52..57d5a41da6802 100644 --- a/ci-operator/config/openshift/template-service-broker-operator/openshift-template-service-broker-operator-release-4.3.yaml +++ b/ci-operator/config/openshift/template-service-broker-operator/openshift-template-service-broker-operator-release-4.3.yaml @@ -1,6 +1,5 @@ base_images: ansible_operator: - cluster: https://api.ci.openshift.org name: "4.0" namespace: ocp tag: ansible-operator @@ -23,7 +22,6 @@ resources: cpu: 200m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp test_binary_build_commands: make openshift-ci-test-container diff --git a/ci-operator/config/openshift/template-service-broker-operator/openshift-template-service-broker-operator-release-4.4.yaml b/ci-operator/config/openshift/template-service-broker-operator/openshift-template-service-broker-operator-release-4.4.yaml index 3a92f62feff45..45eb48ce3f8f2 100644 --- a/ci-operator/config/openshift/template-service-broker-operator/openshift-template-service-broker-operator-release-4.4.yaml +++ b/ci-operator/config/openshift/template-service-broker-operator/openshift-template-service-broker-operator-release-4.4.yaml @@ -1,6 +1,5 @@ base_images: ansible_operator: - cluster: https://api.ci.openshift.org name: "4.0" namespace: ocp tag: ansible-operator @@ -22,7 +21,6 @@ resources: cpu: 200m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp test_binary_build_commands: make openshift-ci-test-container diff --git a/ci-operator/config/openshift/template-service-broker/openshift-template-service-broker-master.yaml b/ci-operator/config/openshift/template-service-broker/openshift-template-service-broker-master.yaml index 85e76ce62e91c..86ff9f6f01109 100644 --- a/ci-operator/config/openshift/template-service-broker/openshift-template-service-broker-master.yaml +++ b/ci-operator/config/openshift/template-service-broker/openshift-template-service-broker-master.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base binary_build_commands: make build --warn-undefined-variables build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -31,7 +29,6 @@ resources: cpu: "3" memory: 6Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/template-service-broker/openshift-template-service-broker-release-4.2.yaml b/ci-operator/config/openshift/template-service-broker/openshift-template-service-broker-release-4.2.yaml index 4bdd12a92e9da..d43800877d78a 100644 --- a/ci-operator/config/openshift/template-service-broker/openshift-template-service-broker-release-4.2.yaml +++ b/ci-operator/config/openshift/template-service-broker/openshift-template-service-broker-release-4.2.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base binary_build_commands: make build --warn-undefined-variables build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -31,7 +29,6 @@ resources: cpu: "3" memory: 6Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/template-service-broker/openshift-template-service-broker-release-4.3.yaml b/ci-operator/config/openshift/template-service-broker/openshift-template-service-broker-release-4.3.yaml index 7b1b91f24c671..ba1cff002a7be 100644 --- a/ci-operator/config/openshift/template-service-broker/openshift-template-service-broker-release-4.3.yaml +++ b/ci-operator/config/openshift/template-service-broker/openshift-template-service-broker-release-4.3.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base binary_build_commands: make build --warn-undefined-variables build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -32,7 +30,6 @@ resources: cpu: "3" memory: 6Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/template-service-broker/openshift-template-service-broker-release-4.4.yaml b/ci-operator/config/openshift/template-service-broker/openshift-template-service-broker-release-4.4.yaml index 113ada6e39006..08ef2d0c92a5f 100644 --- a/ci-operator/config/openshift/template-service-broker/openshift-template-service-broker-release-4.4.yaml +++ b/ci-operator/config/openshift/template-service-broker/openshift-template-service-broker-release-4.4.yaml @@ -1,13 +1,11 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base binary_build_commands: make build --warn-undefined-variables build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -31,7 +29,6 @@ resources: cpu: "3" memory: 6Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/thanos/openshift-thanos-master.yaml b/ci-operator/config/openshift/thanos/openshift-thanos-master.yaml index d157943c3a1dd..f01e8e8bf8ce2 100644 --- a/ci-operator/config/openshift/thanos/openshift-thanos-master.yaml +++ b/ci-operator/config/openshift/thanos/openshift-thanos-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/thanos/openshift-thanos-release-4.2.yaml b/ci-operator/config/openshift/thanos/openshift-thanos-release-4.2.yaml index a04aa956b754a..66ffa25defaaf 100644 --- a/ci-operator/config/openshift/thanos/openshift-thanos-release-4.2.yaml +++ b/ci-operator/config/openshift/thanos/openshift-thanos-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/thanos/openshift-thanos-release-4.3.yaml b/ci-operator/config/openshift/thanos/openshift-thanos-release-4.3.yaml index 3ce57aec9a822..14538713c4745 100644 --- a/ci-operator/config/openshift/thanos/openshift-thanos-release-4.3.yaml +++ b/ci-operator/config/openshift/thanos/openshift-thanos-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -26,7 +24,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/thanos/openshift-thanos-release-4.4.yaml b/ci-operator/config/openshift/thanos/openshift-thanos-release-4.4.yaml index 01c0d24ffa138..d51943e423190 100644 --- a/ci-operator/config/openshift/thanos/openshift-thanos-release-4.4.yaml +++ b/ci-operator/config/openshift/thanos/openshift-thanos-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/verification-tests/openshift-verification-tests-master.yaml b/ci-operator/config/openshift/verification-tests/openshift-verification-tests-master.yaml index fc3a845993e6d..b083d8eadf280 100644 --- a/ci-operator/config/openshift/verification-tests/openshift-verification-tests-master.yaml +++ b/ci-operator/config/openshift/verification-tests/openshift-verification-tests-master.yaml @@ -1,16 +1,18 @@ +tag_specification: + name: '4.0' + namespace: ocp +promotion: + name: 'verification-tests' + namespace: 'ci' build_root: image_stream_tag: - cluster: https://api.ci.openshift.org - name: verification-tests - namespace: ci - tag: centos + cluster: 'https://api.ci.openshift.org' + name: 'verification-tests' + namespace: 'ci' + tag: 'centos' images: -- dockerfile_path: tools/openshift-ci/Dockerfile.centos - from: "" - to: centos -promotion: - name: verification-tests - namespace: ci +- to: centos + dockerfile_path: tools/openshift-ci/Dockerfile.centos resources: '*': limits: @@ -18,7 +20,4 @@ resources: requests: cpu: 100m memory: 200Mi -tag_specification: - cluster: https://api.ci.openshift.org - name: "4.0" - namespace: ocp +tests: [] diff --git a/ci-operator/config/openshift/vertical-pod-autoscaler-operator/openshift-vertical-pod-autoscaler-operator-master.yaml b/ci-operator/config/openshift/vertical-pod-autoscaler-operator/openshift-vertical-pod-autoscaler-operator-master.yaml index 1be9b83f188a4..76852433cdf65 100644 --- a/ci-operator/config/openshift/vertical-pod-autoscaler-operator/openshift-vertical-pod-autoscaler-operator-master.yaml +++ b/ci-operator/config/openshift/vertical-pod-autoscaler-operator/openshift-vertical-pod-autoscaler-operator-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/vertical-pod-autoscaler-operator/openshift-vertical-pod-autoscaler-operator-release-4.2.yaml b/ci-operator/config/openshift/vertical-pod-autoscaler-operator/openshift-vertical-pod-autoscaler-operator-release-4.2.yaml index 3d55169236fdd..b6180044d426a 100644 --- a/ci-operator/config/openshift/vertical-pod-autoscaler-operator/openshift-vertical-pod-autoscaler-operator-release-4.2.yaml +++ b/ci-operator/config/openshift/vertical-pod-autoscaler-operator/openshift-vertical-pod-autoscaler-operator-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/openshift/vertical-pod-autoscaler-operator/openshift-vertical-pod-autoscaler-operator-release-4.3.yaml b/ci-operator/config/openshift/vertical-pod-autoscaler-operator/openshift-vertical-pod-autoscaler-operator-release-4.3.yaml index d74a275b95a82..7ed8cd1b09592 100644 --- a/ci-operator/config/openshift/vertical-pod-autoscaler-operator/openshift-vertical-pod-autoscaler-operator-release-4.3.yaml +++ b/ci-operator/config/openshift/vertical-pod-autoscaler-operator/openshift-vertical-pod-autoscaler-operator-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -25,7 +23,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/openshift/vertical-pod-autoscaler-operator/openshift-vertical-pod-autoscaler-operator-release-4.4.yaml b/ci-operator/config/openshift/vertical-pod-autoscaler-operator/openshift-vertical-pod-autoscaler-operator-release-4.4.yaml index 1a8e81b3792e6..4691edb2dbb9b 100644 --- a/ci-operator/config/openshift/vertical-pod-autoscaler-operator/openshift-vertical-pod-autoscaler-operator-release-4.4.yaml +++ b/ci-operator/config/openshift/vertical-pod-autoscaler-operator/openshift-vertical-pod-autoscaler-operator-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -24,7 +22,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-master.yaml b/ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-master.yaml index d2a299f62f871..4050e2037ded7 100644 --- a/ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-master.yaml +++ b/ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -27,7 +25,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-4.2.yaml b/ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-4.2.yaml index 11f5ea6cdf0aa..c3c67fa9c9eba 100644 --- a/ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-4.2.yaml +++ b/ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-4.2.yaml @@ -1,15 +1,16 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 +tag_specification: + name: "4.2" + namespace: ocp promotion: name: "4.2" namespace: ocp @@ -20,10 +21,6 @@ resources: requests: cpu: 100m memory: 200Mi -tag_specification: - cluster: https://api.ci.openshift.org - name: "4.2" - namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables tests: - as: build diff --git a/ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-4.3.yaml b/ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-4.3.yaml index 8e4a0d030a771..966b73f02baab 100644 --- a/ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-4.3.yaml +++ b/ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -28,7 +26,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-4.4.yaml b/ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-4.4.yaml index 1dd9eb2ecf646..1b304235690f0 100644 --- a/ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-4.4.yaml +++ b/ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -27,7 +25,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp test_binary_build_commands: make build GOFLAGS='-race' --warn-undefined-variables diff --git a/ci-operator/config/operator-framework/ghostunnel/operator-framework-ghostunnel-master.yaml b/ci-operator/config/operator-framework/ghostunnel/operator-framework-ghostunnel-master.yaml index 58fae4e78123a..0920d41628ed1 100644 --- a/ci-operator/config/operator-framework/ghostunnel/operator-framework-ghostunnel-master.yaml +++ b/ci-operator/config/operator-framework/ghostunnel/operator-framework-ghostunnel-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,6 +23,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp diff --git a/ci-operator/config/operator-framework/ghostunnel/operator-framework-ghostunnel-release-4.2.yaml b/ci-operator/config/operator-framework/ghostunnel/operator-framework-ghostunnel-release-4.2.yaml index 5d47f45eabdf0..0f2d54f4d2560 100644 --- a/ci-operator/config/operator-framework/ghostunnel/operator-framework-ghostunnel-release-4.2.yaml +++ b/ci-operator/config/operator-framework/ghostunnel/operator-framework-ghostunnel-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,6 +23,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp diff --git a/ci-operator/config/operator-framework/ghostunnel/operator-framework-ghostunnel-release-4.3.yaml b/ci-operator/config/operator-framework/ghostunnel/operator-framework-ghostunnel-release-4.3.yaml index 7b18fc921a30b..d4e294d32ac1f 100644 --- a/ci-operator/config/operator-framework/ghostunnel/operator-framework-ghostunnel-release-4.3.yaml +++ b/ci-operator/config/operator-framework/ghostunnel/operator-framework-ghostunnel-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -26,6 +24,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp diff --git a/ci-operator/config/operator-framework/ghostunnel/operator-framework-ghostunnel-release-4.4.yaml b/ci-operator/config/operator-framework/ghostunnel/operator-framework-ghostunnel-release-4.4.yaml index 5aa92ff9601c1..b748b6732563f 100644 --- a/ci-operator/config/operator-framework/ghostunnel/operator-framework-ghostunnel-release-4.4.yaml +++ b/ci-operator/config/operator-framework/ghostunnel/operator-framework-ghostunnel-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,6 +23,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp diff --git a/ci-operator/config/operator-framework/hadoop/operator-framework-hadoop-master.yaml b/ci-operator/config/operator-framework/hadoop/operator-framework-hadoop-master.yaml index c3cec022db6de..54c07ac4ac18e 100644 --- a/ci-operator/config/operator-framework/hadoop/operator-framework-hadoop-master.yaml +++ b/ci-operator/config/operator-framework/hadoop/operator-framework-hadoop-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,6 +23,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp diff --git a/ci-operator/config/operator-framework/hadoop/operator-framework-hadoop-release-4.1.yaml b/ci-operator/config/operator-framework/hadoop/operator-framework-hadoop-release-4.1.yaml index 79d5a66c54b0a..261de1e14531f 100644 --- a/ci-operator/config/operator-framework/hadoop/operator-framework-hadoop-release-4.1.yaml +++ b/ci-operator/config/operator-framework/hadoop/operator-framework-hadoop-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: centos namespace: openshift tag: "7" build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -24,6 +22,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp diff --git a/ci-operator/config/operator-framework/hadoop/operator-framework-hadoop-release-4.2.yaml b/ci-operator/config/operator-framework/hadoop/operator-framework-hadoop-release-4.2.yaml index 18f66793f3a83..aaecf04d4a910 100644 --- a/ci-operator/config/operator-framework/hadoop/operator-framework-hadoop-release-4.2.yaml +++ b/ci-operator/config/operator-framework/hadoop/operator-framework-hadoop-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,6 +23,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp diff --git a/ci-operator/config/operator-framework/hadoop/operator-framework-hadoop-release-4.3.yaml b/ci-operator/config/operator-framework/hadoop/operator-framework-hadoop-release-4.3.yaml index 508426de9c3a7..e87972336ee57 100644 --- a/ci-operator/config/operator-framework/hadoop/operator-framework-hadoop-release-4.3.yaml +++ b/ci-operator/config/operator-framework/hadoop/operator-framework-hadoop-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -26,6 +24,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp diff --git a/ci-operator/config/operator-framework/hadoop/operator-framework-hadoop-release-4.4.yaml b/ci-operator/config/operator-framework/hadoop/operator-framework-hadoop-release-4.4.yaml index 451d16641a51f..6a5da79c87a66 100644 --- a/ci-operator/config/operator-framework/hadoop/operator-framework-hadoop-release-4.4.yaml +++ b/ci-operator/config/operator-framework/hadoop/operator-framework-hadoop-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,6 +23,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp diff --git a/ci-operator/config/operator-framework/helm/operator-framework-helm-master.yaml b/ci-operator/config/operator-framework/helm/operator-framework-helm-master.yaml index 214ff5f7199a5..dfaa65b2771de 100644 --- a/ci-operator/config/operator-framework/helm/operator-framework-helm-master.yaml +++ b/ci-operator/config/operator-framework/helm/operator-framework-helm-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: centos namespace: openshift tag: "7" build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,6 +23,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp diff --git a/ci-operator/config/operator-framework/helm/operator-framework-helm-release-4.1.yaml b/ci-operator/config/operator-framework/helm/operator-framework-helm-release-4.1.yaml index b65efe92ca97f..c48994d375eea 100644 --- a/ci-operator/config/operator-framework/helm/operator-framework-helm-release-4.1.yaml +++ b/ci-operator/config/operator-framework/helm/operator-framework-helm-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: centos namespace: openshift tag: "7" build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,6 +23,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp diff --git a/ci-operator/config/operator-framework/helm/operator-framework-helm-release-4.2.yaml b/ci-operator/config/operator-framework/helm/operator-framework-helm-release-4.2.yaml index d6e14b39f520b..eb58c1d267250 100644 --- a/ci-operator/config/operator-framework/helm/operator-framework-helm-release-4.2.yaml +++ b/ci-operator/config/operator-framework/helm/operator-framework-helm-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: centos namespace: openshift tag: "7" build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,6 +23,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp diff --git a/ci-operator/config/operator-framework/helm/operator-framework-helm-release-4.3.yaml b/ci-operator/config/operator-framework/helm/operator-framework-helm-release-4.3.yaml index c568ba0948597..f25a664b8eca3 100644 --- a/ci-operator/config/operator-framework/helm/operator-framework-helm-release-4.3.yaml +++ b/ci-operator/config/operator-framework/helm/operator-framework-helm-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: centos namespace: openshift tag: "7" build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -26,6 +24,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp diff --git a/ci-operator/config/operator-framework/helm/operator-framework-helm-release-4.4.yaml b/ci-operator/config/operator-framework/helm/operator-framework-helm-release-4.4.yaml index d071d0454ddab..7b2cca927beb1 100644 --- a/ci-operator/config/operator-framework/helm/operator-framework-helm-release-4.4.yaml +++ b/ci-operator/config/operator-framework/helm/operator-framework-helm-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: centos namespace: openshift tag: "7" build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,6 +23,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp diff --git a/ci-operator/config/operator-framework/hive/operator-framework-hive-master.yaml b/ci-operator/config/operator-framework/hive/operator-framework-hive-master.yaml index 8e64007daeb09..332a8fbf75e6d 100644 --- a/ci-operator/config/operator-framework/hive/operator-framework-hive-master.yaml +++ b/ci-operator/config/operator-framework/hive/operator-framework-hive-master.yaml @@ -1,12 +1,10 @@ base_images: metering-hadoop: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: metering-hadoop build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,6 +23,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp diff --git a/ci-operator/config/operator-framework/hive/operator-framework-hive-release-4.1.yaml b/ci-operator/config/operator-framework/hive/operator-framework-hive-release-4.1.yaml index 1abf662249095..261f0b7bb0e9a 100644 --- a/ci-operator/config/operator-framework/hive/operator-framework-hive-release-4.1.yaml +++ b/ci-operator/config/operator-framework/hive/operator-framework-hive-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: metering-hadoop: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: metering-hadoop build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -24,6 +22,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp diff --git a/ci-operator/config/operator-framework/hive/operator-framework-hive-release-4.2.yaml b/ci-operator/config/operator-framework/hive/operator-framework-hive-release-4.2.yaml index 20484c5cc1157..b19bf72a103e5 100644 --- a/ci-operator/config/operator-framework/hive/operator-framework-hive-release-4.2.yaml +++ b/ci-operator/config/operator-framework/hive/operator-framework-hive-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: metering-hadoop: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: metering-hadoop build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,6 +23,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp diff --git a/ci-operator/config/operator-framework/hive/operator-framework-hive-release-4.3.yaml b/ci-operator/config/operator-framework/hive/operator-framework-hive-release-4.3.yaml index 3da26230d28e7..2901c3fed1f8d 100644 --- a/ci-operator/config/operator-framework/hive/operator-framework-hive-release-4.3.yaml +++ b/ci-operator/config/operator-framework/hive/operator-framework-hive-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: metering-hadoop: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: metering-hadoop build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -26,6 +24,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp diff --git a/ci-operator/config/operator-framework/hive/operator-framework-hive-release-4.4.yaml b/ci-operator/config/operator-framework/hive/operator-framework-hive-release-4.4.yaml index 6f78eec01700b..7ce8b6cd308d2 100644 --- a/ci-operator/config/operator-framework/hive/operator-framework-hive-release-4.4.yaml +++ b/ci-operator/config/operator-framework/hive/operator-framework-hive-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: metering-hadoop: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: metering-hadoop build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,6 +23,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp diff --git a/ci-operator/config/operator-framework/operator-courier/operator-framework-operator-courier-master.yaml b/ci-operator/config/operator-framework/operator-courier/operator-framework-operator-courier-master.yaml index 60d41bc7baeaa..6535ff2a85c8f 100644 --- a/ci-operator/config/operator-framework/operator-courier/operator-framework-operator-courier-master.yaml +++ b/ci-operator/config/operator-framework/operator-courier/operator-framework-operator-courier-master.yaml @@ -24,5 +24,5 @@ tests: container: from: integration secret: - mount_path: /tmp/secret name: operator-manifests-test-credentials + mount_path: /tmp/secret diff --git a/ci-operator/config/operator-framework/operator-lifecycle-manager/operator-framework-operator-lifecycle-manager-master.yaml b/ci-operator/config/operator-framework/operator-lifecycle-manager/operator-framework-operator-lifecycle-manager-master.yaml index 5b11eed3e5088..b01cbf826a311 100644 --- a/ci-operator/config/operator-framework/operator-lifecycle-manager/operator-framework-operator-lifecycle-manager-master.yaml +++ b/ci-operator/config/operator-framework/operator-lifecycle-manager/operator-framework-operator-lifecycle-manager-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.13 @@ -29,7 +27,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/operator-framework/operator-lifecycle-manager/operator-framework-operator-lifecycle-manager-release-3.11.yaml b/ci-operator/config/operator-framework/operator-lifecycle-manager/operator-framework-operator-lifecycle-manager-release-3.11.yaml index f3ef8a5aa3f0d..bc7089765b4c6 100644 --- a/ci-operator/config/operator-framework/operator-lifecycle-manager/operator-framework-operator-lifecycle-manager-release-3.11.yaml +++ b/ci-operator/config/operator-framework/operator-lifecycle-manager/operator-framework-operator-lifecycle-manager-release-3.11.yaml @@ -1,16 +1,9 @@ base_images: base: - cluster: https://api.ci.openshift.org name: origin-v3.11 namespace: openshift tag: base binary_build_commands: make build -build_root: - image_stream_tag: - cluster: https://api.ci.openshift.org - name: release - namespace: openshift - tag: golang-1.10 images: - from: base inputs: @@ -41,9 +34,13 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: origin-v3.11 namespace: openshift +build_root: + image_stream_tag: + name: release + namespace: openshift + tag: golang-1.10 tests: - as: verify commands: make verify-codegen verify-catalog diff --git a/ci-operator/config/operator-framework/operator-lifecycle-manager/operator-framework-operator-lifecycle-manager-release-4.1.yaml b/ci-operator/config/operator-framework/operator-lifecycle-manager/operator-framework-operator-lifecycle-manager-release-4.1.yaml index 771ba099cc1d1..50fb69a1d3700 100644 --- a/ci-operator/config/operator-framework/operator-lifecycle-manager/operator-framework-operator-lifecycle-manager-release-4.1.yaml +++ b/ci-operator/config/operator-framework/operator-lifecycle-manager/operator-framework-operator-lifecycle-manager-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -29,7 +27,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/operator-framework/operator-lifecycle-manager/operator-framework-operator-lifecycle-manager-release-4.2.yaml b/ci-operator/config/operator-framework/operator-lifecycle-manager/operator-framework-operator-lifecycle-manager-release-4.2.yaml index 13c973de740b6..87b1c67021066 100644 --- a/ci-operator/config/operator-framework/operator-lifecycle-manager/operator-framework-operator-lifecycle-manager-release-4.2.yaml +++ b/ci-operator/config/operator-framework/operator-lifecycle-manager/operator-framework-operator-lifecycle-manager-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -29,7 +27,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/operator-framework/operator-lifecycle-manager/operator-framework-operator-lifecycle-manager-release-4.3.yaml b/ci-operator/config/operator-framework/operator-lifecycle-manager/operator-framework-operator-lifecycle-manager-release-4.3.yaml index 9839590bbff16..c27599a76e3a7 100644 --- a/ci-operator/config/operator-framework/operator-lifecycle-manager/operator-framework-operator-lifecycle-manager-release-4.3.yaml +++ b/ci-operator/config/operator-framework/operator-lifecycle-manager/operator-framework-operator-lifecycle-manager-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.13 @@ -30,7 +28,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/operator-framework/operator-lifecycle-manager/operator-framework-operator-lifecycle-manager-release-4.4.yaml b/ci-operator/config/operator-framework/operator-lifecycle-manager/operator-framework-operator-lifecycle-manager-release-4.4.yaml index 7ef3b71f9ffd6..463417872cbbb 100644 --- a/ci-operator/config/operator-framework/operator-lifecycle-manager/operator-framework-operator-lifecycle-manager-release-4.4.yaml +++ b/ci-operator/config/operator-framework/operator-lifecycle-manager/operator-framework-operator-lifecycle-manager-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.13 @@ -29,7 +27,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/operator-framework/operator-marketplace/operator-framework-operator-marketplace-master.yaml b/ci-operator/config/operator-framework/operator-marketplace/operator-framework-operator-marketplace-master.yaml index 742e6d4f68a8c..b9d0f2238015d 100644 --- a/ci-operator/config/operator-framework/operator-marketplace/operator-framework-operator-marketplace-master.yaml +++ b/ci-operator/config/operator-framework/operator-marketplace/operator-framework-operator-marketplace-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -29,7 +27,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/operator-framework/operator-marketplace/operator-framework-operator-marketplace-release-4.1.yaml b/ci-operator/config/operator-framework/operator-marketplace/operator-framework-operator-marketplace-release-4.1.yaml index e21aefc096e92..8d980a8961cfc 100644 --- a/ci-operator/config/operator-framework/operator-marketplace/operator-framework-operator-marketplace-release-4.1.yaml +++ b/ci-operator/config/operator-framework/operator-marketplace/operator-framework-operator-marketplace-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -29,7 +27,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/operator-framework/operator-marketplace/operator-framework-operator-marketplace-release-4.2.yaml b/ci-operator/config/operator-framework/operator-marketplace/operator-framework-operator-marketplace-release-4.2.yaml index a8286452e26ec..39d1574ab0244 100644 --- a/ci-operator/config/operator-framework/operator-marketplace/operator-framework-operator-marketplace-release-4.2.yaml +++ b/ci-operator/config/operator-framework/operator-marketplace/operator-framework-operator-marketplace-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -29,7 +27,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/operator-framework/operator-marketplace/operator-framework-operator-marketplace-release-4.3.yaml b/ci-operator/config/operator-framework/operator-marketplace/operator-framework-operator-marketplace-release-4.3.yaml index 852abc2aeecd2..2e02cd9008a31 100644 --- a/ci-operator/config/operator-framework/operator-marketplace/operator-framework-operator-marketplace-release-4.3.yaml +++ b/ci-operator/config/operator-framework/operator-marketplace/operator-framework-operator-marketplace-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -30,7 +28,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/operator-framework/operator-marketplace/operator-framework-operator-marketplace-release-4.4.yaml b/ci-operator/config/operator-framework/operator-marketplace/operator-framework-operator-marketplace-release-4.4.yaml index a24aa844e0744..193d1ee3b8498 100644 --- a/ci-operator/config/operator-framework/operator-marketplace/operator-framework-operator-marketplace-release-4.4.yaml +++ b/ci-operator/config/operator-framework/operator-marketplace/operator-framework-operator-marketplace-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -29,7 +27,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/operator-framework/operator-metering/operator-framework-operator-metering-feature.yaml b/ci-operator/config/operator-framework/operator-metering/operator-framework-operator-metering-feature.yaml index a8569bd79f6ff..201b5d32f5801 100644 --- a/ci-operator/config/operator-framework/operator-metering/operator-framework-operator-metering-feature.yaml +++ b/ci-operator/config/operator-framework/operator-metering/operator-framework-operator-metering-feature.yaml @@ -1,11 +1,9 @@ base_images: ansible-operator: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: ansible-operator base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base @@ -28,7 +26,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/operator-framework/operator-metering/operator-framework-operator-metering-master.yaml b/ci-operator/config/operator-framework/operator-metering/operator-framework-operator-metering-master.yaml index cce8d3d8a80e3..cc8b0ec80d7fa 100644 --- a/ci-operator/config/operator-framework/operator-metering/operator-framework-operator-metering-master.yaml +++ b/ci-operator/config/operator-framework/operator-metering/operator-framework-operator-metering-master.yaml @@ -1,11 +1,9 @@ base_images: ansible-operator: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: ansible-operator base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base @@ -31,7 +29,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/operator-framework/operator-metering/operator-framework-operator-metering-release-4.1.yaml b/ci-operator/config/operator-framework/operator-metering/operator-framework-operator-metering-release-4.1.yaml index 0f00d002d922c..aeacd859d318f 100644 --- a/ci-operator/config/operator-framework/operator-metering/operator-framework-operator-metering-release-4.1.yaml +++ b/ci-operator/config/operator-framework/operator-metering/operator-framework-operator-metering-release-4.1.yaml @@ -1,11 +1,9 @@ base_images: base: - cluster: https://api.ci.openshift.org name: origin-v3.11 namespace: openshift tag: base metering-helm: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: metering-helm @@ -31,7 +29,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/operator-framework/operator-metering/operator-framework-operator-metering-release-4.2.yaml b/ci-operator/config/operator-framework/operator-metering/operator-framework-operator-metering-release-4.2.yaml index 7b3de2de93910..2c18e7b0f932b 100644 --- a/ci-operator/config/operator-framework/operator-metering/operator-framework-operator-metering-release-4.2.yaml +++ b/ci-operator/config/operator-framework/operator-metering/operator-framework-operator-metering-release-4.2.yaml @@ -1,11 +1,9 @@ base_images: ansible-operator: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: ansible-operator base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base @@ -31,7 +29,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/operator-framework/operator-metering/operator-framework-operator-metering-release-4.3.yaml b/ci-operator/config/operator-framework/operator-metering/operator-framework-operator-metering-release-4.3.yaml index b5e142a1e5590..d839c3446ca8b 100644 --- a/ci-operator/config/operator-framework/operator-metering/operator-framework-operator-metering-release-4.3.yaml +++ b/ci-operator/config/operator-framework/operator-metering/operator-framework-operator-metering-release-4.3.yaml @@ -1,11 +1,9 @@ base_images: ansible-operator: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: ansible-operator base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base @@ -31,7 +29,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/operator-framework/operator-metering/operator-framework-operator-metering-release-4.4.yaml b/ci-operator/config/operator-framework/operator-metering/operator-framework-operator-metering-release-4.4.yaml index cce8d3d8a80e3..cc8b0ec80d7fa 100644 --- a/ci-operator/config/operator-framework/operator-metering/operator-framework-operator-metering-release-4.4.yaml +++ b/ci-operator/config/operator-framework/operator-metering/operator-framework-operator-metering-release-4.4.yaml @@ -1,11 +1,9 @@ base_images: ansible-operator: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: ansible-operator base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base @@ -31,7 +29,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/operator-framework/operator-registry/operator-framework-operator-registry-master.yaml b/ci-operator/config/operator-framework/operator-registry/operator-framework-operator-registry-master.yaml index c6f70bfe5d6cf..0521a88cfbf98 100644 --- a/ci-operator/config/operator-framework/operator-registry/operator-framework-operator-registry-master.yaml +++ b/ci-operator/config/operator-framework/operator-registry/operator-framework-operator-registry-master.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.13 @@ -29,7 +27,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/operator-framework/operator-registry/operator-framework-operator-registry-release-4.1.yaml b/ci-operator/config/operator-framework/operator-registry/operator-framework-operator-registry-release-4.1.yaml index 281ab429979a7..2cf9d56434a15 100644 --- a/ci-operator/config/operator-framework/operator-registry/operator-framework-operator-registry-release-4.1.yaml +++ b/ci-operator/config/operator-framework/operator-registry/operator-framework-operator-registry-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -29,7 +27,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp tests: diff --git a/ci-operator/config/operator-framework/operator-registry/operator-framework-operator-registry-release-4.2.yaml b/ci-operator/config/operator-framework/operator-registry/operator-framework-operator-registry-release-4.2.yaml index 91ce720a2198b..a37306fab35dd 100644 --- a/ci-operator/config/operator-framework/operator-registry/operator-framework-operator-registry-release-4.2.yaml +++ b/ci-operator/config/operator-framework/operator-registry/operator-framework-operator-registry-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -29,7 +27,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: diff --git a/ci-operator/config/operator-framework/operator-registry/operator-framework-operator-registry-release-4.3.yaml b/ci-operator/config/operator-framework/operator-registry/operator-framework-operator-registry-release-4.3.yaml index b7bb637efb2a5..9bce05ae6f64f 100644 --- a/ci-operator/config/operator-framework/operator-registry/operator-framework-operator-registry-release-4.3.yaml +++ b/ci-operator/config/operator-framework/operator-registry/operator-framework-operator-registry-release-4.3.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.13 @@ -30,7 +28,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/operator-framework/operator-registry/operator-framework-operator-registry-release-4.4.yaml b/ci-operator/config/operator-framework/operator-registry/operator-framework-operator-registry-release-4.4.yaml index f54683ab4ad10..9b80759abc148 100644 --- a/ci-operator/config/operator-framework/operator-registry/operator-framework-operator-registry-release-4.4.yaml +++ b/ci-operator/config/operator-framework/operator-registry/operator-framework-operator-registry-release-4.4.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.13 @@ -29,7 +27,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/operator-framework/operator-sdk/operator-framework-operator-sdk-master.yaml b/ci-operator/config/operator-framework/operator-sdk/operator-framework-operator-sdk-master.yaml index 1c4baba6a9e45..a3ee1d89eaddd 100644 --- a/ci-operator/config/operator-framework/operator-sdk/operator-framework-operator-sdk-master.yaml +++ b/ci-operator/config/operator-framework/operator-sdk/operator-framework-operator-sdk-master.yaml @@ -1,17 +1,14 @@ base_images: base: - cluster: https://api.ci.openshift.org name: ubi-minimal namespace: ocp tag: "8" os: - cluster: https://api.ci.openshift.org name: ubi namespace: ocp tag: "8" build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.13 @@ -102,7 +99,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp test_binary_build_commands: ./hack/ci/setup-build-dependencies.sh diff --git a/ci-operator/config/operator-framework/operator-sdk/operator-framework-operator-sdk-release-4.2.yaml b/ci-operator/config/operator-framework/operator-sdk/operator-framework-operator-sdk-release-4.2.yaml index d47bd1d9ea420..1130f3d6c0189 100644 --- a/ci-operator/config/operator-framework/operator-sdk/operator-framework-operator-sdk-release-4.2.yaml +++ b/ci-operator/config/operator-framework/operator-sdk/operator-framework-operator-sdk-release-4.2.yaml @@ -1,17 +1,14 @@ base_images: base: - cluster: https://api.ci.openshift.org name: ubi-minimal namespace: ocp tag: "8" os: - cluster: https://api.ci.openshift.org name: ubi namespace: ocp tag: "8" build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 @@ -102,7 +99,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp test_binary_build_commands: ./hack/ci/setup-build-dependencies.sh diff --git a/ci-operator/config/operator-framework/operator-sdk/operator-framework-operator-sdk-release-4.3.yaml b/ci-operator/config/operator-framework/operator-sdk/operator-framework-operator-sdk-release-4.3.yaml index 53af76cffcbe2..92819280d0d7e 100644 --- a/ci-operator/config/operator-framework/operator-sdk/operator-framework-operator-sdk-release-4.3.yaml +++ b/ci-operator/config/operator-framework/operator-sdk/operator-framework-operator-sdk-release-4.3.yaml @@ -1,17 +1,14 @@ base_images: base: - cluster: https://api.ci.openshift.org name: ubi-minimal namespace: ocp tag: "8" os: - cluster: https://api.ci.openshift.org name: ubi namespace: ocp tag: "8" build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.13 @@ -103,7 +100,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp test_binary_build_commands: ./hack/ci/setup-build-dependencies.sh diff --git a/ci-operator/config/operator-framework/operator-sdk/operator-framework-operator-sdk-release-4.4.yaml b/ci-operator/config/operator-framework/operator-sdk/operator-framework-operator-sdk-release-4.4.yaml index e24010442765f..3328a79136603 100644 --- a/ci-operator/config/operator-framework/operator-sdk/operator-framework-operator-sdk-release-4.4.yaml +++ b/ci-operator/config/operator-framework/operator-sdk/operator-framework-operator-sdk-release-4.4.yaml @@ -1,17 +1,14 @@ base_images: base: - cluster: https://api.ci.openshift.org name: ubi-minimal namespace: ocp tag: "8" os: - cluster: https://api.ci.openshift.org name: ubi namespace: ocp tag: "8" build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.13 @@ -102,7 +99,6 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp test_binary_build_commands: ./hack/ci/setup-build-dependencies.sh diff --git a/ci-operator/config/operator-framework/presto/operator-framework-presto-feature.yaml b/ci-operator/config/operator-framework/presto/operator-framework-presto-feature.yaml index 1f3b04bc9ad53..314610c31c998 100644 --- a/ci-operator/config/operator-framework/presto/operator-framework-presto-feature.yaml +++ b/ci-operator/config/operator-framework/presto/operator-framework-presto-feature.yaml @@ -1,6 +1,5 @@ base_images: base: - cluster: https://api.ci.openshift.org name: ubi namespace: ocp tag: "7" @@ -25,7 +24,6 @@ resources: cpu: "1" memory: 4Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/operator-framework/presto/operator-framework-presto-master.yaml b/ci-operator/config/operator-framework/presto/operator-framework-presto-master.yaml index e25152f4712eb..66531284614b8 100644 --- a/ci-operator/config/operator-framework/presto/operator-framework-presto-master.yaml +++ b/ci-operator/config/operator-framework/presto/operator-framework-presto-master.yaml @@ -1,6 +1,5 @@ base_images: base: - cluster: https://api.ci.openshift.org name: ubi namespace: ocp tag: "7" @@ -28,7 +27,6 @@ resources: cpu: "1" memory: 4Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/operator-framework/presto/operator-framework-presto-release-4.1.yaml b/ci-operator/config/operator-framework/presto/operator-framework-presto-release-4.1.yaml index bca85e2f35cf3..8223580aeaf6b 100644 --- a/ci-operator/config/operator-framework/presto/operator-framework-presto-release-4.1.yaml +++ b/ci-operator/config/operator-framework/presto/operator-framework-presto-release-4.1.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: centos namespace: openshift tag: "7" build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -24,6 +22,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.1" namespace: ocp diff --git a/ci-operator/config/operator-framework/presto/operator-framework-presto-release-4.2.yaml b/ci-operator/config/operator-framework/presto/operator-framework-presto-release-4.2.yaml index 96095a1b1780d..a65fc9f6913ff 100644 --- a/ci-operator/config/operator-framework/presto/operator-framework-presto-release-4.2.yaml +++ b/ci-operator/config/operator-framework/presto/operator-framework-presto-release-4.2.yaml @@ -1,12 +1,10 @@ base_images: base: - cluster: https://api.ci.openshift.org name: ubi namespace: ocp tag: "7" build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 @@ -25,6 +23,5 @@ resources: cpu: 100m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp diff --git a/ci-operator/config/operator-framework/presto/operator-framework-presto-release-4.3.yaml b/ci-operator/config/operator-framework/presto/operator-framework-presto-release-4.3.yaml index d8242ccaeb6a1..85685c784aa6b 100644 --- a/ci-operator/config/operator-framework/presto/operator-framework-presto-release-4.3.yaml +++ b/ci-operator/config/operator-framework/presto/operator-framework-presto-release-4.3.yaml @@ -1,6 +1,5 @@ base_images: base: - cluster: https://api.ci.openshift.org name: ubi namespace: ocp tag: "7" @@ -29,7 +28,6 @@ resources: cpu: "1" memory: 4Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.3" namespace: ocp tests: diff --git a/ci-operator/config/operator-framework/presto/operator-framework-presto-release-4.4.yaml b/ci-operator/config/operator-framework/presto/operator-framework-presto-release-4.4.yaml index e39e741704c62..e24266efecab4 100644 --- a/ci-operator/config/operator-framework/presto/operator-framework-presto-release-4.4.yaml +++ b/ci-operator/config/operator-framework/presto/operator-framework-presto-release-4.4.yaml @@ -1,6 +1,5 @@ base_images: base: - cluster: https://api.ci.openshift.org name: ubi namespace: ocp tag: "7" @@ -28,7 +27,6 @@ resources: cpu: "1" memory: 4Gi tag_specification: - cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/config/ostreedev/ostree/ostreedev-ostree-master.yaml b/ci-operator/config/ostreedev/ostree/ostreedev-ostree-master.yaml index 63d4290030992..78c843dfc79a5 100644 --- a/ci-operator/config/ostreedev/ostree/ostreedev-ostree-master.yaml +++ b/ci-operator/config/ostreedev/ostree/ostreedev-ostree-master.yaml @@ -1,10 +1,24 @@ -binary_build_commands: env SKIP_INSTALLDEPS=1 ./ci/build.sh build_root: image_stream_tag: - cluster: https://api.ci.openshift.org - name: cosa-buildroot namespace: coreos + name: cosa-buildroot tag: latest + +# With this we build a container image derived from cosa-buildroot +# that contains new binaries. From there...since this +# cluster doesn't support recursive containerization or virt, +# we can't do much interesting to test it today. But hopefully +# that will soon change. +# https://github.com/openshift/release/issues/4892 +# FIXME: change this to build-check.sh as soon as we debug the libarchive test suite failure +binary_build_commands: env SKIP_INSTALLDEPS=1 ./ci/build.sh + +tests: +- as: sanity + commands: ostree --version + container: + from: bin + resources: '*': limits: @@ -12,8 +26,3 @@ resources: requests: cpu: 1000m memory: 2Gi -tests: -- as: sanity - commands: ostree --version - container: - from: bin diff --git a/ci-operator/config/redhat-developer/devconsole-api/redhat-developer-devconsole-api-master.yaml b/ci-operator/config/redhat-developer/devconsole-api/redhat-developer-devconsole-api-master.yaml index efc146035e76e..2b97ddc7da74f 100644 --- a/ci-operator/config/redhat-developer/devconsole-api/redhat-developer-devconsole-api-master.yaml +++ b/ci-operator/config/redhat-developer/devconsole-api/redhat-developer-devconsole-api-master.yaml @@ -1,20 +1,25 @@ + base_images: os: - cluster: https://api.ci.openshift.org name: centos namespace: openshift - tag: "7" -binary_build_commands: make build -build_root: - project_image: - dockerfile_path: openshift-ci/Dockerfile.tools + tag: '7' + resources: '*': limits: memory: 3Gi requests: - cpu: 100m memory: 250Mi + cpu: 100m + + +build_root: + project_image: + dockerfile_path: openshift-ci/Dockerfile.tools + +binary_build_commands: make build + tests: - as: build commands: make build diff --git a/ci-operator/config/redhat-developer/devconsole-git/redhat-developer-devconsole-git-master.yaml b/ci-operator/config/redhat-developer/devconsole-git/redhat-developer-devconsole-git-master.yaml index 2c688267e7dd6..e034c2a9d7a33 100644 --- a/ci-operator/config/redhat-developer/devconsole-git/redhat-developer-devconsole-git-master.yaml +++ b/ci-operator/config/redhat-developer/devconsole-git/redhat-developer-devconsole-git-master.yaml @@ -1,19 +1,24 @@ + base_images: os: - cluster: https://api.ci.openshift.org name: centos namespace: openshift - tag: "7" -build_root: - project_image: - dockerfile_path: Dockerfile.builder + tag: '7' + resources: '*': limits: memory: 3Gi requests: - cpu: 100m memory: 250Mi + cpu: 100m + + +build_root: + project_image: + dockerfile_path: Dockerfile.builder + + tests: - as: build commands: make build diff --git a/ci-operator/config/redhat-developer/devconsole-operator/redhat-developer-devconsole-operator-master.yaml b/ci-operator/config/redhat-developer/devconsole-operator/redhat-developer-devconsole-operator-master.yaml index f0fa274848570..5768ec72c5efe 100644 --- a/ci-operator/config/redhat-developer/devconsole-operator/redhat-developer-devconsole-operator-master.yaml +++ b/ci-operator/config/redhat-developer/devconsole-operator/redhat-developer-devconsole-operator-master.yaml @@ -1,58 +1,63 @@ + base_images: + os: + name: centos + namespace: openshift + tag: '7' operator-registry: - cluster: https://api.ci.openshift.org name: "4.0" namespace: ocp tag: operator-registry - os: - cluster: https://api.ci.openshift.org - name: centos - namespace: openshift - tag: "7" -binary_build_commands: make build -build_root: - project_image: - dockerfile_path: openshift-ci/Dockerfile.tools + +resources: + '*': + limits: + memory: 6Gi + requests: + memory: 250Mi + cpu: 100m + images: -- dockerfile_path: openshift-ci/Dockerfile.deploy - from: os +- from: os inputs: bin: paths: - destination_dir: . - source_path: /go/src/github.com/redhat-developer/devconsole-operator/out/operator + source_path: /go/src/github.com/redhat-developer/devconsole-operator/out/operator + dockerfile_path: openshift-ci/Dockerfile.deploy to: devconsole-operator -- dockerfile_path: openshift-ci/Dockerfile.registry.intermediate - from: operator-registry +- from: operator-registry + dockerfile_path: openshift-ci/Dockerfile.registry.intermediate to: operator-registry-base -- dockerfile_path: openshift-ci/Dockerfile.registry.build - from: operator-registry-base +- from: operator-registry-base + dockerfile_path: openshift-ci/Dockerfile.registry.build to: devconsole-operator-registry -- dockerfile_path: openshift-ci/Dockerfile.upgrade.build - from: src +- from: src + dockerfile_path: openshift-ci/Dockerfile.upgrade.build to: upgrade-manifest-build -- dockerfile_path: openshift-ci/Dockerfile.registry.build.next - from: operator-registry-base +- from: operator-registry-base inputs: upgrade-manifest-build: paths: - destination_dir: . source_path: /go/src/github.com/redhat-developer/devconsole-operator/out/manifests.tar.gz + dockerfile_path: openshift-ci/Dockerfile.registry.build.next to: devconsole-operator-registry-next + promotion: - name: devconsole-0.1.0 namespace: openshift -resources: - '*': - limits: - memory: 6Gi - requests: - cpu: 100m - memory: 250Mi + name: devconsole-0.1.0 + +build_root: + project_image: + dockerfile_path: openshift-ci/Dockerfile.tools + +binary_build_commands: make build + tag_specification: - cluster: https://api.ci.openshift.org name: "4.0" namespace: ocp + tests: - as: lint commands: VERBOSE=2 make lint diff --git a/ci-operator/config/redhat-developer/openshift-jenkins-operator/redhat-developer-openshift-jenkins-operator-master.yaml b/ci-operator/config/redhat-developer/openshift-jenkins-operator/redhat-developer-openshift-jenkins-operator-master.yaml index cdb39d9b94e54..41f0fb8195421 100644 --- a/ci-operator/config/redhat-developer/openshift-jenkins-operator/redhat-developer-openshift-jenkins-operator-master.yaml +++ b/ci-operator/config/redhat-developer/openshift-jenkins-operator/redhat-developer-openshift-jenkins-operator-master.yaml @@ -1,18 +1,19 @@ base_images: base: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tag: base build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.12 images: - from: base to: openshift-jenkins-operator +#promotion: +# name: "4.2" +# namespace: ocp resources: '*': limits: @@ -21,7 +22,6 @@ resources: cpu: 200m memory: 200Mi tag_specification: - cluster: https://api.ci.openshift.org name: "4.2" namespace: ocp tests: @@ -29,3 +29,12 @@ tests: commands: make test-unit container: from: src +#- as: e2e-operator +# commands: make test-e2e +# openshift_installer_src: +# cluster_profile: aws +#- as: e2e-aws +# commands: TEST_SUITE=openshift/conformance/parallel run-tests +# openshift_installer: +# cluster_profile: aws + diff --git a/ci-operator/config/redhat-developer/service-binding-operator/redhat-developer-service-binding-operator-master.yaml b/ci-operator/config/redhat-developer/service-binding-operator/redhat-developer-service-binding-operator-master.yaml index 458d69ac75678..d1d6d496becc1 100644 --- a/ci-operator/config/redhat-developer/service-binding-operator/redhat-developer-service-binding-operator-master.yaml +++ b/ci-operator/config/redhat-developer/service-binding-operator/redhat-developer-service-binding-operator-master.yaml @@ -1,44 +1,48 @@ + base_images: + os: + name: ubi + namespace: ocp + tag: '7' operator-registry: - cluster: https://api.ci.openshift.org name: "4.0" namespace: ocp tag: operator-registry - os: - cluster: https://api.ci.openshift.org - name: ubi - namespace: ocp - tag: "7" -binary_build_commands: make build -build_root: - project_image: - dockerfile_path: openshift-ci/Dockerfile.tools + +resources: + '*': + limits: + memory: 6Gi + requests: + memory: 250Mi + cpu: 100m + images: -- dockerfile_path: openshift-ci/Dockerfile.deploy - from: os +- from: os inputs: bin: paths: - destination_dir: . - source_path: /go/src/github.com/redhat-developer/service-binding-operator/out/operator + source_path: /go/src/github.com/redhat-developer/service-binding-operator/out/operator + dockerfile_path: openshift-ci/Dockerfile.deploy to: service-binding-operator -- dockerfile_path: openshift-ci/Dockerfile.registry.intermediate - from: operator-registry +- from: operator-registry + dockerfile_path: openshift-ci/Dockerfile.registry.intermediate to: operator-registry-base -- dockerfile_path: openshift-ci/Dockerfile.registry.build - from: operator-registry-base +- from: operator-registry-base + dockerfile_path: openshift-ci/Dockerfile.registry.build to: service-binding-operator-registry -resources: - '*': - limits: - memory: 6Gi - requests: - cpu: 100m - memory: 250Mi + +binary_build_commands: make build + +build_root: + project_image: + dockerfile_path: openshift-ci/Dockerfile.tools + tag_specification: - cluster: https://api.ci.openshift.org - name: "4.2" + name: '4.2' namespace: ocp + tests: - as: lint commands: VERBOSE=2 make lint @@ -46,12 +50,16 @@ tests: from: src - as: unit commands: VERBOSE=2 make test-unit-with-coverage upload-codecov-report - container: - from: src secret: - mount_path: /usr/local/redhat-developer-service-binding-operator-codecov-token name: redhat-developer-service-binding-operator-codecov-token + mount_path: /usr/local/redhat-developer-service-binding-operator-codecov-token + container: + from: src - as: e2e commands: VERBOSE=2 LOGS_DIR=/tmp/artifacts make -k test-e2e parse-test-e2e-operator-log openshift_installer_src: cluster_profile: aws +#- as: e2e-olm-ci +# commands: make test-e2e-olm-ci +# openshift_installer_src: +# cluster_profile: aws diff --git a/ci-operator/config/tnozicka/openshift-acme/tnozicka-openshift-acme-master.yaml b/ci-operator/config/tnozicka/openshift-acme/tnozicka-openshift-acme-master.yaml index d4fd499ef7776..fcf6d7fbcdae6 100644 --- a/ci-operator/config/tnozicka/openshift-acme/tnozicka-openshift-acme-master.yaml +++ b/ci-operator/config/tnozicka/openshift-acme/tnozicka-openshift-acme-master.yaml @@ -1,26 +1,27 @@ base_images: base: - cluster: https://api.ci.openshift.org - name: "4.0" + name: '4.0' namespace: ocp tag: base base-machine: - cluster: https://api.ci.openshift.org name: fedora namespace: openshift - tag: "29" + tag: '29' machine-os-content-base: - cluster: https://api.ci.openshift.org - name: "4.0" + name: '4.0' namespace: ocp tag: machine-os-content -binary_build_commands: make build GOFLAGS='-v' + build_root: image_stream_tag: - cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.10 + + +binary_build_commands: make build GOFLAGS='-v' +test_binary_build_commands: make build GOFLAGS='-v -race' + images: - dockerfile_path: images/openshift-acme-controller/Dockerfile from: base @@ -28,38 +29,41 @@ images: bin: as: - bin - paths: null to: openshift-acme + promotion: - name: "" namespace: ci tag: latest -resources: - '*': - limits: - memory: 3Gi - requests: - cpu: "3" - memory: 1Gi + tag_specification: - cluster: https://api.ci.openshift.org - name: "4.0" + name: '4.0' namespace: ocp -test_binary_build_commands: make build GOFLAGS='-v -race' + tests: - as: verify commands: make verify -k container: from: bin + - as: unit commands: make test container: from: test-bin + - as: e2e-cluster-wide commands: hack/ci-run-e2e-cluster-wide.sh openshift_installer_src: cluster_profile: aws + - as: e2e-single-namespace commands: hack/ci-run-e2e-single-namespace.sh openshift_installer_src: cluster_profile: aws + +resources: + '*': + limits: + memory: 3Gi + requests: + cpu: '3' + memory: 1Gi