From b98e450af555d1aa73aefceec4bade83f0cca14a Mon Sep 17 00:00:00 2001 From: flacatus Date: Tue, 4 Aug 2020 12:55:43 +0200 Subject: [PATCH 1/8] Add job to tests olm nightly files in OCP 4.5 Signed-off-by: flacatus --- .../eclipse-che-operator-master__v5.yaml | 7 + ...clipse-che-operator-master-presubmits.yaml | 126 ++++++++++++++++++ 2 files changed, 133 insertions(+) diff --git a/ci-operator/config/eclipse/che-operator/eclipse-che-operator-master__v5.yaml b/ci-operator/config/eclipse/che-operator/eclipse-che-operator-master__v5.yaml index a5b1316d24f4..fe04beecf71c 100644 --- a/ci-operator/config/eclipse/che-operator/eclipse-che-operator-master__v5.yaml +++ b/ci-operator/config/eclipse/che-operator/eclipse-che-operator-master__v5.yaml @@ -10,6 +10,9 @@ base_images: build_root: project_image: dockerfile_path: .ci/openshift-ci/Dockerfile +images: +- dockerfile_path: olm/eclipse-che-preview-openshift/Dockerfile + to: che-operator-catalog resources: '*': limits: @@ -25,6 +28,10 @@ tests: commands: .ci/cico_updates_openshift.sh openshift_installer_src: cluster_profile: aws +- as: che-operator-olm-nightly + commands: .ci/cico_olm_openshift.sh + openshift_installer_src: + cluster_profile: aws zz_generated_metadata: branch: master org: eclipse diff --git a/ci-operator/jobs/eclipse/che-operator/eclipse-che-operator-master-presubmits.yaml b/ci-operator/jobs/eclipse/che-operator/eclipse-che-operator-master-presubmits.yaml index d49958184b7c..bedf49437528 100644 --- a/ci-operator/jobs/eclipse/che-operator/eclipse-che-operator-master-presubmits.yaml +++ b/ci-operator/jobs/eclipse/che-operator/eclipse-che-operator-master-presubmits.yaml @@ -79,6 +79,85 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )v4-che-operator-update,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - master + cluster: api.ci + context: ci/prow/v5-che-operator-olm-nightly + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/prowgen-controlled: "true" + ci-operator.openshift.io/variant: v5 + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-eclipse-che-operator-master-v5-che-operator-olm-nightly + rerun_command: /test v5-che-operator-olm-nightly + spec: + containers: + - args: + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-password-file=/etc/boskos/password + - --report-password-file=/etc/report/password.txt + - --report-username=ci + - --secret-dir=/usr/local/che-operator-olm-nightly-cluster-profile + - --target=che-operator-olm-nightly + - --template=/usr/local/che-operator-olm-nightly + - --variant=v5 + command: + - ci-operator + env: + - name: CLUSTER_TYPE + value: aws + - name: JOB_NAME_SAFE + value: che-operator-olm-nightly + - name: TEST_COMMAND + value: .ci/cico_olm_openshift.sh + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /usr/local/che-operator-olm-nightly-cluster-profile + name: cluster-profile + - mountPath: /usr/local/che-operator-olm-nightly + name: job-definition + subPath: cluster-launch-installer-src.yaml + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: boskos + secret: + items: + - key: password + path: password + secretName: boskos-credentials + - name: cluster-profile + projected: + sources: + - secret: + name: cluster-secrets-aws + - configMap: + name: prow-job-cluster-launch-installer-src + name: job-definition + - name: pull-secret + secret: + secretName: regcred + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )v5-che-operator-olm-nightly,?($|\s.*) - agent: kubernetes always_run: true branches: @@ -158,3 +237,50 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )v5-che-operator-update,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - master + cluster: api.ci + context: ci/prow/v5-images + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/prowgen-controlled: "true" + ci-operator.openshift.io/variant: v5 + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-eclipse-che-operator-master-v5-images + rerun_command: /test v5-images + spec: + containers: + - args: + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --report-password-file=/etc/report/password.txt + - --report-username=ci + - --target=[images] + - --variant=v5 + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: pull-secret + secret: + secretName: regcred + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )v5-images,?($|\s.*) From 1231ed4042058d7724cd5997db0f6d9064ecb172 Mon Sep 17 00:00:00 2001 From: flacatus Date: Tue, 4 Aug 2020 17:42:06 +0200 Subject: [PATCH 2/8] Add abazko to owners files Signed-off-by: flacatus --- ci-operator/config/eclipse/che-operator/OWNERS | 4 +++- ci-operator/jobs/eclipse/che-operator/OWNERS | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ci-operator/config/eclipse/che-operator/OWNERS b/ci-operator/config/eclipse/che-operator/OWNERS index 46ecb83beed1..2a9ca9497bcf 100644 --- a/ci-operator/config/eclipse/che-operator/OWNERS +++ b/ci-operator/config/eclipse/che-operator/OWNERS @@ -1,7 +1,9 @@ approvers: +- abazko - rhopp - flacatus options: {} reviewers: +- abazko - rhopp -- flacatus \ No newline at end of file +- flacatus diff --git a/ci-operator/jobs/eclipse/che-operator/OWNERS b/ci-operator/jobs/eclipse/che-operator/OWNERS index 46ecb83beed1..2a9ca9497bcf 100644 --- a/ci-operator/jobs/eclipse/che-operator/OWNERS +++ b/ci-operator/jobs/eclipse/che-operator/OWNERS @@ -1,7 +1,9 @@ approvers: +- abazko - rhopp - flacatus options: {} reviewers: +- abazko - rhopp -- flacatus \ No newline at end of file +- flacatus From 7688cc53cbd075e403c2b06fce7ae9c2de8c0bd1 Mon Sep 17 00:00:00 2001 From: flacatus Date: Tue, 4 Aug 2020 17:47:39 +0200 Subject: [PATCH 3/8] Fix owners files Signed-off-by: flacatus --- ci-operator/config/eclipse/che-operator/OWNERS | 4 ++-- ci-operator/jobs/che-incubator/chectl/OWNERS | 4 ++-- ci-operator/jobs/eclipse/che-operator/OWNERS | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ci-operator/config/eclipse/che-operator/OWNERS b/ci-operator/config/eclipse/che-operator/OWNERS index 2a9ca9497bcf..4ce34e776705 100644 --- a/ci-operator/config/eclipse/che-operator/OWNERS +++ b/ci-operator/config/eclipse/che-operator/OWNERS @@ -1,9 +1,9 @@ approvers: -- abazko - rhopp - flacatus +- tolusha options: {} reviewers: -- abazko - rhopp - flacatus +- tolusha diff --git a/ci-operator/jobs/che-incubator/chectl/OWNERS b/ci-operator/jobs/che-incubator/chectl/OWNERS index 6b9cad9faf13..f38fb8f0d224 100644 --- a/ci-operator/jobs/che-incubator/chectl/OWNERS +++ b/ci-operator/jobs/che-incubator/chectl/OWNERS @@ -1,9 +1,9 @@ approvers: - rhopp - flacatus -- abazko +- tolusha options: {} reviewers: - rhopp - flacatus -- abazko \ No newline at end of file +- tolusha \ No newline at end of file diff --git a/ci-operator/jobs/eclipse/che-operator/OWNERS b/ci-operator/jobs/eclipse/che-operator/OWNERS index 2a9ca9497bcf..3ca968ff04ab 100644 --- a/ci-operator/jobs/eclipse/che-operator/OWNERS +++ b/ci-operator/jobs/eclipse/che-operator/OWNERS @@ -1,9 +1,9 @@ approvers: -- abazko +- tolusha - rhopp - flacatus options: {} reviewers: -- abazko +- tolusha - rhopp - flacatus From 3a83a50f84684b6a0e479781ee75598bc7ebe7f9 Mon Sep 17 00:00:00 2001 From: flacatus Date: Wed, 5 Aug 2020 11:05:21 +0200 Subject: [PATCH 4/8] Another try of installation Signed-off-by: flacatus --- .../che-operator/eclipse-che-operator-master__v5.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ci-operator/config/eclipse/che-operator/eclipse-che-operator-master__v5.yaml b/ci-operator/config/eclipse/che-operator/eclipse-che-operator-master__v5.yaml index fe04beecf71c..5c555b72b3c7 100644 --- a/ci-operator/config/eclipse/che-operator/eclipse-che-operator-master__v5.yaml +++ b/ci-operator/config/eclipse/che-operator/eclipse-che-operator-master__v5.yaml @@ -12,6 +12,11 @@ build_root: dockerfile_path: .ci/openshift-ci/Dockerfile images: - dockerfile_path: olm/eclipse-che-preview-openshift/Dockerfile + inputs: + bin: + paths: + - destination_dir: . + source_path: /go/src/github.com/eclipse/che-operator/olm/eclipse-che-preview-openshift to: che-operator-catalog resources: '*': From 665a78d00f03112761273580ce5607fda79101e2 Mon Sep 17 00:00:00 2001 From: flacatus Date: Wed, 5 Aug 2020 11:09:35 +0200 Subject: [PATCH 5/8] Another try of installation Signed-off-by: flacatus --- .../che-operator/eclipse-che-operator-master__v5.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/ci-operator/config/eclipse/che-operator/eclipse-che-operator-master__v5.yaml b/ci-operator/config/eclipse/che-operator/eclipse-che-operator-master__v5.yaml index 5c555b72b3c7..fe04beecf71c 100644 --- a/ci-operator/config/eclipse/che-operator/eclipse-che-operator-master__v5.yaml +++ b/ci-operator/config/eclipse/che-operator/eclipse-che-operator-master__v5.yaml @@ -12,11 +12,6 @@ build_root: dockerfile_path: .ci/openshift-ci/Dockerfile images: - dockerfile_path: olm/eclipse-che-preview-openshift/Dockerfile - inputs: - bin: - paths: - - destination_dir: . - source_path: /go/src/github.com/eclipse/che-operator/olm/eclipse-che-preview-openshift to: che-operator-catalog resources: '*': From 8720a4006cf19acc0190577dff62d37f72a4eb0b Mon Sep 17 00:00:00 2001 From: flacatus Date: Wed, 5 Aug 2020 11:12:15 +0200 Subject: [PATCH 6/8] Another try of installation Signed-off-by: flacatus --- .../eclipse/che-operator/eclipse-che-operator-master__v5.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-operator/config/eclipse/che-operator/eclipse-che-operator-master__v5.yaml b/ci-operator/config/eclipse/che-operator/eclipse-che-operator-master__v5.yaml index fe04beecf71c..20faf698fbdb 100644 --- a/ci-operator/config/eclipse/che-operator/eclipse-che-operator-master__v5.yaml +++ b/ci-operator/config/eclipse/che-operator/eclipse-che-operator-master__v5.yaml @@ -11,7 +11,7 @@ build_root: project_image: dockerfile_path: .ci/openshift-ci/Dockerfile images: -- dockerfile_path: olm/eclipse-che-preview-openshift/Dockerfile +- dockerfile_path: /go/src/github.com/eclipse/che-operator/olm/eclipse-che-preview-openshift/Dockerfile to: che-operator-catalog resources: '*': From 33116c955f92effbd312569562aa67e1436d0262 Mon Sep 17 00:00:00 2001 From: flacatus Date: Wed, 5 Aug 2020 11:22:11 +0200 Subject: [PATCH 7/8] Fix image reference and command Signed-off-by: flacatus --- .../che-operator/eclipse-che-operator-master__v5.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ci-operator/config/eclipse/che-operator/eclipse-che-operator-master__v5.yaml b/ci-operator/config/eclipse/che-operator/eclipse-che-operator-master__v5.yaml index 20faf698fbdb..83ffe5cbbf7c 100644 --- a/ci-operator/config/eclipse/che-operator/eclipse-che-operator-master__v5.yaml +++ b/ci-operator/config/eclipse/che-operator/eclipse-che-operator-master__v5.yaml @@ -11,7 +11,7 @@ build_root: project_image: dockerfile_path: .ci/openshift-ci/Dockerfile images: -- dockerfile_path: /go/src/github.com/eclipse/che-operator/olm/eclipse-che-preview-openshift/Dockerfile +- dockerfile_path: olm/eclipse-che-preview-openshift/Dockerfile to: che-operator-catalog resources: '*': @@ -25,7 +25,8 @@ tag_specification: namespace: ocp tests: - as: che-operator-update - commands: .ci/cico_updates_openshift.sh + commands: | + /bin/bash olm/testCatalogSource.sh openshift nightly che marketplace marketplace_image openshift_installer_src: cluster_profile: aws - as: che-operator-olm-nightly From eeef292dd345f7931e98a382b2140b5f0630962b Mon Sep 17 00:00:00 2001 From: flacatus Date: Wed, 5 Aug 2020 14:08:20 +0200 Subject: [PATCH 8/8] Revert changes Signed-off-by: flacatus --- .../che-operator/eclipse-che-operator-master__v5.yaml | 5 ++--- .../che-operator/eclipse-che-operator-master-presubmits.yaml | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ci-operator/config/eclipse/che-operator/eclipse-che-operator-master__v5.yaml b/ci-operator/config/eclipse/che-operator/eclipse-che-operator-master__v5.yaml index 83ffe5cbbf7c..b89e64d6c307 100644 --- a/ci-operator/config/eclipse/che-operator/eclipse-che-operator-master__v5.yaml +++ b/ci-operator/config/eclipse/che-operator/eclipse-che-operator-master__v5.yaml @@ -25,12 +25,11 @@ tag_specification: namespace: ocp tests: - as: che-operator-update - commands: | - /bin/bash olm/testCatalogSource.sh openshift nightly che marketplace marketplace_image + commands: .ci/cico_updates_openshift.sh openshift_installer_src: cluster_profile: aws - as: che-operator-olm-nightly - commands: .ci/cico_olm_openshift.sh + commands: "/bin/bash olm/testCatalogSource.sh openshift nightly che marketplace marketplace_image \n" openshift_installer_src: cluster_profile: aws zz_generated_metadata: diff --git a/ci-operator/jobs/eclipse/che-operator/eclipse-che-operator-master-presubmits.yaml b/ci-operator/jobs/eclipse/che-operator/eclipse-che-operator-master-presubmits.yaml index bedf49437528..b036b66f1f8b 100644 --- a/ci-operator/jobs/eclipse/che-operator/eclipse-che-operator-master-presubmits.yaml +++ b/ci-operator/jobs/eclipse/che-operator/eclipse-che-operator-master-presubmits.yaml @@ -113,7 +113,7 @@ presubmits: - name: JOB_NAME_SAFE value: che-operator-olm-nightly - name: TEST_COMMAND - value: .ci/cico_olm_openshift.sh + value: "/bin/bash olm/testCatalogSource.sh openshift nightly che marketplace marketplace_image \n" image: ci-operator:latest imagePullPolicy: Always name: ""