ROX-17751: Add GKE target for sensor-integration tests (openshift#40290)

* X-Smart-Branch-Parent: master * Add gke sensor integration tests * Run ocp-sensor-integration tests less * Remove skip_if_only_changed from gke-sensor-integration-tests * Address review comments integr8ly#1
maksymvavilov · Jun 14, 2023 · 1ed40f0 · 1ed40f0
1 parent 347cea8
commit 1ed40f0
Show file tree

Hide file tree

Showing 8 changed files with 284 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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: