From 664c555d53c431d874202588f0b0ff31abf74440 Mon Sep 17 00:00:00 2001 From: Flavius Lacatusu Date: Fri, 4 Dec 2020 10:10:00 +0100 Subject: [PATCH 1/2] Add new nightly bundle tests Signed-off-by: Flavius Lacatusu --- .../eclipse-che-operator-master__v3.yaml | 40 --- .../eclipse-che-operator-master__v4.yaml | 40 --- .../eclipse-che-operator-master__v5.yaml | 50 ++- .../eclipse-che-operator-master__v6.yaml | 68 ++++ .../eclipse-che-operator-master__v7.yaml | 68 ++++ ...clipse-che-operator-master-presubmits.yaml | 319 +++++++++++++++--- 6 files changed, 437 insertions(+), 148 deletions(-) delete mode 100644 ci-operator/config/eclipse/che-operator/eclipse-che-operator-master__v3.yaml delete mode 100644 ci-operator/config/eclipse/che-operator/eclipse-che-operator-master__v4.yaml create mode 100644 ci-operator/config/eclipse/che-operator/eclipse-che-operator-master__v6.yaml create mode 100644 ci-operator/config/eclipse/che-operator/eclipse-che-operator-master__v7.yaml diff --git a/ci-operator/config/eclipse/che-operator/eclipse-che-operator-master__v3.yaml b/ci-operator/config/eclipse/che-operator/eclipse-che-operator-master__v3.yaml deleted file mode 100644 index a28012b8af85..000000000000 --- a/ci-operator/config/eclipse/che-operator/eclipse-che-operator-master__v3.yaml +++ /dev/null @@ -1,40 +0,0 @@ -base_images: - cli: - name: "4.3" - namespace: ocp - tag: cli - cli-jq: - name: cli-jq - namespace: ocp - tag: latest -build_root: - project_image: - dockerfile_path: .ci/openshift-ci/Dockerfile -resources: - '*': - limits: - memory: 4Gi - requests: - cpu: 100m - memory: 200Mi -tag_specification: - name: "4.3" - namespace: ocp -tests: -- as: che-operator-update - steps: - cluster_profile: aws - test: - - as: test - cli: latest - commands: .ci/cico_updates_openshift.sh - from: src - resources: - requests: - cpu: 100m - workflow: ipi-aws -zz_generated_metadata: - branch: master - org: eclipse - repo: che-operator - variant: v3 diff --git a/ci-operator/config/eclipse/che-operator/eclipse-che-operator-master__v4.yaml b/ci-operator/config/eclipse/che-operator/eclipse-che-operator-master__v4.yaml deleted file mode 100644 index c30fe4efa4bc..000000000000 --- a/ci-operator/config/eclipse/che-operator/eclipse-che-operator-master__v4.yaml +++ /dev/null @@ -1,40 +0,0 @@ -base_images: - cli: - name: "4.4" - namespace: ocp - tag: cli - cli-jq: - name: cli-jq - namespace: ocp - tag: latest -build_root: - project_image: - dockerfile_path: .ci/openshift-ci/Dockerfile -resources: - '*': - limits: - memory: 4Gi - requests: - cpu: 100m - memory: 200Mi -tag_specification: - name: "4.4" - namespace: ocp -tests: -- as: che-operator-update - steps: - cluster_profile: aws - test: - - as: test - cli: latest - commands: .ci/cico_updates_openshift.sh - from: src - resources: - requests: - cpu: 100m - workflow: ipi-aws -zz_generated_metadata: - branch: master - org: eclipse - repo: che-operator - variant: v4 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 6f55fba587d5..059e6638e1c2 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 @@ -7,9 +7,20 @@ base_images: name: cli-jq namespace: ocp tag: latest + operator-registry: + name: "4.5" + namespace: ocp + tag: operator-registry build_root: project_image: dockerfile_path: .ci/openshift-ci/Dockerfile +images: +- dockerfile_path: Dockerfile + to: che-operator-image +operator: + bundles: + - context_dir: deploy/olm-catalog/eclipse-che-preview-openshift + dockerfile_path: bundle.Dockerfile resources: '*': limits: @@ -21,30 +32,35 @@ tag_specification: name: "4.5" namespace: ocp tests: -- as: che-operator-update - steps: - cluster_profile: aws - test: - - as: test - cli: latest - commands: .ci/cico_updates_openshift.sh - from: src - resources: - requests: - cpu: 100m - workflow: ipi-aws -- as: che-operator-olm-latest-changes-tests +- as: che-operator-nightly steps: cluster_profile: aws + env: + OO_CHANNEL: nightly + OO_INSTALL_NAMESPACE: eclipse-che + OO_PACKAGE: eclipse-che-preview-openshift + OO_TARGET_NAMESPACES: '!install' test: - - as: test - cli: latest - commands: .ci/cico_olm_openshift.sh + - as: olm-tests + commands: | + export PATH=$PATH:/tmp/bin + mkdir -p /tmp/bin + curl https://mirror.openshift.com/pub/openshift-v4/clients/oc/4.5/linux/oc.tar.gz | tar xvzf - -C /tmp/bin/ oc + chmod ug+x /tmp/bin/oc + + echo -e "[INFO] Test script content:" + cat .ci/oci-nightly-olm.sh + + /bin/bash .ci/oci-nightly-olm.sh + dependencies: + - env: CI_CHE_OPERATOR_IMAGE + name: che-operator-image from: src resources: requests: cpu: 100m - workflow: ipi-aws + memory: 200Mi + workflow: optional-operators-ci-aws zz_generated_metadata: branch: master org: eclipse diff --git a/ci-operator/config/eclipse/che-operator/eclipse-che-operator-master__v6.yaml b/ci-operator/config/eclipse/che-operator/eclipse-che-operator-master__v6.yaml new file mode 100644 index 000000000000..fa70da46ceb9 --- /dev/null +++ b/ci-operator/config/eclipse/che-operator/eclipse-che-operator-master__v6.yaml @@ -0,0 +1,68 @@ +base_images: + cli: + name: "4.6" + namespace: ocp + tag: cli + cli-jq: + name: cli-jq + namespace: ocp + tag: latest + operator-registry: + name: "4.6" + namespace: ocp + tag: operator-registry +build_root: + project_image: + dockerfile_path: .ci/openshift-ci/Dockerfile +images: +- dockerfile_path: Dockerfile + to: che-operator-image +operator: + bundles: + - context_dir: deploy/olm-catalog/eclipse-che-preview-openshift + dockerfile_path: bundle.Dockerfile +resources: + '*': + limits: + memory: 4Gi + requests: + cpu: 100m + memory: 200Mi +tag_specification: + name: "4.6" + namespace: ocp +tests: +- as: che-operator-nightly + steps: + cluster_profile: aws + env: + OO_CHANNEL: nightly + OO_INSTALL_NAMESPACE: eclipse-che + OO_PACKAGE: eclipse-che-preview-openshift + OO_TARGET_NAMESPACES: '!install' + test: + - as: olm-tests + commands: | + export PATH=$PATH:/tmp/bin + mkdir -p /tmp/bin + curl https://mirror.openshift.com/pub/openshift-v4/clients/oc/4.6/linux/oc.tar.gz | tar xvzf - -C /tmp/bin/ oc + chmod ug+x /tmp/bin/oc + + echo -e "[INFO] Test script content:" + cat .ci/oci-nightly-olm.sh + + /bin/bash .ci/oci-nightly-olm.sh + dependencies: + - env: CI_CHE_OPERATOR_IMAGE + name: che-operator-image + from: src + resources: + requests: + cpu: 100m + memory: 200Mi + workflow: optional-operators-ci-aws +zz_generated_metadata: + branch: master + org: eclipse + repo: che-operator + variant: v6 diff --git a/ci-operator/config/eclipse/che-operator/eclipse-che-operator-master__v7.yaml b/ci-operator/config/eclipse/che-operator/eclipse-che-operator-master__v7.yaml new file mode 100644 index 000000000000..eb9a2f285b44 --- /dev/null +++ b/ci-operator/config/eclipse/che-operator/eclipse-che-operator-master__v7.yaml @@ -0,0 +1,68 @@ +base_images: + cli: + name: "4.7" + namespace: ocp + tag: cli + cli-jq: + name: cli-jq + namespace: ocp + tag: latest + operator-registry: + name: "4.7" + namespace: ocp + tag: operator-registry +build_root: + project_image: + dockerfile_path: .ci/openshift-ci/Dockerfile +images: +- dockerfile_path: Dockerfile + to: che-operator-image +operator: + bundles: + - context_dir: deploy/olm-catalog/eclipse-che-preview-openshift + dockerfile_path: bundle.Dockerfile +resources: + '*': + limits: + memory: 4Gi + requests: + cpu: 100m + memory: 200Mi +tag_specification: + name: "4.7" + namespace: ocp +tests: +- as: che-operator-nightly + steps: + cluster_profile: aws + env: + OO_CHANNEL: nightly + OO_INSTALL_NAMESPACE: eclipse-che + OO_PACKAGE: eclipse-che-preview-openshift + OO_TARGET_NAMESPACES: '!install' + test: + - as: olm-tests + commands: | + export PATH=$PATH:/tmp/bin + mkdir -p /tmp/bin + curl https://mirror.openshift.com/pub/openshift-v4/clients/oc/4.6/linux/oc.tar.gz | tar xvzf - -C /tmp/bin/ oc + chmod ug+x /tmp/bin/oc + + echo -e "[INFO] Test script content:" + cat .ci/oci-nightly-olm.sh + + /bin/bash .ci/oci-nightly-olm.sh + dependencies: + - env: CI_CHE_OPERATOR_IMAGE + name: che-operator-image + from: src + resources: + requests: + cpu: 100m + memory: 200Mi + workflow: optional-operators-ci-aws +zz_generated_metadata: + branch: master + org: eclipse + repo: che-operator + variant: v7 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 c2a73fc97c69..fcc57cc7880e 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 @@ -5,16 +5,16 @@ presubmits: branches: - master cluster: build01 - context: ci/prow/v3-che-operator-update + context: ci/prow/v5-che-operator-nightly decorate: true decoration_config: skip_cloning: true labels: ci-operator.openshift.io/prowgen-controlled: "true" - ci-operator.openshift.io/variant: v3 + ci-operator.openshift.io/variant: v5 pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-eclipse-che-operator-master-v3-che-operator-update - rerun_command: /test v3-che-operator-update + name: pull-ci-eclipse-che-operator-master-v5-che-operator-nightly + rerun_command: /test v5-che-operator-nightly spec: containers: - args: @@ -22,9 +22,9 @@ presubmits: - --lease-server-password-file=/etc/boskos/password - --report-password-file=/etc/report/password.txt - --report-username=ci - - --secret-dir=/usr/local/che-operator-update-cluster-profile - - --target=che-operator-update - - --variant=v3 + - --secret-dir=/usr/local/che-operator-nightly-cluster-profile + - --target=che-operator-nightly + - --variant=v5 command: - ci-operator image: ci-operator:latest @@ -37,7 +37,7 @@ presubmits: - mountPath: /etc/boskos name: boskos readOnly: true - - mountPath: /usr/local/che-operator-update-cluster-profile + - mountPath: /usr/local/che-operator-nightly-cluster-profile name: cluster-profile - mountPath: /etc/pull-secret name: pull-secret @@ -64,32 +64,30 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )v3-che-operator-update,?($|\s.*) + trigger: (?m)^/test( | .* )v5-che-operator-nightly,?($|\s.*) - agent: kubernetes always_run: true branches: - master cluster: build01 - context: ci/prow/v4-che-operator-update + context: ci/prow/v5-ci-index decorate: true decoration_config: skip_cloning: true labels: ci-operator.openshift.io/prowgen-controlled: "true" - ci-operator.openshift.io/variant: v4 + ci-operator.openshift.io/variant: v5 pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-eclipse-che-operator-master-v4-che-operator-update - rerun_command: /test v4-che-operator-update + name: pull-ci-eclipse-che-operator-master-v5-ci-index + rerun_command: /test v5-ci-index 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-update-cluster-profile - - --target=che-operator-update - - --variant=v4 + - --target=ci-index + - --variant=v5 command: - ci-operator image: ci-operator:latest @@ -99,11 +97,6 @@ presubmits: requests: cpu: 10m volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /usr/local/che-operator-update-cluster-profile - name: cluster-profile - mountPath: /etc/pull-secret name: pull-secret readOnly: true @@ -112,30 +105,19 @@ presubmits: 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 - name: pull-secret secret: secretName: registry-pull-credentials - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )v4-che-operator-update,?($|\s.*) + trigger: (?m)^/test( | .* )v5-ci-index,?($|\s.*) - agent: kubernetes always_run: true branches: - master cluster: build01 - context: ci/prow/v5-che-operator-olm-latest-changes-tests + context: ci/prow/v5-images decorate: true decoration_config: skip_cloning: true @@ -143,17 +125,15 @@ presubmits: 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-latest-changes-tests - rerun_command: /test v5-che-operator-olm-latest-changes-tests + 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 - - --lease-server-password-file=/etc/boskos/password - --report-password-file=/etc/report/password.txt - --report-username=ci - - --secret-dir=/usr/local/che-operator-olm-latest-changes-tests-cluster-profile - - --target=che-operator-olm-latest-changes-tests + - --target=[images] - --variant=v5 command: - ci-operator @@ -164,10 +144,59 @@ presubmits: 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: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )v5-images,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - master + cluster: build01 + context: ci/prow/v6-che-operator-nightly + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/prowgen-controlled: "true" + ci-operator.openshift.io/variant: v6 + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-eclipse-che-operator-master-v6-che-operator-nightly + rerun_command: /test v6-che-operator-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-nightly-cluster-profile + - --target=che-operator-nightly + - --variant=v6 + command: + - ci-operator + 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-latest-changes-tests-cluster-profile + - mountPath: /usr/local/che-operator-nightly-cluster-profile name: cluster-profile - mountPath: /etc/pull-secret name: pull-secret @@ -194,22 +223,116 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )v5-che-operator-olm-latest-changes-tests,?($|\s.*) + trigger: (?m)^/test( | .* )v6-che-operator-nightly,?($|\s.*) - agent: kubernetes always_run: true branches: - master cluster: build01 - context: ci/prow/v5-che-operator-update + context: ci/prow/v6-ci-index decorate: true decoration_config: skip_cloning: true labels: ci-operator.openshift.io/prowgen-controlled: "true" - ci-operator.openshift.io/variant: v5 + ci-operator.openshift.io/variant: v6 + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-eclipse-che-operator-master-v6-ci-index + rerun_command: /test v6-ci-index + spec: + containers: + - args: + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --report-password-file=/etc/report/password.txt + - --report-username=ci + - --target=ci-index + - --variant=v6 + 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: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )v6-ci-index,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - master + cluster: build01 + context: ci/prow/v6-images + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/prowgen-controlled: "true" + ci-operator.openshift.io/variant: v6 + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-eclipse-che-operator-master-v6-images + rerun_command: /test v6-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=v6 + 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: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )v6-images,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - master + cluster: build01 + context: ci/prow/v7-che-operator-nightly + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/prowgen-controlled: "true" + ci-operator.openshift.io/variant: v7 pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-eclipse-che-operator-master-v5-che-operator-update - rerun_command: /test v5-che-operator-update + name: pull-ci-eclipse-che-operator-master-v7-che-operator-nightly + rerun_command: /test v7-che-operator-nightly spec: containers: - args: @@ -217,9 +340,9 @@ presubmits: - --lease-server-password-file=/etc/boskos/password - --report-password-file=/etc/report/password.txt - --report-username=ci - - --secret-dir=/usr/local/che-operator-update-cluster-profile - - --target=che-operator-update - - --variant=v5 + - --secret-dir=/usr/local/che-operator-nightly-cluster-profile + - --target=che-operator-nightly + - --variant=v7 command: - ci-operator image: ci-operator:latest @@ -232,7 +355,7 @@ presubmits: - mountPath: /etc/boskos name: boskos readOnly: true - - mountPath: /usr/local/che-operator-update-cluster-profile + - mountPath: /usr/local/che-operator-nightly-cluster-profile name: cluster-profile - mountPath: /etc/pull-secret name: pull-secret @@ -259,4 +382,98 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )v5-che-operator-update,?($|\s.*) + trigger: (?m)^/test( | .* )v7-che-operator-nightly,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - master + cluster: build01 + context: ci/prow/v7-ci-index + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/prowgen-controlled: "true" + ci-operator.openshift.io/variant: v7 + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-eclipse-che-operator-master-v7-ci-index + rerun_command: /test v7-ci-index + spec: + containers: + - args: + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --report-password-file=/etc/report/password.txt + - --report-username=ci + - --target=ci-index + - --variant=v7 + 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: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )v7-ci-index,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - master + cluster: build01 + context: ci/prow/v7-images + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/prowgen-controlled: "true" + ci-operator.openshift.io/variant: v7 + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-eclipse-che-operator-master-v7-images + rerun_command: /test v7-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=v7 + 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: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )v7-images,?($|\s.*) From dbfc7d0656dc685cabcd39dd66858f8ae0434e5d Mon Sep 17 00:00:00 2001 From: Flavius Lacatusu Date: Wed, 9 Dec 2020 08:53:26 +0100 Subject: [PATCH 2/2] Remove 4.5 and add s-host nightly new script Signed-off-by: Flavius Lacatusu --- .../eclipse-che-operator-master__v5.yaml | 68 ------- .../eclipse-che-operator-master__v6.yaml | 33 +++- .../eclipse-che-operator-master__v7.yaml | 33 +++- ...clipse-che-operator-master-presubmits.yaml | 179 ++++++++---------- 4 files changed, 137 insertions(+), 176 deletions(-) delete mode 100644 ci-operator/config/eclipse/che-operator/eclipse-che-operator-master__v5.yaml 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 deleted file mode 100644 index 059e6638e1c2..000000000000 --- a/ci-operator/config/eclipse/che-operator/eclipse-che-operator-master__v5.yaml +++ /dev/null @@ -1,68 +0,0 @@ -base_images: - cli: - name: "4.5" - namespace: ocp - tag: cli - cli-jq: - name: cli-jq - namespace: ocp - tag: latest - operator-registry: - name: "4.5" - namespace: ocp - tag: operator-registry -build_root: - project_image: - dockerfile_path: .ci/openshift-ci/Dockerfile -images: -- dockerfile_path: Dockerfile - to: che-operator-image -operator: - bundles: - - context_dir: deploy/olm-catalog/eclipse-che-preview-openshift - dockerfile_path: bundle.Dockerfile -resources: - '*': - limits: - memory: 4Gi - requests: - cpu: 100m - memory: 200Mi -tag_specification: - name: "4.5" - namespace: ocp -tests: -- as: che-operator-nightly - steps: - cluster_profile: aws - env: - OO_CHANNEL: nightly - OO_INSTALL_NAMESPACE: eclipse-che - OO_PACKAGE: eclipse-che-preview-openshift - OO_TARGET_NAMESPACES: '!install' - test: - - as: olm-tests - commands: | - export PATH=$PATH:/tmp/bin - mkdir -p /tmp/bin - curl https://mirror.openshift.com/pub/openshift-v4/clients/oc/4.5/linux/oc.tar.gz | tar xvzf - -C /tmp/bin/ oc - chmod ug+x /tmp/bin/oc - - echo -e "[INFO] Test script content:" - cat .ci/oci-nightly-olm.sh - - /bin/bash .ci/oci-nightly-olm.sh - dependencies: - - env: CI_CHE_OPERATOR_IMAGE - name: che-operator-image - from: src - resources: - requests: - cpu: 100m - memory: 200Mi - workflow: optional-operators-ci-aws -zz_generated_metadata: - branch: master - org: eclipse - repo: che-operator - variant: v5 diff --git a/ci-operator/config/eclipse/che-operator/eclipse-che-operator-master__v6.yaml b/ci-operator/config/eclipse/che-operator/eclipse-che-operator-master__v6.yaml index fa70da46ceb9..3e0473702512 100644 --- a/ci-operator/config/eclipse/che-operator/eclipse-che-operator-master__v6.yaml +++ b/ci-operator/config/eclipse/che-operator/eclipse-che-operator-master__v6.yaml @@ -32,7 +32,7 @@ tag_specification: name: "4.6" namespace: ocp tests: -- as: che-operator-nightly +- as: che-operator-olm-nightly-deployment steps: cluster_profile: aws env: @@ -41,7 +41,7 @@ tests: OO_PACKAGE: eclipse-che-preview-openshift OO_TARGET_NAMESPACES: '!install' test: - - as: olm-tests + - as: olm-nightly-deployment commands: | export PATH=$PATH:/tmp/bin mkdir -p /tmp/bin @@ -61,6 +61,35 @@ tests: cpu: 100m memory: 200Mi workflow: optional-operators-ci-aws +- as: che-operator-single-host-nightly-deployment + steps: + cluster_profile: aws + env: + OO_CHANNEL: nightly + OO_INSTALL_NAMESPACE: eclipse-che + OO_PACKAGE: eclipse-che-preview-openshift + OO_TARGET_NAMESPACES: '!install' + test: + - as: single-host-deployment + commands: | + export PATH=$PATH:/tmp/bin + mkdir -p /tmp/bin + curl https://mirror.openshift.com/pub/openshift-v4/clients/oc/4.6/linux/oc.tar.gz | tar xvzf - -C /tmp/bin/ oc + chmod ug+x /tmp/bin/oc + + echo -e "[INFO] Test script content:" + cat .ci/oci-single-host.sh + + /bin/bash .ci/oci-single-host.sh + dependencies: + - env: CI_CHE_OPERATOR_IMAGE + name: che-operator-image + from: src + resources: + requests: + cpu: 100m + memory: 200Mi + workflow: optional-operators-ci-aws zz_generated_metadata: branch: master org: eclipse diff --git a/ci-operator/config/eclipse/che-operator/eclipse-che-operator-master__v7.yaml b/ci-operator/config/eclipse/che-operator/eclipse-che-operator-master__v7.yaml index eb9a2f285b44..091f4d21749a 100644 --- a/ci-operator/config/eclipse/che-operator/eclipse-che-operator-master__v7.yaml +++ b/ci-operator/config/eclipse/che-operator/eclipse-che-operator-master__v7.yaml @@ -32,7 +32,7 @@ tag_specification: name: "4.7" namespace: ocp tests: -- as: che-operator-nightly +- as: che-operator-olm-nightly-deployment steps: cluster_profile: aws env: @@ -41,7 +41,7 @@ tests: OO_PACKAGE: eclipse-che-preview-openshift OO_TARGET_NAMESPACES: '!install' test: - - as: olm-tests + - as: olm-nightly-deployment commands: | export PATH=$PATH:/tmp/bin mkdir -p /tmp/bin @@ -61,6 +61,35 @@ tests: cpu: 100m memory: 200Mi workflow: optional-operators-ci-aws +- as: che-operator-single-host-nightly-deployment + steps: + cluster_profile: aws + env: + OO_CHANNEL: nightly + OO_INSTALL_NAMESPACE: eclipse-che + OO_PACKAGE: eclipse-che-preview-openshift + OO_TARGET_NAMESPACES: '!install' + test: + - as: single-host-deployment + commands: | + export PATH=$PATH:/tmp/bin + mkdir -p /tmp/bin + curl https://mirror.openshift.com/pub/openshift-v4/clients/oc/4.6/linux/oc.tar.gz | tar xvzf - -C /tmp/bin/ oc + chmod ug+x /tmp/bin/oc + + echo -e "[INFO] Test script content:" + cat .ci/oci-single-host.sh + + /bin/bash .ci/oci-single-host.sh + dependencies: + - env: CI_CHE_OPERATOR_IMAGE + name: che-operator-image + from: src + resources: + requests: + cpu: 100m + memory: 200Mi + workflow: optional-operators-ci-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 fcc57cc7880e..98458a58e337 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 @@ -5,16 +5,16 @@ presubmits: branches: - master cluster: build01 - context: ci/prow/v5-che-operator-nightly + context: ci/prow/v6-che-operator-olm-nightly-deployment decorate: true decoration_config: skip_cloning: true labels: ci-operator.openshift.io/prowgen-controlled: "true" - ci-operator.openshift.io/variant: v5 + ci-operator.openshift.io/variant: v6 pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-eclipse-che-operator-master-v5-che-operator-nightly - rerun_command: /test v5-che-operator-nightly + name: pull-ci-eclipse-che-operator-master-v6-che-operator-olm-nightly-deployment + rerun_command: /test v6-che-operator-olm-nightly-deployment spec: containers: - args: @@ -22,9 +22,9 @@ presubmits: - --lease-server-password-file=/etc/boskos/password - --report-password-file=/etc/report/password.txt - --report-username=ci - - --secret-dir=/usr/local/che-operator-nightly-cluster-profile - - --target=che-operator-nightly - - --variant=v5 + - --secret-dir=/usr/local/che-operator-olm-nightly-deployment-cluster-profile + - --target=che-operator-olm-nightly-deployment + - --variant=v6 command: - ci-operator image: ci-operator:latest @@ -37,7 +37,7 @@ presubmits: - mountPath: /etc/boskos name: boskos readOnly: true - - mountPath: /usr/local/che-operator-nightly-cluster-profile + - mountPath: /usr/local/che-operator-olm-nightly-deployment-cluster-profile name: cluster-profile - mountPath: /etc/pull-secret name: pull-secret @@ -64,30 +64,32 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )v5-che-operator-nightly,?($|\s.*) + trigger: (?m)^/test( | .* )v6-che-operator-olm-nightly-deployment,?($|\s.*) - agent: kubernetes always_run: true branches: - master cluster: build01 - context: ci/prow/v5-ci-index + context: ci/prow/v6-che-operator-single-host-nightly-deployment decorate: true decoration_config: skip_cloning: true labels: ci-operator.openshift.io/prowgen-controlled: "true" - ci-operator.openshift.io/variant: v5 + ci-operator.openshift.io/variant: v6 pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-eclipse-che-operator-master-v5-ci-index - rerun_command: /test v5-ci-index + name: pull-ci-eclipse-che-operator-master-v6-che-operator-single-host-nightly-deployment + rerun_command: /test v6-che-operator-single-host-nightly-deployment 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 - - --target=ci-index - - --variant=v5 + - --secret-dir=/usr/local/che-operator-single-host-nightly-deployment-cluster-profile + - --target=che-operator-single-host-nightly-deployment + - --variant=v6 command: - ci-operator image: ci-operator:latest @@ -97,53 +99,11 @@ presubmits: requests: cpu: 10m volumeMounts: - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator + - mountPath: /etc/boskos + name: boskos readOnly: true - serviceAccountName: ci-operator - volumes: - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )v5-ci-index,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - master - cluster: build01 - 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: /usr/local/che-operator-single-host-nightly-deployment-cluster-profile + name: cluster-profile - mountPath: /etc/pull-secret name: pull-secret readOnly: true @@ -152,19 +112,30 @@ presubmits: 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 - name: pull-secret secret: secretName: registry-pull-credentials - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )v5-images,?($|\s.*) + trigger: (?m)^/test( | .* )v6-che-operator-single-host-nightly-deployment,?($|\s.*) - agent: kubernetes always_run: true branches: - master cluster: build01 - context: ci/prow/v6-che-operator-nightly + context: ci/prow/v6-ci-index decorate: true decoration_config: skip_cloning: true @@ -172,17 +143,15 @@ presubmits: ci-operator.openshift.io/prowgen-controlled: "true" ci-operator.openshift.io/variant: v6 pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-eclipse-che-operator-master-v6-che-operator-nightly - rerun_command: /test v6-che-operator-nightly + name: pull-ci-eclipse-che-operator-master-v6-ci-index + rerun_command: /test v6-ci-index 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-nightly-cluster-profile - - --target=che-operator-nightly + - --target=ci-index - --variant=v6 command: - ci-operator @@ -193,11 +162,6 @@ presubmits: requests: cpu: 10m volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /usr/local/che-operator-nightly-cluster-profile - name: cluster-profile - mountPath: /etc/pull-secret name: pull-secret readOnly: true @@ -206,30 +170,19 @@ presubmits: 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 - name: pull-secret secret: secretName: registry-pull-credentials - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )v6-che-operator-nightly,?($|\s.*) + trigger: (?m)^/test( | .* )v6-ci-index,?($|\s.*) - agent: kubernetes always_run: true branches: - master cluster: build01 - context: ci/prow/v6-ci-index + context: ci/prow/v6-images decorate: true decoration_config: skip_cloning: true @@ -237,15 +190,15 @@ presubmits: ci-operator.openshift.io/prowgen-controlled: "true" ci-operator.openshift.io/variant: v6 pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-eclipse-che-operator-master-v6-ci-index - rerun_command: /test v6-ci-index + name: pull-ci-eclipse-che-operator-master-v6-images + rerun_command: /test v6-images spec: containers: - args: - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - --report-password-file=/etc/report/password.txt - --report-username=ci - - --target=ci-index + - --target=[images] - --variant=v6 command: - ci-operator @@ -270,30 +223,32 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )v6-ci-index,?($|\s.*) + trigger: (?m)^/test( | .* )v6-images,?($|\s.*) - agent: kubernetes always_run: true branches: - master cluster: build01 - context: ci/prow/v6-images + context: ci/prow/v7-che-operator-olm-nightly-deployment decorate: true decoration_config: skip_cloning: true labels: ci-operator.openshift.io/prowgen-controlled: "true" - ci-operator.openshift.io/variant: v6 + ci-operator.openshift.io/variant: v7 pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-eclipse-che-operator-master-v6-images - rerun_command: /test v6-images + name: pull-ci-eclipse-che-operator-master-v7-che-operator-olm-nightly-deployment + rerun_command: /test v7-che-operator-olm-nightly-deployment 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 - - --target=[images] - - --variant=v6 + - --secret-dir=/usr/local/che-operator-olm-nightly-deployment-cluster-profile + - --target=che-operator-olm-nightly-deployment + - --variant=v7 command: - ci-operator image: ci-operator:latest @@ -303,6 +258,11 @@ presubmits: requests: cpu: 10m volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /usr/local/che-operator-olm-nightly-deployment-cluster-profile + name: cluster-profile - mountPath: /etc/pull-secret name: pull-secret readOnly: true @@ -311,19 +271,30 @@ presubmits: 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 - name: pull-secret secret: secretName: registry-pull-credentials - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )v6-images,?($|\s.*) + trigger: (?m)^/test( | .* )v7-che-operator-olm-nightly-deployment,?($|\s.*) - agent: kubernetes always_run: true branches: - master cluster: build01 - context: ci/prow/v7-che-operator-nightly + context: ci/prow/v7-che-operator-single-host-nightly-deployment decorate: true decoration_config: skip_cloning: true @@ -331,8 +302,8 @@ presubmits: ci-operator.openshift.io/prowgen-controlled: "true" ci-operator.openshift.io/variant: v7 pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-eclipse-che-operator-master-v7-che-operator-nightly - rerun_command: /test v7-che-operator-nightly + name: pull-ci-eclipse-che-operator-master-v7-che-operator-single-host-nightly-deployment + rerun_command: /test v7-che-operator-single-host-nightly-deployment spec: containers: - args: @@ -340,8 +311,8 @@ presubmits: - --lease-server-password-file=/etc/boskos/password - --report-password-file=/etc/report/password.txt - --report-username=ci - - --secret-dir=/usr/local/che-operator-nightly-cluster-profile - - --target=che-operator-nightly + - --secret-dir=/usr/local/che-operator-single-host-nightly-deployment-cluster-profile + - --target=che-operator-single-host-nightly-deployment - --variant=v7 command: - ci-operator @@ -355,7 +326,7 @@ presubmits: - mountPath: /etc/boskos name: boskos readOnly: true - - mountPath: /usr/local/che-operator-nightly-cluster-profile + - mountPath: /usr/local/che-operator-single-host-nightly-deployment-cluster-profile name: cluster-profile - mountPath: /etc/pull-secret name: pull-secret @@ -382,7 +353,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )v7-che-operator-nightly,?($|\s.*) + trigger: (?m)^/test( | .* )v7-che-operator-single-host-nightly-deployment,?($|\s.*) - agent: kubernetes always_run: true branches: