Merge pull request #11167 from openshift-bot/auto-config-brancher

Automate config brancher by auto-config-brancher job at Mon, 24 Aug 2020 07:02:43 UTC
openshift · Aug 24, 2020 · 26b5eba · 26b5eba
2 parents d7faf04 + 5aa75da
commit 26b5eba
Show file tree

Hide file tree

Showing 16 changed files with 828 additions and 591 deletions.
diff --git a/...luster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-master.yaml b/...luster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-master.yaml
@@ -55,6 +55,11 @@ tests:
     make test-unit JUNITFILE=/tmp/artifacts/junit_report.xml --warn-undefined-variables
   container:
     from: test-bin
+- artifact_dir: /tmp/artifacts
+  as: k8s-e2e-gcp
+  steps:
+    cluster_profile: gcp
+    workflow: openshift-kubernetes-e2e-gcp
 - as: e2e-aws
   steps:
     cluster_profile: aws

diff --git a/...r-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-release-4.6.yaml b/...r-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-release-4.6.yaml
@@ -56,6 +56,11 @@ tests:
     make test-unit JUNITFILE=/tmp/artifacts/junit_report.xml --warn-undefined-variables
   container:
     from: test-bin
+- artifact_dir: /tmp/artifacts
+  as: k8s-e2e-gcp
+  steps:
+    cluster_profile: gcp
+    workflow: openshift-kubernetes-e2e-gcp
 - as: e2e-aws
   steps:
     cluster_profile: aws

diff --git a/...r-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-release-4.7.yaml b/...r-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-release-4.7.yaml
@@ -55,6 +55,11 @@ tests:
     make test-unit JUNITFILE=/tmp/artifacts/junit_report.xml --warn-undefined-variables
   container:
     from: test-bin
+- artifact_dir: /tmp/artifacts
+  as: k8s-e2e-gcp
+  steps:
+    cluster_profile: gcp
+    workflow: openshift-kubernetes-e2e-gcp
 - as: e2e-aws
   steps:
     cluster_profile: aws

diff --git a/ci-operator/config/openshift-priv/kubernetes/openshift-priv-kubernetes-master.yaml b/ci-operator/config/openshift-priv/kubernetes/openshift-priv-kubernetes-master.yaml
@@ -132,10 +132,6 @@ resources:
     requests:
       cpu: "4"
       memory: 8Gi
-  e2e-conformance-k8s:
-    requests:
-      cpu: "1"
-      memory: 300Mi
   hyperkube:
     requests:
       cpu: "3"
@@ -148,6 +144,10 @@ resources:
     requests:
       cpu: "6"
       memory: 14Gi
+  k8s-e2e-conformance-aws:
+    requests:
+      cpu: "1"
+      memory: 300Mi
   rpms:
     requests:
       cpu: "4"
@@ -197,7 +197,7 @@ tests:
     memory_backed_volume:
       size: 4Gi
 - artifact_dir: /tmp/artifacts
-  as: gcp-e2e-kubernetes
+  as: k8s-e2e-gcp
   steps:
     cluster_profile: gcp
     workflow: openshift-kubernetes-e2e-gcp
@@ -246,7 +246,7 @@ tests:
   commands: TEST_SUITE=openshift/conformance/parallel run-tests
   openshift_installer_upi:
     cluster_profile: vsphere
-- as: e2e-conformance-k8s
+- as: k8s-e2e-conformance-aws
   commands: openshift-hack/conformance-k8s.sh
   openshift_installer_src:
     cluster_profile: aws

diff --git a/ci-operator/config/openshift-priv/kubernetes/openshift-priv-kubernetes-release-4.6.yaml b/ci-operator/config/openshift-priv/kubernetes/openshift-priv-kubernetes-release-4.6.yaml
@@ -133,10 +133,6 @@ resources:
     requests:
       cpu: "4"
       memory: 8Gi
-  e2e-conformance-k8s:
-    requests:
-      cpu: "1"
-      memory: 300Mi
   hyperkube:
     requests:
       cpu: "3"
@@ -149,6 +145,10 @@ resources:
     requests:
       cpu: "6"
       memory: 14Gi
+  k8s-e2e-conformance-aws:
+    requests:
+      cpu: "1"
+      memory: 300Mi
   rpms:
     requests:
       cpu: "4"
@@ -198,7 +198,7 @@ tests:
     memory_backed_volume:
       size: 4Gi
 - artifact_dir: /tmp/artifacts
-  as: gcp-e2e-kubernetes
+  as: k8s-e2e-gcp
   steps:
     cluster_profile: gcp
     workflow: openshift-kubernetes-e2e-gcp
@@ -247,7 +247,7 @@ tests:
   commands: TEST_SUITE=openshift/conformance/parallel run-tests
   openshift_installer_upi:
     cluster_profile: vsphere
-- as: e2e-conformance-k8s
+- as: k8s-e2e-conformance-aws
   commands: openshift-hack/conformance-k8s.sh
   openshift_installer_src:
     cluster_profile: aws

diff --git a/ci-operator/config/openshift-priv/kubernetes/openshift-priv-kubernetes-release-4.7.yaml b/ci-operator/config/openshift-priv/kubernetes/openshift-priv-kubernetes-release-4.7.yaml
@@ -132,10 +132,6 @@ resources:
     requests:
       cpu: "4"
       memory: 8Gi
-  e2e-conformance-k8s:
-    requests:
-      cpu: "1"
-      memory: 300Mi
   hyperkube:
     requests:
       cpu: "3"
@@ -148,6 +144,10 @@ resources:
     requests:
       cpu: "6"
       memory: 14Gi
+  k8s-e2e-conformance-aws:
+    requests:
+      cpu: "1"
+      memory: 300Mi
   rpms:
     requests:
       cpu: "4"
@@ -197,7 +197,7 @@ tests:
     memory_backed_volume:
       size: 4Gi
 - artifact_dir: /tmp/artifacts
-  as: gcp-e2e-kubernetes
+  as: k8s-e2e-gcp
   steps:
     cluster_profile: gcp
     workflow: openshift-kubernetes-e2e-gcp
@@ -246,7 +246,7 @@ tests:
   commands: TEST_SUITE=openshift/conformance/parallel run-tests
   openshift_installer_upi:
     cluster_profile: vsphere
-- as: e2e-conformance-k8s
+- as: k8s-e2e-conformance-aws
   commands: openshift-hack/conformance-k8s.sh
   openshift_installer_src:
     cluster_profile: aws

diff --git a/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.6.yaml b/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.6.yaml
@@ -133,10 +133,6 @@ resources:
     requests:
       cpu: "4"
       memory: 8Gi
-  e2e-conformance-k8s:
-    requests:
-      cpu: "1"
-      memory: 300Mi
   hyperkube:
     requests:
       cpu: "3"
@@ -149,6 +145,10 @@ resources:
     requests:
       cpu: "6"
       memory: 14Gi
+  k8s-e2e-conformance-aws:
+    requests:
+      cpu: "1"
+      memory: 300Mi
   rpms:
     requests:
       cpu: "4"
@@ -198,7 +198,7 @@ tests:
     memory_backed_volume:
       size: 4Gi
 - artifact_dir: /tmp/artifacts
-  as: gcp-e2e-kubernetes
+  as: k8s-e2e-gcp
   steps:
     cluster_profile: gcp
     workflow: openshift-kubernetes-e2e-gcp
@@ -247,7 +247,7 @@ tests:
   commands: TEST_SUITE=openshift/conformance/parallel run-tests
   openshift_installer_upi:
     cluster_profile: vsphere
-- as: e2e-conformance-k8s
+- as: k8s-e2e-conformance-aws
   commands: openshift-hack/conformance-k8s.sh
   openshift_installer_src:
     cluster_profile: aws

diff --git a/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.7.yaml b/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.7.yaml
@@ -132,10 +132,6 @@ resources:
     requests:
       cpu: "4"
       memory: 8Gi
-  e2e-conformance-k8s:
-    requests:
-      cpu: "1"
-      memory: 300Mi
   hyperkube:
     requests:
       cpu: "3"
@@ -148,6 +144,10 @@ resources:
     requests:
       cpu: "6"
       memory: 14Gi
+  k8s-e2e-conformance-aws:
+    requests:
+      cpu: "1"
+      memory: 300Mi
   rpms:
     requests:
       cpu: "4"
@@ -197,7 +197,7 @@ tests:
     memory_backed_volume:
       size: 4Gi
 - artifact_dir: /tmp/artifacts
-  as: gcp-e2e-kubernetes
+  as: k8s-e2e-gcp
   steps:
     cluster_profile: gcp
     workflow: openshift-kubernetes-e2e-gcp
@@ -246,7 +246,7 @@ tests:
   commands: TEST_SUITE=openshift/conformance/parallel run-tests
   openshift_installer_upi:
     cluster_profile: vsphere
-- as: e2e-conformance-k8s
+- as: k8s-e2e-conformance-aws
   commands: openshift-hack/conformance-k8s.sh
   openshift_installer_src:
     cluster_profile: aws

diff --git a/...-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-master-presubmits.yaml b/...-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-master-presubmits.yaml
@@ -531,6 +531,80 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )images,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - master
+    cluster: api.ci
+    context: ci/prow/k8s-e2e-gcp
+    decorate: true
+    decoration_config:
+      skip_cloning: true
+    hidden: true
+    labels:
+      ci-operator.openshift.io/prowgen-controlled: "true"
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-cluster-kube-apiserver-operator-master-k8s-e2e-gcp
+    path_alias: github.com/openshift/cluster-kube-apiserver-operator
+    rerun_command: /test k8s-e2e-gcp
+    spec:
+      containers:
+      - args:
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --lease-server-password-file=/etc/boskos/password
+        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --report-password-file=/etc/report/password.txt
+        - --report-username=ci
+        - --secret-dir=/usr/local/k8s-e2e-gcp-cluster-profile
+        - --target=k8s-e2e-gcp
+        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/k8s-e2e-gcp-cluster-profile
+          name: cluster-profile
+        - mountPath: /usr/local/github-credentials
+          name: github-credentials-openshift-ci-robot-private-git-cloner
+          readOnly: true
+        - 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-gcp
+          - configMap:
+              name: cluster-profile-gcp
+      - name: github-credentials-openshift-ci-robot-private-git-cloner
+        secret:
+          secretName: github-credentials-openshift-ci-robot-private-git-cloner
+      - name: pull-secret
+        secret:
+          secretName: regcred
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )k8s-e2e-gcp,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:

diff --git a/...erver-operator/openshift-priv-cluster-kube-apiserver-operator-release-4.6-presubmits.yaml b/...erver-operator/openshift-priv-cluster-kube-apiserver-operator-release-4.6-presubmits.yaml
@@ -531,6 +531,80 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )images,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - release-4.6
+    cluster: api.ci
+    context: ci/prow/k8s-e2e-gcp
+    decorate: true
+    decoration_config:
+      skip_cloning: true
+    hidden: true
+    labels:
+      ci-operator.openshift.io/prowgen-controlled: "true"
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-cluster-kube-apiserver-operator-release-4.6-k8s-e2e-gcp
+    path_alias: github.com/openshift/cluster-kube-apiserver-operator
+    rerun_command: /test k8s-e2e-gcp
+    spec:
+      containers:
+      - args:
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --lease-server-password-file=/etc/boskos/password
+        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --report-password-file=/etc/report/password.txt
+        - --report-username=ci
+        - --secret-dir=/usr/local/k8s-e2e-gcp-cluster-profile
+        - --target=k8s-e2e-gcp
+        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/k8s-e2e-gcp-cluster-profile
+          name: cluster-profile
+        - mountPath: /usr/local/github-credentials
+          name: github-credentials-openshift-ci-robot-private-git-cloner
+          readOnly: true
+        - 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-gcp
+          - configMap:
+              name: cluster-profile-gcp
+      - name: github-credentials-openshift-ci-robot-private-git-cloner
+        secret:
+          secretName: github-credentials-openshift-ci-robot-private-git-cloner
+      - name: pull-secret
+        secret:
+          secretName: regcred
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )k8s-e2e-gcp,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches: