diff --git a/ci-operator/config/stackrox/stackrox/stackrox-stackrox-master.yaml b/ci-operator/config/stackrox/stackrox/stackrox-stackrox-master.yaml index 8fc699c4c5df1..07b803818093e 100644 --- a/ci-operator/config/stackrox/stackrox/stackrox-stackrox-master.yaml +++ b/ci-operator/config/stackrox/stackrox/stackrox-stackrox-master.yaml @@ -61,6 +61,11 @@ tests: steps: test: - ref: stackrox-e2e +- as: gke-sensor-integration-tests + optional: true + steps: + test: + - ref: stackrox-e2e - as: gke-operator-e2e-tests optional: true steps: @@ -140,6 +145,11 @@ tests: steps: test: - ref: stackrox-e2e +- as: merge-gke-sensor-integration-tests + postsubmit: true + steps: + test: + - ref: stackrox-e2e - as: merge-gke-upgrade-tests postsubmit: true steps: diff --git a/ci-operator/config/stackrox/stackrox/stackrox-stackrox-nightlies.yaml b/ci-operator/config/stackrox/stackrox/stackrox-stackrox-nightlies.yaml index 6e7166b5233e8..d5ab11746b178 100644 --- a/ci-operator/config/stackrox/stackrox/stackrox-stackrox-nightlies.yaml +++ b/ci-operator/config/stackrox/stackrox/stackrox-stackrox-nightlies.yaml @@ -93,6 +93,11 @@ tests: steps: test: - ref: stackrox-e2e +- as: gke-sensor-integration-tests + postsubmit: true + steps: + test: + - ref: stackrox-e2e - as: gke-oldest-nongroovy-e2e-tests postsubmit: true steps: diff --git a/ci-operator/config/stackrox/stackrox/stackrox-stackrox-release-x.y.yaml b/ci-operator/config/stackrox/stackrox/stackrox-stackrox-release-x.y.yaml index ba4c49cc2e622..be9fcf9e3e765 100644 --- a/ci-operator/config/stackrox/stackrox/stackrox-stackrox-release-x.y.yaml +++ b/ci-operator/config/stackrox/stackrox/stackrox-stackrox-release-x.y.yaml @@ -56,6 +56,11 @@ tests: steps: test: - ref: stackrox-e2e +- as: gke-sensor-integration-tests + optional: true + steps: + test: + - ref: stackrox-e2e - as: gke-upgrade-tests optional: true steps: @@ -115,6 +120,11 @@ tests: steps: test: - ref: stackrox-e2e +- as: merge-gke-sensor-integration-tests + postsubmit: true + steps: + test: + - ref: stackrox-e2e - as: merge-gke-kernel-qa-e2e-tests postsubmit: true steps: diff --git a/ci-operator/jobs/stackrox/stackrox/stackrox-stackrox-master-postsubmits.yaml b/ci-operator/jobs/stackrox/stackrox/stackrox-stackrox-master-postsubmits.yaml index 6a167bbbbe458..97ca32ab0767d 100644 --- a/ci-operator/jobs/stackrox/stackrox/stackrox-stackrox-master-postsubmits.yaml +++ b/ci-operator/jobs/stackrox/stackrox/stackrox-stackrox-master-postsubmits.yaml @@ -105,6 +105,58 @@ postsubmits: - name: result-aggregator secret: secretName: result-aggregator + - agent: kubernetes + always_run: true + branches: + - ^master$ + cluster: build01 + decorate: true + decoration_config: + skip_cloning: true + labels: + ci.openshift.io/generator: prowgen + max_concurrency: 1 + name: branch-ci-stackrox-stackrox-master-merge-gke-sensor-integration-tests + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=merge-gke-sensor-integration-tests + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator - agent: kubernetes always_run: true branches: diff --git a/ci-operator/jobs/stackrox/stackrox/stackrox-stackrox-master-presubmits.yaml b/ci-operator/jobs/stackrox/stackrox/stackrox-stackrox-master-presubmits.yaml index d022d16ee5e26..da2bf18c3fad6 100644 --- a/ci-operator/jobs/stackrox/stackrox/stackrox-stackrox-master-presubmits.yaml +++ b/ci-operator/jobs/stackrox/stackrox/stackrox-stackrox-master-presubmits.yaml @@ -463,6 +463,64 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )gke-scale-tests,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^master$ + - ^master- + cluster: build02 + context: ci/prow/gke-sensor-integration-tests + decorate: true + decoration_config: + skip_cloning: true + labels: + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-stackrox-stackrox-master-gke-sensor-integration-tests + optional: true + rerun_command: /test gke-sensor-integration-tests + skip_if_only_changed: ^ui/ + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=gke-sensor-integration-tests + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )gke-sensor-integration-tests,?($|\s.*) - agent: kubernetes always_run: false branches: @@ -797,7 +855,7 @@ presubmits: secretName: result-aggregator trigger: (?m)^/test( | .* )ocp-4-10-qa-e2e-tests,?($|\s.*) - agent: kubernetes - always_run: true + always_run: false branches: - ^master$ - ^master- @@ -816,6 +874,7 @@ presubmits: name: pull-ci-stackrox-stackrox-master-ocp-4-10-sensor-integration-tests optional: true rerun_command: /test ocp-4-10-sensor-integration-tests + run_if_changed: ^((generated|sensor|image|operator|pkg|make|deploy|scripts)/.*|Makefile|status\.sh|COLLECTOR_VERSION|EXPECTED_GO_VERSION) spec: containers: - args: @@ -1285,7 +1344,7 @@ presubmits: secretName: result-aggregator trigger: (?m)^/test( | .* )ocp-4-12-qa-e2e-tests,?($|\s.*) - agent: kubernetes - always_run: true + always_run: false branches: - ^master$ - ^master- @@ -1304,6 +1363,7 @@ presubmits: name: pull-ci-stackrox-stackrox-master-ocp-4-12-sensor-integration-tests optional: true rerun_command: /test ocp-4-12-sensor-integration-tests + run_if_changed: ^((generated|sensor|image|operator|pkg|make|deploy|scripts)/.*|Makefile|status\.sh|COLLECTOR_VERSION|EXPECTED_GO_VERSION) spec: containers: - args: @@ -1604,7 +1664,7 @@ presubmits: secretName: result-aggregator trigger: (?m)^/test( | .* )ocp-4-13-qa-e2e-tests,?($|\s.*) - agent: kubernetes - always_run: true + always_run: false branches: - ^master$ - ^master- @@ -1623,6 +1683,7 @@ presubmits: name: pull-ci-stackrox-stackrox-master-ocp-4-13-sensor-integration-tests optional: true rerun_command: /test ocp-4-13-sensor-integration-tests + run_if_changed: ^((generated|sensor|image|operator|pkg|make|deploy|scripts)/.*|Makefile|status\.sh|COLLECTOR_VERSION|EXPECTED_GO_VERSION) spec: containers: - args: diff --git a/ci-operator/jobs/stackrox/stackrox/stackrox-stackrox-nightlies-postsubmits.yaml b/ci-operator/jobs/stackrox/stackrox/stackrox-stackrox-nightlies-postsubmits.yaml index bd43b0146df44..25c08385b7a41 100644 --- a/ci-operator/jobs/stackrox/stackrox/stackrox-stackrox-nightlies-postsubmits.yaml +++ b/ci-operator/jobs/stackrox/stackrox/stackrox-stackrox-nightlies-postsubmits.yaml @@ -596,6 +596,51 @@ postsubmits: - name: result-aggregator secret: secretName: result-aggregator + - agent: kubernetes + always_run: true + branches: + - ^nightlies$ + cluster: build01 + decorate: true + decoration_config: + skip_cloning: true + labels: + ci.openshift.io/generator: prowgen + max_concurrency: 1 + name: branch-ci-stackrox-stackrox-nightlies-gke-sensor-integration-tests + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --report-credentials-file=/etc/report/credentials + - --target=gke-sensor-integration-tests + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator - agent: kubernetes always_run: true branches: diff --git a/ci-operator/jobs/stackrox/stackrox/stackrox-stackrox-release-x.y-postsubmits.yaml b/ci-operator/jobs/stackrox/stackrox/stackrox-stackrox-release-x.y-postsubmits.yaml index c528c9f045685..96e1f6ac556e5 100644 --- a/ci-operator/jobs/stackrox/stackrox/stackrox-stackrox-release-x.y-postsubmits.yaml +++ b/ci-operator/jobs/stackrox/stackrox/stackrox-stackrox-release-x.y-postsubmits.yaml @@ -320,6 +320,51 @@ postsubmits: - name: result-aggregator secret: secretName: result-aggregator + - agent: kubernetes + always_run: true + branches: + - ^release-x\.y$ + cluster: build02 + decorate: true + decoration_config: + skip_cloning: true + labels: + ci.openshift.io/generator: prowgen + max_concurrency: 1 + name: branch-ci-stackrox-stackrox-release-x.y-merge-gke-sensor-integration-tests + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --report-credentials-file=/etc/report/credentials + - --target=merge-gke-sensor-integration-tests + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator - agent: kubernetes always_run: true branches: diff --git a/ci-operator/jobs/stackrox/stackrox/stackrox-stackrox-release-x.y-presubmits.yaml b/ci-operator/jobs/stackrox/stackrox/stackrox-stackrox-release-x.y-presubmits.yaml index d457e15dffd65..392a3c40f62eb 100644 --- a/ci-operator/jobs/stackrox/stackrox/stackrox-stackrox-release-x.y-presubmits.yaml +++ b/ci-operator/jobs/stackrox/stackrox/stackrox-stackrox-release-x.y-presubmits.yaml @@ -304,6 +304,56 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )gke-scale-tests,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - ^release-x\.y$ + - ^release-x\.y- + cluster: build02 + context: ci/prow/gke-sensor-integration-tests + decorate: true + decoration_config: + skip_cloning: true + labels: + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-stackrox-stackrox-release-x.y-gke-sensor-integration-tests + optional: true + rerun_command: /test gke-sensor-integration-tests + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --report-credentials-file=/etc/report/credentials + - --target=gke-sensor-integration-tests + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )gke-sensor-integration-tests,?($|\s.*) - agent: kubernetes always_run: true branches: @@ -613,7 +663,7 @@ presubmits: secretName: result-aggregator trigger: (?m)^/test( | .* )ocp-4-10-qa-e2e-tests,?($|\s.*) - agent: kubernetes - always_run: true + always_run: false branches: - ^release-x\.y$ - ^release-x\.y- @@ -1098,7 +1148,7 @@ presubmits: secretName: result-aggregator trigger: (?m)^/test( | .* )ocp-4-12-qa-e2e-tests,?($|\s.*) - agent: kubernetes - always_run: true + always_run: false branches: - ^release-x\.y$ - ^release-x\.y- @@ -1414,7 +1464,7 @@ presubmits: secretName: result-aggregator trigger: (?m)^/test( | .* )ocp-4-13-qa-e2e-tests,?($|\s.*) - agent: kubernetes - always_run: true + always_run: false branches: - ^release-x\.y$ - ^release-x\.y-