diff --git a/ci-operator/jobs/infra-periodics.yaml b/ci-operator/jobs/infra-periodics.yaml index 8718ec0d1533b..8e78020ddff08 100644 --- a/ci-operator/jobs/infra-periodics.yaml +++ b/ci-operator/jobs/infra-periodics.yaml @@ -1,11 +1,11 @@ periodics: -- name: periodic-retester - agent: kubernetes +- agent: kubernetes + cron: "" interval: 2h + name: periodic-retester spec: containers: - - image: docker-registry.default.svc:5000/ci/commenter:latest - args: + - args: - |- --query=is:pr state:open @@ -24,24 +24,26 @@ periodics: --comment=/retest Please review the [full test history](https://openshift-gce-devel.appspot.com/pr/{{.Number}}) for this PR and help us cut down flakes. - - --template - --ceiling=1 - --confirm + image: docker-registry.default.svc:5000/ci/commenter:latest + name: "" + resources: {} volumeMounts: - - name: token - mountPath: /etc/oauth + - mountPath: /etc/oauth + name: token volumes: - name: token secret: secretName: openshift-bot-token -- name: periodic-issue-close +- agent: kubernetes + cron: "" interval: 6h - agent: kubernetes + name: periodic-issue-close spec: containers: - - image: docker-registry.default.svc:5000/ci/commenter:latest - args: + - args: - |- --query=repo:openshift/origin -label:lifecycle/frozen @@ -59,20 +61,23 @@ periodics: - --template - --ceiling=10 - --confirm + image: docker-registry.default.svc:5000/ci/commenter:latest + name: "" + resources: {} volumeMounts: - - name: token - mountPath: /etc/oauth + - mountPath: /etc/oauth + name: token volumes: - name: token secret: secretName: openshift-bot-token -- name: periodic-issue-rotten +- agent: kubernetes + cron: "" interval: 6h - agent: kubernetes + name: periodic-issue-rotten spec: containers: - - image: docker-registry.default.svc:5000/ci/commenter:latest - args: + - args: - |- --query=repo:openshift/origin -label:lifecycle/frozen @@ -94,20 +99,23 @@ periodics: - --template - --ceiling=10 - --confirm + image: docker-registry.default.svc:5000/ci/commenter:latest + name: "" + resources: {} volumeMounts: - - name: token - mountPath: /etc/oauth + - mountPath: /etc/oauth + name: token volumes: - name: token secret: secretName: openshift-bot-token -- name: periodic-issue-stale +- agent: kubernetes + cron: "" interval: 6h - agent: kubernetes + name: periodic-issue-stale spec: containers: - - image: docker-registry.default.svc:5000/ci/commenter:latest - args: + - args: - |- --query=repo:openshift/origin -label:lifecycle/frozen @@ -128,35 +136,41 @@ periodics: - --template - --ceiling=10 - --confirm + image: docker-registry.default.svc:5000/ci/commenter:latest + name: "" + resources: {} volumeMounts: - - name: token - mountPath: /etc/oauth + - mountPath: /etc/oauth + name: token volumes: - name: token secret: secretName: openshift-bot-token -- name: periodic-label-sync +- agent: kubernetes + cron: "" interval: 24h - agent: kubernetes + name: periodic-label-sync spec: containers: - - image: gcr.io/k8s-testimages/label_sync:v20180227-377685119 - args: + - args: - --config=/etc/config/labels.yaml - --confirm=true - --orgs=openshift - --token=/etc/github/oauth + image: gcr.io/k8s-testimages/label_sync:v20180227-377685119 + name: "" + resources: {} volumeMounts: - - name: token - mountPath: /etc/github + - mountPath: /etc/github + name: token readOnly: true - - name: config - mountPath: /etc/config + - mountPath: /etc/config + name: config readOnly: true volumes: - name: token secret: secretName: repo-management-token - - name: config - configMap: - name: labels \ No newline at end of file + - configMap: + name: labels + name: config diff --git a/ci-operator/jobs/kubernetes-incubator/cri-o/kubernetes-incubator-cri-o-periodics.yaml b/ci-operator/jobs/kubernetes-incubator/cri-o/kubernetes-incubator-cri-o-periodics.yaml index 5133a7a12d4f8..3cf1c7009d911 100644 --- a/ci-operator/jobs/kubernetes-incubator/cri-o/kubernetes-incubator-cri-o-periodics.yaml +++ b/ci-operator/jobs/kubernetes-incubator/cri-o/kubernetes-incubator-cri-o-periodics.yaml @@ -1,11 +1,13 @@ periodics: -- name: ami_build_origin_int_fedora_crio - agent: jenkins +- agent: jenkins + cron: "" + interval: 24h labels: - master: ci.openshift.redhat.com + master: ci.openshift.redhat.com + name: ami_build_origin_int_fedora_crio +- agent: jenkins + cron: "" interval: 24h -- name: ami_build_origin_int_rhel_crio - agent: jenkins labels: - master: ci.openshift.redhat.com - interval: 24h \ No newline at end of file + master: ci.openshift.redhat.com + name: ami_build_origin_int_rhel_crio diff --git a/ci-operator/jobs/kubernetes-incubator/cri-o/kubernetes-incubator-cri-o-postsubmits.yaml b/ci-operator/jobs/kubernetes-incubator/cri-o/kubernetes-incubator-cri-o-postsubmits.yaml index 84a4645ce6265..03b56d9d3bd79 100644 --- a/ci-operator/jobs/kubernetes-incubator/cri-o/kubernetes-incubator-cri-o-postsubmits.yaml +++ b/ci-operator/jobs/kubernetes-incubator/cri-o/kubernetes-incubator-cri-o-postsubmits.yaml @@ -1,20 +1,20 @@ postsubmits: kubernetes-incubator/cri-o: - - name: test_branch_crio_e2e_rhel - agent: jenkins - labels: - master: ci.openshift.redhat.com + - agent: jenkins branches: - release-1.7 - release-1.8 - release-1.9 - master - - name: test_branch_crio_e2e_fedora - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_branch_crio_e2e_rhel + - agent: jenkins branches: - release-1.7 - release-1.8 - release-1.9 - - master \ No newline at end of file + - master + labels: + master: ci.openshift.redhat.com + name: test_branch_crio_e2e_fedora diff --git a/ci-operator/jobs/kubernetes-incubator/cri-o/kubernetes-incubator-cri-o-presubmits.yaml b/ci-operator/jobs/kubernetes-incubator/cri-o/kubernetes-incubator-cri-o-presubmits.yaml index 46c7affc89956..d842f6315a93d 100644 --- a/ci-operator/jobs/kubernetes-incubator/cri-o/kubernetes-incubator-cri-o-presubmits.yaml +++ b/ci-operator/jobs/kubernetes-incubator/cri-o/kubernetes-incubator-cri-o-presubmits.yaml @@ -1,82 +1,74 @@ presubmits: kubernetes-incubator/cri-o: - - name: test_pull_request_crio_integration_rhel - agent: jenkins - labels: - master: ci.openshift.redhat.com + - agent: jenkins always_run: false context: ci/openshift-jenkins/integration_rhel - rerun_command: "/test integration_rhel" - trigger: "((?m)^/test( all| rhel| integration| integration_rhel),?(\\s+|$))" - - - name: test_pull_request_crio_integration_fedora - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_pull_request_crio_integration_rhel + rerun_command: /test integration_rhel + trigger: ((?m)^/test( all| rhel| integration| integration_rhel),?(\s+|$)) + - agent: jenkins always_run: false context: ci/openshift-jenkins/integration_fedora - rerun_command: "/test integration_fedora" - trigger: "((?m)^/test( all| fedora| integration| integration_fedora),?(\\s+|$))" - - - name: test_pull_request_crio_e2e_rhel - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_pull_request_crio_integration_fedora + rerun_command: /test integration_fedora + trigger: ((?m)^/test( all| fedora| integration| integration_fedora),?(\s+|$)) + - agent: jenkins always_run: false context: ci/openshift-jenkins/e2e_rhel - rerun_command: "/test e2e_rhel" - trigger: "((?m)^/test( all| rhel| e2e| e2e_rhel),?(\\s+|$))" - - - name: test_pull_request_crio_e2e_fedora - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_pull_request_crio_e2e_rhel + rerun_command: /test e2e_rhel + trigger: ((?m)^/test( all| rhel| e2e| e2e_rhel),?(\s+|$)) + - agent: jenkins always_run: false context: ci/openshift-jenkins/e2e_fedora - rerun_command: "/test e2e_fedora" - trigger: "((?m)^/test( all| fedora| e2e| e2e_fedora),?(\\s+|$))" - - - name: test_pull_request_crio_critest_rhel - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_pull_request_crio_e2e_fedora + rerun_command: /test e2e_fedora + trigger: ((?m)^/test( all| fedora| e2e| e2e_fedora),?(\s+|$)) + - agent: jenkins always_run: false context: ci/openshift-jenkins/critest_rhel - rerun_command: "/test critest_rhel" - trigger: "((?m)^/test( all| rhel| critest| critest_rhel),?(\\s+|$))" - - - name: test_pull_request_crio_critest_fedora - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_pull_request_crio_critest_rhel + rerun_command: /test critest_rhel + trigger: ((?m)^/test( all| rhel| critest| critest_rhel),?(\s+|$)) + - agent: jenkins always_run: false context: ci/openshift-jenkins/critest_fedora - rerun_command: "/test critest_fedora" - trigger: "((?m)^/test( all| fedora| critest| critest_fedora),?(\\s+|$))" - - - name: test_pull_request_crio_ami_rhel - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_pull_request_crio_critest_fedora + rerun_command: /test critest_fedora + trigger: ((?m)^/test( all| fedora| critest| critest_fedora),?(\s+|$)) + - agent: jenkins always_run: false context: ci/openshift-jenkins/ami_rhel - rerun_command: "/test ami_rhel" - trigger: "((?m)^/test( ami| ami_rhel),?(\\s+|$))" - - - name: test_pull_request_crio_ami_fedora - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_pull_request_crio_ami_rhel + rerun_command: /test ami_rhel + trigger: ((?m)^/test( ami| ami_rhel),?(\s+|$)) + - agent: jenkins always_run: false context: ci/openshift-jenkins/ami_fedora - rerun_command: "/test ami_fedora" - trigger: "((?m)^/test( ami| ami_fedora),?(\\s+|$))" - - - name: kata-containers-crio-PR - agent: jenkins labels: - master: jenkins.katacontainers.io + master: ci.openshift.redhat.com + name: test_pull_request_crio_ami_fedora + rerun_command: /test ami_fedora + trigger: ((?m)^/test( ami| ami_fedora),?(\s+|$)) + - agent: jenkins always_run: false context: ci/kata-jenkins - rerun_command: "/test kata-containers" - trigger: "((?m)^/test( all| kata-containers),?(\\s+|$))" \ No newline at end of file + labels: + master: jenkins.katacontainers.io + name: kata-containers-crio-PR + rerun_command: /test kata-containers + trigger: ((?m)^/test( all| kata-containers),?(\s+|$)) diff --git a/ci-operator/jobs/kubernetes-incubator/descheduler/kubernetes-incubator-descheduler-presubmits.yaml b/ci-operator/jobs/kubernetes-incubator/descheduler/kubernetes-incubator-descheduler-presubmits.yaml index 406464360e230..a9b8e46acd8c1 100644 --- a/ci-operator/jobs/kubernetes-incubator/descheduler/kubernetes-incubator-descheduler-presubmits.yaml +++ b/ci-operator/jobs/kubernetes-incubator/descheduler/kubernetes-incubator-descheduler-presubmits.yaml @@ -1,10 +1,10 @@ presubmits: kubernetes-incubator/descheduler: - - name: ci-kubernetes-descheduler-e2e-gce - agent: jenkins - labels: - master: ci.openshift.redhat.com + - agent: jenkins always_run: true context: ci/openshift-jenkins - rerun_command: "/test e2e" - trigger: "((?m)^/test( all| e2e),?(\\s+|$))" \ No newline at end of file + labels: + master: ci.openshift.redhat.com + name: ci-kubernetes-descheduler-e2e-gce + rerun_command: /test e2e + trigger: ((?m)^/test( all| e2e),?(\s+|$)) diff --git a/ci-operator/jobs/openshift-s2i/s2i-wildfly/openshift-s2i-s2i-wildfly-postsubmits.yaml b/ci-operator/jobs/openshift-s2i/s2i-wildfly/openshift-s2i-s2i-wildfly-postsubmits.yaml index 00a77eda60613..d67f3f916b1ba 100644 --- a/ci-operator/jobs/openshift-s2i/s2i-wildfly/openshift-s2i-s2i-wildfly-postsubmits.yaml +++ b/ci-operator/jobs/openshift-s2i/s2i-wildfly/openshift-s2i-s2i-wildfly-postsubmits.yaml @@ -1,14 +1,14 @@ postsubmits: openshift-s2i/s2i-wildfly: - - name: push_wildfly_images - agent: jenkins + - agent: jenkins + branches: + - master labels: master: ci.openshift.redhat.com + name: push_wildfly_images + - agent: jenkins branches: - master - - name: test_branch_wildfly_images - agent: jenkins labels: master: ci.openshift.redhat.com - branches: - - master \ No newline at end of file + name: test_branch_wildfly_images diff --git a/ci-operator/jobs/openshift-s2i/s2i-wildfly/openshift-s2i-s2i-wildfly-presubmits.yaml b/ci-operator/jobs/openshift-s2i/s2i-wildfly/openshift-s2i-s2i-wildfly-presubmits.yaml index ca87b31c5d225..c1b454a3ec720 100644 --- a/ci-operator/jobs/openshift-s2i/s2i-wildfly/openshift-s2i-s2i-wildfly-presubmits.yaml +++ b/ci-operator/jobs/openshift-s2i/s2i-wildfly/openshift-s2i-s2i-wildfly-presubmits.yaml @@ -1,10 +1,10 @@ presubmits: openshift-s2i/s2i-wildfly: - - name: test_pull_request_wildfly_images - agent: jenkins - labels: - master: ci.openshift.redhat.com + - agent: jenkins always_run: true context: ci/openshift-jenkins - rerun_command: "/test" - trigger: "((?m)^/test,?(\\s+|$))" \ No newline at end of file + labels: + master: ci.openshift.redhat.com + name: test_pull_request_wildfly_images + rerun_command: /test + trigger: ((?m)^/test,?(\s+|$)) diff --git a/ci-operator/jobs/openshift/api/openshift-api-presubmits.yaml b/ci-operator/jobs/openshift/api/openshift-api-presubmits.yaml index d19bf836c7fb0..3a63c3a1e762c 100644 --- a/ci-operator/jobs/openshift/api/openshift-api-presubmits.yaml +++ b/ci-operator/jobs/openshift/api/openshift-api-presubmits.yaml @@ -1,29 +1,33 @@ presubmits: openshift/api: - - name: pull-ci-openshift-api-verify - agent: kubernetes - context: ci/prow/unit + - agent: kubernetes + always_run: true branches: - master - rerun_command: "/test verify" - always_run: true - trigger: "((?m)^/test( all| verify),?(\\s+|$))" + context: ci/prow/unit decorate: true + name: pull-ci-openshift-api-verify + rerun_command: /test verify skip_cloning: true spec: - serviceAccountName: ci-operator containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + - args: + - --artifact-dir=$(ARTIFACTS) + - --target=verify + command: + - ci-operator env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-api key: master.json - command: - - ci-operator - args: - - --artifact-dir=$(ARTIFACTS) - - --target=verify + name: ci-operator-openshift-api + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + serviceAccountName: ci-operator + trigger: ((?m)^/test( all| verify),?(\s+|$)) diff --git a/ci-operator/jobs/openshift/autoheal/openshift-autoheal-presubmits.yaml b/ci-operator/jobs/openshift/autoheal/openshift-autoheal-presubmits.yaml index a2f19a6731261..4f09aa2a7a8a9 100644 --- a/ci-operator/jobs/openshift/autoheal/openshift-autoheal-presubmits.yaml +++ b/ci-operator/jobs/openshift/autoheal/openshift-autoheal-presubmits.yaml @@ -1,15 +1,18 @@ presubmits: openshift/autoheal: - - name: pull-autoheal-check - agent: kubernetes + - agent: kubernetes + always_run: false context: pull-autoheal-check - rerun_command: "/test pull-autoheal-check" - trigger: "/test pull-autoheal-check" decorate: true + name: pull-autoheal-check + rerun_command: /test pull-autoheal-check spec: containers: - - image: registry.svc.ci.openshift.org/ci/origin-release:golang-1.9 + - args: + - check command: - make - args: - - check \ No newline at end of file + image: registry.svc.ci.openshift.org/ci/origin-release:golang-1.9 + name: "" + resources: {} + trigger: /test pull-autoheal-check diff --git a/ci-operator/jobs/openshift/azure-misc/openshift-azure-misc-postsubmits.yaml b/ci-operator/jobs/openshift/azure-misc/openshift-azure-misc-postsubmits.yaml index c26c1445e6dfa..dbdc4f0f01c44 100644 --- a/ci-operator/jobs/openshift/azure-misc/openshift-azure-misc-postsubmits.yaml +++ b/ci-operator/jobs/openshift/azure-misc/openshift-azure-misc-postsubmits.yaml @@ -1,27 +1,31 @@ postsubmits: openshift/azure-misc: - - name: branch-ci-openshift-azure-misc-images - agent: kubernetes - labels: - artifacts: images + - agent: kubernetes branches: - master decorate: true + labels: + artifacts: images + name: branch-ci-openshift-azure-misc-images skip_cloning: true spec: - serviceAccountName: ci-operator containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + - args: + - --target=[images] + - --promote + command: + - ci-operator env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-azure-misc key: master.json - command: - - ci-operator - args: - - --target=[images] - - --promote \ No newline at end of file + name: ci-operator-openshift-azure-misc + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + serviceAccountName: ci-operator diff --git a/ci-operator/jobs/openshift/azure-misc/openshift-azure-misc-presubmits.yaml b/ci-operator/jobs/openshift/azure-misc/openshift-azure-misc-presubmits.yaml index 6b53dd1917285..b969183550657 100644 --- a/ci-operator/jobs/openshift/azure-misc/openshift-azure-misc-presubmits.yaml +++ b/ci-operator/jobs/openshift/azure-misc/openshift-azure-misc-presubmits.yaml @@ -1,30 +1,34 @@ presubmits: openshift/azure-misc: - - name: pull-ci-openshift-azure-misc - agent: kubernetes - labels: - artifacts: images - context: ci/prow/build + - agent: kubernetes + always_run: true branches: - master - rerun_command: "/test build" - always_run: true - trigger: "((?m)^/test( all| build),?(\\s+|$))" + context: ci/prow/build decorate: true + labels: + artifacts: images + name: pull-ci-openshift-azure-misc + rerun_command: /test build skip_cloning: true spec: - serviceAccountName: ci-operator containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + - args: + - --target=[images] + command: + - ci-operator env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-azure-misc key: master.json - command: - - ci-operator - args: - - --target=[images] \ No newline at end of file + name: ci-operator-openshift-azure-misc + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + serviceAccountName: ci-operator + trigger: ((?m)^/test( all| build),?(\s+|$)) diff --git a/ci-operator/jobs/openshift/ci-ns-ttl-controller/openshift-ci-ns-ttl-controller-presubmits.yaml b/ci-operator/jobs/openshift/ci-ns-ttl-controller/openshift-ci-ns-ttl-controller-presubmits.yaml index 1b6e1eaa8200c..111798711ed71 100644 --- a/ci-operator/jobs/openshift/ci-ns-ttl-controller/openshift-ci-ns-ttl-controller-presubmits.yaml +++ b/ci-operator/jobs/openshift/ci-ns-ttl-controller/openshift-ci-ns-ttl-controller-presubmits.yaml @@ -1,47 +1,50 @@ presubmits: openshift/ci-ns-ttl-controller: - - name: pull-ci-ns-ttl-controller-build - agent: kubernetes - context: ci/prow/build - rerun_command: "/test build" + - agent: kubernetes always_run: true - trigger: "((?m)^/test( all| build),?(\\s+|$))" + context: ci/prow/build decorate: true + name: pull-ci-ns-ttl-controller-build + rerun_command: /test build spec: containers: - - name: test - image: registry.svc.ci.openshift.org/openshift/release:golang-1.10 + - args: + - build command: - make - args: - - build - - name: pull-ci-ns-ttl-controller-unit - agent: kubernetes - context: ci/prow/unit - rerun_command: "/test unit" + image: registry.svc.ci.openshift.org/openshift/release:golang-1.10 + name: test + resources: {} + trigger: ((?m)^/test( all| build),?(\s+|$)) + - agent: kubernetes always_run: true - trigger: "((?m)^/test( all| unit),?(\\s+|$))" + context: ci/prow/unit decorate: true + name: pull-ci-ns-ttl-controller-unit + rerun_command: /test unit spec: containers: - - name: test - image: registry.svc.ci.openshift.org/openshift/release:golang-1.10 + - args: + - test command: - make - args: - - test - - name: pull-ci-ns-ttl-controller-lint - agent: kubernetes - context: ci/prow/lint - rerun_command: "/test lint" + image: registry.svc.ci.openshift.org/openshift/release:golang-1.10 + name: test + resources: {} + trigger: ((?m)^/test( all| unit),?(\s+|$)) + - agent: kubernetes always_run: true - trigger: "((?m)^/test( all| lint),?(\\s+|$))" + context: ci/prow/lint decorate: true + name: pull-ci-ns-ttl-controller-lint + rerun_command: /test lint spec: containers: - - name: test - image: registry.svc.ci.openshift.org/openshift/release:golang-1.10 + - args: + - test command: - make - args: - - test \ No newline at end of file + image: registry.svc.ci.openshift.org/openshift/release:golang-1.10 + name: test + resources: {} + trigger: ((?m)^/test( all| lint),?(\s+|$)) diff --git a/ci-operator/jobs/openshift/ci-operator-prowgen/openshift-ci-operator-prowgen-postsubmits.yaml b/ci-operator/jobs/openshift/ci-operator-prowgen/openshift-ci-operator-prowgen-postsubmits.yaml index 7e5eadc8b5adb..f57cb12360be1 100644 --- a/ci-operator/jobs/openshift/ci-operator-prowgen/openshift-ci-operator-prowgen-postsubmits.yaml +++ b/ci-operator/jobs/openshift/ci-operator-prowgen/openshift-ci-operator-prowgen-postsubmits.yaml @@ -19,7 +19,10 @@ postsubmits: key: master.json name: ci-operator-openshift-ci-operator-prowgen image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} name: "" - resources: {} - serviceAccountName: ci-operator \ No newline at end of file + resources: + limits: + cpu: 500m + requests: + cpu: 10m + serviceAccountName: ci-operator diff --git a/ci-operator/jobs/openshift/ci-operator-prowgen/openshift-ci-operator-prowgen-presubmits.yaml b/ci-operator/jobs/openshift/ci-operator-prowgen/openshift-ci-operator-prowgen-presubmits.yaml index aa0483ea8ed10..6b865cc918ea0 100644 --- a/ci-operator/jobs/openshift/ci-operator-prowgen/openshift-ci-operator-prowgen-presubmits.yaml +++ b/ci-operator/jobs/openshift/ci-operator-prowgen/openshift-ci-operator-prowgen-presubmits.yaml @@ -23,9 +23,12 @@ presubmits: key: master.json name: ci-operator-openshift-ci-operator-prowgen image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} name: "" - resources: {} + resources: + limits: + cpu: 500m + requests: + cpu: 10m serviceAccountName: ci-operator trigger: ((?m)^/test( all| unit),?(\\s+|$)) - agent: kubernetes @@ -51,9 +54,12 @@ presubmits: key: master.json name: ci-operator-openshift-ci-operator-prowgen image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} name: "" - resources: {} + resources: + limits: + cpu: 500m + requests: + cpu: 10m serviceAccountName: ci-operator trigger: ((?m)^/test( all| lint),?(\\s+|$)) - agent: kubernetes @@ -79,8 +85,11 @@ presubmits: key: master.json name: ci-operator-openshift-ci-operator-prowgen image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} name: "" - resources: {} + resources: + limits: + cpu: 500m + requests: + cpu: 10m serviceAccountName: ci-operator trigger: ((?m)^/test( all| images),?(\\s+|$)) diff --git a/ci-operator/jobs/openshift/ci-operator/openshift-ci-operator-postsubmits.yaml b/ci-operator/jobs/openshift/ci-operator/openshift-ci-operator-postsubmits.yaml index 78ad60e31e1a9..fb85675b05975 100644 --- a/ci-operator/jobs/openshift/ci-operator/openshift-ci-operator-postsubmits.yaml +++ b/ci-operator/jobs/openshift/ci-operator/openshift-ci-operator-postsubmits.yaml @@ -2,9 +2,6 @@ postsubmits: openshift/ci-operator: - agent: kubernetes decorate: true - labels: - # this job does not create a release artifact - # artifacts: images name: branch-ci-openshift-ci-operator-master-images skip_cloning: true spec: @@ -22,5 +19,10 @@ postsubmits: key: master.json name: ci-operator-openshift-ci-operator image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + name: "" + resources: + limits: + cpu: 500m + requests: + cpu: 10m serviceAccountName: ci-operator diff --git a/ci-operator/jobs/openshift/ci-operator/openshift-ci-operator-presubmits.yaml b/ci-operator/jobs/openshift/ci-operator/openshift-ci-operator-presubmits.yaml index 9cccb5caccb0b..201053ec11eef 100644 --- a/ci-operator/jobs/openshift/ci-operator/openshift-ci-operator-presubmits.yaml +++ b/ci-operator/jobs/openshift/ci-operator/openshift-ci-operator-presubmits.yaml @@ -23,7 +23,12 @@ presubmits: key: master.json name: ci-operator-openshift-ci-operator image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + name: "" + resources: + limits: + cpu: 500m + requests: + cpu: 10m serviceAccountName: ci-operator trigger: ((?m)^/test( all| unit),?(\\s+|$)) - agent: kubernetes @@ -49,7 +54,12 @@ presubmits: key: master.json name: ci-operator-openshift-ci-operator image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + name: "" + resources: + limits: + cpu: 500m + requests: + cpu: 10m serviceAccountName: ci-operator trigger: ((?m)^/test( all| lint),?(\\s+|$)) - agent: kubernetes @@ -75,6 +85,11 @@ presubmits: key: master.json name: ci-operator-openshift-ci-operator image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + name: "" + resources: + limits: + cpu: 500m + requests: + cpu: 10m serviceAccountName: ci-operator trigger: ((?m)^/test( all| images),?(\\s+|$)) diff --git a/ci-operator/jobs/openshift/ci-vm-operator/openshift-ci-vm-operator-presubmits.yaml b/ci-operator/jobs/openshift/ci-vm-operator/openshift-ci-vm-operator-presubmits.yaml index d870fc4267137..e95262e35f172 100644 --- a/ci-operator/jobs/openshift/ci-vm-operator/openshift-ci-vm-operator-presubmits.yaml +++ b/ci-operator/jobs/openshift/ci-vm-operator/openshift-ci-vm-operator-presubmits.yaml @@ -1,32 +1,34 @@ presubmits: openshift/ci-vm-operator: - - name: pull-ci-vm-operator-build - agent: kubernetes - context: ci/prow/build - rerun_command: "/test build" + - agent: kubernetes always_run: true - trigger: "((?m)^/test( all| build),?(\\s+|$))" + context: ci/prow/build decorate: true + name: pull-ci-vm-operator-build + rerun_command: /test build spec: containers: - - name: test - image: registry.svc.ci.openshift.org/openshift/release:golang-1.10 + - args: + - build command: - make - args: - - build - - name: pull-ci-vm-operator-unit - agent: kubernetes - context: ci/prow/unit - rerun_command: "/test unit" + image: registry.svc.ci.openshift.org/openshift/release:golang-1.10 + name: test + resources: {} + trigger: ((?m)^/test( all| build),?(\s+|$)) + - agent: kubernetes always_run: true - trigger: "((?m)^/test( all| unit),?(\\s+|$))" + context: ci/prow/unit decorate: true + name: pull-ci-vm-operator-unit + rerun_command: /test unit spec: containers: - - name: test - image: registry.svc.ci.openshift.org/openshift/release:golang-1.10 + - args: + - test command: - make - args: - - test \ No newline at end of file + image: registry.svc.ci.openshift.org/openshift/release:golang-1.10 + name: test + resources: {} + trigger: ((?m)^/test( all| unit),?(\s+|$)) diff --git a/ci-operator/jobs/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-postsubmits.yaml b/ci-operator/jobs/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-postsubmits.yaml index 614015bf08543..15d46fdd7e707 100644 --- a/ci-operator/jobs/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-postsubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-postsubmits.yaml @@ -1,28 +1,32 @@ postsubmits: openshift/cluster-api-provider-aws: - - name: branch-ci-openshift-cluster-api-provider-aws-images - agent: kubernetes - labels: - artifacts: images + - agent: kubernetes branches: - master decorate: true + labels: + artifacts: images + name: branch-ci-openshift-cluster-api-provider-aws-images skip_cloning: true spec: - serviceAccountName: ci-operator containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + - args: + - --artifact-dir=$(ARTIFACTS) + - --target=[images] + - --promote + command: + - ci-operator env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-cluster-api-provider-aws key: master.json - command: - - ci-operator - args: - - --artifact-dir=$(ARTIFACTS) - - --target=[images] - - --promote + name: ci-operator-openshift-cluster-api-provider-aws + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + serviceAccountName: ci-operator diff --git a/ci-operator/jobs/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-presubmits.yaml b/ci-operator/jobs/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-presubmits.yaml index ca70a4673c8a6..5605a89608c6a 100644 --- a/ci-operator/jobs/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-presubmits.yaml @@ -1,65 +1,72 @@ presubmits: openshift/cluster-api-provider-aws: - - name: pull-ci-origin-cluster-api-provider-aws-unit - agent: kubernetes - context: ci/prow/unit + - agent: kubernetes + always_run: true branches: - master - rerun_command: "/test unit" - always_run: true - trigger: "((?m)^/test( all| unit),?(\\s+|$))" + context: ci/prow/unit decorate: true + name: pull-ci-origin-cluster-api-provider-aws-unit + rerun_command: /test unit skip_cloning: true spec: - serviceAccountName: ci-operator containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + - args: + - --artifact-dir=$(ARTIFACTS) + - --target=unit + command: + - ci-operator env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-cluster-api-provider-aws key: master.json - command: - - ci-operator - args: - - --artifact-dir=$(ARTIFACTS) - - --target=unit - - - name: pull-ci-origin-cluster-api-provider-aws-images - agent: kubernetes - context: ci/prow/images + name: ci-operator-openshift-cluster-api-provider-aws + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + serviceAccountName: ci-operator + trigger: ((?m)^/test( all| unit),?(\s+|$)) + - agent: kubernetes + always_run: true branches: - master - rerun_command: "/test images" - always_run: true - trigger: "((?m)^/test( all| images),?(\\s+|$))" + context: ci/prow/images decorate: true + name: pull-ci-origin-cluster-api-provider-aws-images + rerun_command: /test images skip_cloning: true spec: - serviceAccountName: ci-operator containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + - args: + - --artifact-dir=$(ARTIFACTS) + - --target=[images] + command: + - ci-operator env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-cluster-api-provider-aws key: master.json - command: - - ci-operator - args: - - --artifact-dir=$(ARTIFACTS) - - --target=[images] - - - name: ci-kubernetes-aws-actuator - agent: jenkins - labels: - master: ci.openshift.redhat.com + name: ci-operator-openshift-cluster-api-provider-aws + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + serviceAccountName: ci-operator + trigger: ((?m)^/test( all| images),?(\s+|$)) + - agent: jenkins + always_run: false context: ci/jenkins/e2e - rerun_command: "/test e2e" - trigger: "((?m)^/test( all| e2e),?(\\s+|$))" + labels: + master: ci.openshift.redhat.com + name: ci-kubernetes-aws-actuator + rerun_command: /test e2e + trigger: ((?m)^/test( all| e2e),?(\s+|$)) diff --git a/ci-operator/jobs/openshift/cluster-capacity/openshift-cluster-capacity-postsubmits.yaml b/ci-operator/jobs/openshift/cluster-capacity/openshift-cluster-capacity-postsubmits.yaml index 8bc8ed204f608..ba0fb984c6c30 100644 --- a/ci-operator/jobs/openshift/cluster-capacity/openshift-cluster-capacity-postsubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-capacity/openshift-cluster-capacity-postsubmits.yaml @@ -1,54 +1,62 @@ postsubmits: openshift/cluster-capacity: - - name: branch-ci-kubernetes-cluster-capacity-images - agent: kubernetes - labels: - artifacts: images + - agent: kubernetes branches: - master decorate: true + labels: + artifacts: images + name: branch-ci-kubernetes-cluster-capacity-images skip_cloning: true spec: - serviceAccountName: ci-operator containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + - args: + - --artifact-dir=$(ARTIFACTS) + - --target=[images] + - --promote + command: + - ci-operator env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-kubernetes-cluster-capacity key: master.json - command: - - ci-operator - args: - - --artifact-dir=$(ARTIFACTS) - - --target=[images] - - --promote - - name: branch-ci-kubernetes-cluster-capacity-images-3.10 - agent: kubernetes - labels: - artifacts: images + name: ci-operator-kubernetes-cluster-capacity + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + serviceAccountName: ci-operator + - agent: kubernetes branches: - release-3.10 decorate: true + labels: + artifacts: images + name: branch-ci-kubernetes-cluster-capacity-images-3.10 skip_cloning: true spec: - serviceAccountName: ci-operator containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + - args: + - --artifact-dir=$(ARTIFACTS) + - --target=[images] + - --promote + command: + - ci-operator env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-kubernetes-cluster-capacity key: release-3.10.json - command: - - ci-operator - args: - - --artifact-dir=$(ARTIFACTS) - - --target=[images] - - --promote \ No newline at end of file + name: ci-operator-kubernetes-cluster-capacity + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + serviceAccountName: ci-operator diff --git a/ci-operator/jobs/openshift/cluster-capacity/openshift-cluster-capacity-presubmits.yaml b/ci-operator/jobs/openshift/cluster-capacity/openshift-cluster-capacity-presubmits.yaml index a1bd9b4662d33..54de69ff01d7e 100644 --- a/ci-operator/jobs/openshift/cluster-capacity/openshift-cluster-capacity-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-capacity/openshift-cluster-capacity-presubmits.yaml @@ -1,58 +1,66 @@ presubmits: openshift/cluster-capacity: - - name: pull-ci-kubernetes-cluster-capacity-unit - agent: kubernetes - context: ci/prow/unit + - agent: kubernetes + always_run: true branches: - master - rerun_command: "/test unit" - always_run: true - trigger: "((?m)^/test( all| unit),?(\\s+|$))" + context: ci/prow/unit decorate: true + name: pull-ci-kubernetes-cluster-capacity-unit + rerun_command: /test unit skip_cloning: true spec: - serviceAccountName: ci-operator containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + - args: + - --artifact-dir=$(ARTIFACTS) + - --target=unit + - --target=[images] + command: + - ci-operator env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-kubernetes-cluster-capacity key: master.json - command: - - ci-operator - args: - - --artifact-dir=$(ARTIFACTS) - - --target=unit - - --target=[images] - - name: pull-ci-kubernetes-cluster-capacity-unit-3.10 - agent: kubernetes - context: ci/prow/unit + name: ci-operator-kubernetes-cluster-capacity + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + serviceAccountName: ci-operator + trigger: ((?m)^/test( all| unit),?(\s+|$)) + - agent: kubernetes + always_run: true branches: - release-3.10 - rerun_command: "/test unit" - always_run: true - trigger: "((?m)^/test( all| unit),?(\\s+|$))" + context: ci/prow/unit decorate: true + name: pull-ci-kubernetes-cluster-capacity-unit-3.10 + rerun_command: /test unit skip_cloning: true spec: - serviceAccountName: ci-operator containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + - args: + - --artifact-dir=$(ARTIFACTS) + - --target=unit + - --target=[images] + command: + - ci-operator env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-kubernetes-cluster-capacity key: release-3.10.json - command: - - ci-operator - args: - - --artifact-dir=$(ARTIFACTS) - - --target=unit - - --target=[images] \ No newline at end of file + name: ci-operator-kubernetes-cluster-capacity + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + serviceAccountName: ci-operator + trigger: ((?m)^/test( all| unit),?(\s+|$)) diff --git a/ci-operator/jobs/openshift/cluster-dns-operator/openshift-cluster-dns-operator-postsubmits.yaml b/ci-operator/jobs/openshift/cluster-dns-operator/openshift-cluster-dns-operator-postsubmits.yaml index 9334c5d79df09..63a00b9f14832 100644 --- a/ci-operator/jobs/openshift/cluster-dns-operator/openshift-cluster-dns-operator-postsubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-dns-operator/openshift-cluster-dns-operator-postsubmits.yaml @@ -18,9 +18,12 @@ postsubmits: key: master.json name: ci-operator-openshift-cluster-dns-operator image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} name: "" - resources: {} + resources: + limits: + cpu: 500m + requests: + cpu: 10m serviceAccountName: ci-operator - agent: kubernetes decorate: true @@ -43,7 +46,10 @@ postsubmits: key: master.json name: ci-operator-openshift-cluster-dns-operator image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} name: "" - resources: {} + resources: + limits: + cpu: 500m + requests: + cpu: 10m serviceAccountName: ci-operator diff --git a/ci-operator/jobs/openshift/cluster-dns-operator/openshift-cluster-dns-operator-presubmits.yaml b/ci-operator/jobs/openshift/cluster-dns-operator/openshift-cluster-dns-operator-presubmits.yaml index 1618efcfd3ae5..3d0f6c1a9666b 100644 --- a/ci-operator/jobs/openshift/cluster-dns-operator/openshift-cluster-dns-operator-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-dns-operator/openshift-cluster-dns-operator-presubmits.yaml @@ -23,9 +23,12 @@ presubmits: key: master.json name: ci-operator-openshift-cluster-dns-operator image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} name: "" - resources: {} + resources: + limits: + cpu: 500m + requests: + cpu: 10m serviceAccountName: ci-operator trigger: ((?m)^/test( all| unit),?(\\s+|$)) - agent: kubernetes @@ -51,8 +54,11 @@ presubmits: key: master.json name: ci-operator-openshift-cluster-dns-operator image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} name: "" - resources: {} + resources: + limits: + cpu: 500m + requests: + cpu: 10m serviceAccountName: ci-operator trigger: ((?m)^/test( all| images),?(\\s+|$)) diff --git a/ci-operator/jobs/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-postsubmits.yaml b/ci-operator/jobs/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-postsubmits.yaml index 627cde25e7a75..e86d0ca35af85 100644 --- a/ci-operator/jobs/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-postsubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-postsubmits.yaml @@ -18,9 +18,12 @@ postsubmits: key: master.json name: ci-operator-openshift-cluster-ingress-operator image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} name: "" - resources: {} + resources: + limits: + cpu: 500m + requests: + cpu: 10m serviceAccountName: ci-operator - agent: kubernetes decorate: true @@ -43,7 +46,10 @@ postsubmits: key: master.json name: ci-operator-openshift-cluster-ingress-operator image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} name: "" - resources: {} + resources: + limits: + cpu: 500m + requests: + cpu: 10m serviceAccountName: ci-operator diff --git a/ci-operator/jobs/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-presubmits.yaml b/ci-operator/jobs/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-presubmits.yaml index 4147bcff2267b..cd632308060a8 100644 --- a/ci-operator/jobs/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-presubmits.yaml @@ -23,9 +23,12 @@ presubmits: key: master.json name: ci-operator-openshift-cluster-ingress-operator image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} name: "" - resources: {} + resources: + limits: + cpu: 500m + requests: + cpu: 10m serviceAccountName: ci-operator trigger: ((?m)^/test( all| unit),?(\\s+|$)) - agent: kubernetes @@ -51,8 +54,11 @@ presubmits: key: master.json name: ci-operator-openshift-cluster-ingress-operator image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} name: "" - resources: {} + resources: + limits: + cpu: 500m + requests: + cpu: 10m serviceAccountName: ci-operator trigger: ((?m)^/test( all| images),?(\\s+|$)) diff --git a/ci-operator/jobs/openshift/cluster-monitoring-operator/openshift-cluster-monitoring-operator-postsubmits.yaml b/ci-operator/jobs/openshift/cluster-monitoring-operator/openshift-cluster-monitoring-operator-postsubmits.yaml index e96ea047f0872..d28074bcfa95c 100644 --- a/ci-operator/jobs/openshift/cluster-monitoring-operator/openshift-cluster-monitoring-operator-postsubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-monitoring-operator/openshift-cluster-monitoring-operator-postsubmits.yaml @@ -1,28 +1,32 @@ postsubmits: openshift/cluster-monitoring-operator: - - name: branch-ci-openshift-cluster-monitoring-operator-images - agent: kubernetes - labels: - artifacts: images + - agent: kubernetes branches: - master decorate: true + labels: + artifacts: images + name: branch-ci-openshift-cluster-monitoring-operator-images skip_cloning: true spec: - serviceAccountName: ci-operator containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + - args: + - --artifact-dir=$(ARTIFACTS) + - --target=[images] + - --promote + command: + - ci-operator env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-cluster-monitoring-operator key: master.json - command: - - ci-operator - args: - - --artifact-dir=$(ARTIFACTS) - - --target=[images] - - --promote \ No newline at end of file + name: ci-operator-openshift-cluster-monitoring-operator + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + serviceAccountName: ci-operator diff --git a/ci-operator/jobs/openshift/cluster-operator/openshift-cluster-operator-postsubmits.yaml b/ci-operator/jobs/openshift/cluster-operator/openshift-cluster-operator-postsubmits.yaml index b71cadda90463..935d02f055eec 100644 --- a/ci-operator/jobs/openshift/cluster-operator/openshift-cluster-operator-postsubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-operator/openshift-cluster-operator-postsubmits.yaml @@ -18,9 +18,12 @@ postsubmits: key: master.json name: ci-operator-openshift-cluster-operator image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} name: "" - resources: {} + resources: + limits: + cpu: 500m + requests: + cpu: 10m serviceAccountName: ci-operator - agent: kubernetes decorate: true @@ -40,9 +43,12 @@ postsubmits: key: master.json name: ci-operator-openshift-cluster-operator image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} name: "" - resources: {} + resources: + limits: + cpu: 500m + requests: + cpu: 10m serviceAccountName: ci-operator - agent: kubernetes decorate: true @@ -65,13 +71,16 @@ postsubmits: key: master.json name: ci-operator-openshift-cluster-operator image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} name: "" - resources: {} + resources: + limits: + cpu: 500m + requests: + cpu: 10m serviceAccountName: ci-operator - - name: test_branch_cluster_operator_e2e - agent: jenkins - labels: - master: ci.openshift.redhat.com + - agent: jenkins branches: - master + labels: + master: ci.openshift.redhat.com + name: test_branch_cluster_operator_e2e diff --git a/ci-operator/jobs/openshift/cluster-operator/openshift-cluster-operator-presubmits.yaml b/ci-operator/jobs/openshift/cluster-operator/openshift-cluster-operator-presubmits.yaml index ccb3005fd0e4d..5874e6e53454f 100644 --- a/ci-operator/jobs/openshift/cluster-operator/openshift-cluster-operator-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-operator/openshift-cluster-operator-presubmits.yaml @@ -23,9 +23,12 @@ presubmits: key: master.json name: ci-operator-openshift-cluster-operator image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} name: "" - resources: {} + resources: + limits: + cpu: 500m + requests: + cpu: 10m serviceAccountName: ci-operator trigger: ((?m)^/test( all| verify),?(\\s+|$)) - agent: kubernetes @@ -51,9 +54,12 @@ presubmits: key: master.json name: ci-operator-openshift-cluster-operator image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} name: "" - resources: {} + resources: + limits: + cpu: 500m + requests: + cpu: 10m serviceAccountName: ci-operator trigger: ((?m)^/test( all| unit),?(\\s+|$)) - agent: kubernetes @@ -79,9 +85,12 @@ presubmits: key: master.json name: ci-operator-openshift-cluster-operator image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} name: "" - resources: {} + resources: + limits: + cpu: 500m + requests: + cpu: 10m serviceAccountName: ci-operator trigger: ((?m)^/test( all| integration),?(\\s+|$)) - agent: kubernetes @@ -107,16 +116,19 @@ presubmits: key: master.json name: ci-operator-openshift-cluster-operator image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} name: "" - resources: {} + resources: + limits: + cpu: 500m + requests: + cpu: 10m serviceAccountName: ci-operator trigger: ((?m)^/test( all| images),?(\\s+|$)) - - name: test_pull_request_cluster_operator_e2e - agent: jenkins - labels: - master: ci.openshift.redhat.com + - agent: jenkins always_run: true context: ci/openshift-jenkins/e2e - rerun_command: "/test e2e" - trigger: "((?m)^/test( all| e2e),?(\\s+|$))" + labels: + master: ci.openshift.redhat.com + name: test_pull_request_cluster_operator_e2e + rerun_command: /test e2e + trigger: ((?m)^/test( all| e2e),?(\s+|$)) diff --git a/ci-operator/jobs/openshift/cluster-samples-operator/openshift-cluster-samples-operator-postsubmits.yaml b/ci-operator/jobs/openshift/cluster-samples-operator/openshift-cluster-samples-operator-postsubmits.yaml index 29a6ec51ee5cc..34293ae31c35a 100644 --- a/ci-operator/jobs/openshift/cluster-samples-operator/openshift-cluster-samples-operator-postsubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-samples-operator/openshift-cluster-samples-operator-postsubmits.yaml @@ -1,8 +1,8 @@ postsubmits: openshift/cluster-samples-operator: - - name: test_branch_image_registry_unit - agent: jenkins - labels: - master: ci.openshift.redhat.com + - agent: jenkins branches: - master + labels: + master: ci.openshift.redhat.com + name: test_branch_image_registry_unit diff --git a/ci-operator/jobs/openshift/cluster-samples-operator/openshift-cluster-samples-operator-presubmits.yaml b/ci-operator/jobs/openshift/cluster-samples-operator/openshift-cluster-samples-operator-presubmits.yaml index 252ea5ad58c19..fd8e9ed3074d0 100644 --- a/ci-operator/jobs/openshift/cluster-samples-operator/openshift-cluster-samples-operator-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-samples-operator/openshift-cluster-samples-operator-presubmits.yaml @@ -1,29 +1,33 @@ presubmits: openshift/image-registry: - - name: pull-ci-cluster-samples-operator-unit - agent: kubernetes - context: ci/prow/unit + - agent: kubernetes + always_run: true branches: - master - rerun_command: "/test unit" - always_run: true - trigger: "((?m)^/test( all| unit),?(\\s+|$))" + context: ci/prow/unit decorate: true + name: pull-ci-cluster-samples-operator-unit + rerun_command: /test unit skip_cloning: true spec: - serviceAccountName: ci-operator containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + - args: + - --artifact-dir=$(ARTIFACTS) + - --target=unit + command: + - ci-operator env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-cluster-samples-operator key: master.json - command: - - ci-operator - args: - - --artifact-dir=$(ARTIFACTS) - - --target=unit + name: ci-operator-openshift-cluster-samples-operator + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + serviceAccountName: ci-operator + trigger: ((?m)^/test( all| unit),?(\s+|$)) diff --git a/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-postsubmits.yaml b/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-postsubmits.yaml index 29ebdc01dc745..a6da231fd4750 100644 --- a/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-postsubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-postsubmits.yaml @@ -1,28 +1,32 @@ postsubmits: openshift/cluster-version-operator: - - name: branch-ci-openshift-cluster-version-operator-images - agent: kubernetes - labels: - artifacts: images + - agent: kubernetes branches: - master decorate: true + labels: + artifacts: images + name: branch-ci-openshift-cluster-version-operator-images skip_cloning: true spec: - serviceAccountName: ci-operator containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + - args: + - --artifact-dir=$(ARTIFACTS) + - --target=[images] + - --promote + command: + - ci-operator env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-cluster-version-operator key: master.json - command: - - ci-operator - args: - - --artifact-dir=$(ARTIFACTS) - - --target=[images] - - --promote \ No newline at end of file + name: ci-operator-openshift-cluster-version-operator + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + serviceAccountName: ci-operator diff --git a/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-presubmits.yaml b/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-presubmits.yaml index 1d52c073b17b1..324caa9222dcf 100644 --- a/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-presubmits.yaml @@ -1,30 +1,34 @@ presubmits: openshift/cluster-version-operator: - - name: pull-ci-openshift-cluster-version-operator-unit - agent: kubernetes - context: ci/prow/unit + - agent: kubernetes + always_run: true branches: - master - rerun_command: "/test unit" - always_run: true - trigger: "((?m)^/test( all| unit),?(\\s+|$))" + context: ci/prow/unit decorate: true + name: pull-ci-openshift-cluster-version-operator-unit + rerun_command: /test unit skip_cloning: true spec: - serviceAccountName: ci-operator containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + - args: + - --artifact-dir=$(ARTIFACTS) + - --target=unit + - --target=[images] + command: + - ci-operator env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-cluster-version-operator key: master.json - command: - - ci-operator - args: - - --artifact-dir=$(ARTIFACTS) - - --target=unit - - --target=[images] + name: ci-operator-openshift-cluster-version-operator + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + serviceAccountName: ci-operator + trigger: ((?m)^/test( all| unit),?(\s+|$)) diff --git a/ci-operator/jobs/openshift/configmap-reload/openshift-configmap-reload-postsubmits.yaml b/ci-operator/jobs/openshift/configmap-reload/openshift-configmap-reload-postsubmits.yaml index b591f1a467880..1ebbdc4140c4a 100644 --- a/ci-operator/jobs/openshift/configmap-reload/openshift-configmap-reload-postsubmits.yaml +++ b/ci-operator/jobs/openshift/configmap-reload/openshift-configmap-reload-postsubmits.yaml @@ -1,28 +1,32 @@ postsubmits: openshift/configmap-reload: - - name: branch-ci-openshift-configmap-reload-images - agent: kubernetes - labels: - artifacts: images + - agent: kubernetes branches: - openshift-master decorate: true + labels: + artifacts: images + name: branch-ci-openshift-configmap-reload-images skip_cloning: true spec: - serviceAccountName: ci-operator containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + - args: + - --artifact-dir=$(ARTIFACTS) + - --target=[images] + - --promote + command: + - ci-operator env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-configmap-reload key: master.json - command: - - ci-operator - args: - - --artifact-dir=$(ARTIFACTS) - - --target=[images] - - --promote \ No newline at end of file + name: ci-operator-openshift-configmap-reload + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + serviceAccountName: ci-operator diff --git a/ci-operator/jobs/openshift/console/openshift-console-postsubmits.yaml b/ci-operator/jobs/openshift/console/openshift-console-postsubmits.yaml index ec3bd12f40982..40e28382d085f 100644 --- a/ci-operator/jobs/openshift/console/openshift-console-postsubmits.yaml +++ b/ci-operator/jobs/openshift/console/openshift-console-postsubmits.yaml @@ -1,28 +1,32 @@ postsubmits: openshift/console: - - name: branch-ci-openshift-console-images - agent: kubernetes - labels: - artifacts: images + - agent: kubernetes branches: - master decorate: true + labels: + artifacts: images + name: branch-ci-openshift-console-images skip_cloning: true spec: - serviceAccountName: ci-operator containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + - args: + - --artifact-dir=$(ARTIFACTS) + - --target=[images] + - --promote + command: + - ci-operator env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-console key: master.json - command: - - ci-operator - args: - - --artifact-dir=$(ARTIFACTS) - - --target=[images] - - --promote \ No newline at end of file + name: ci-operator-openshift-console + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + serviceAccountName: ci-operator diff --git a/ci-operator/jobs/openshift/console/openshift-console-presubmits.yaml b/ci-operator/jobs/openshift/console/openshift-console-presubmits.yaml index 22ace0b2f910e..fcf3881a34c4d 100644 --- a/ci-operator/jobs/openshift/console/openshift-console-presubmits.yaml +++ b/ci-operator/jobs/openshift/console/openshift-console-presubmits.yaml @@ -1,57 +1,65 @@ presubmits: openshift/console: - - name: pull-ci-console-backend - agent: kubernetes + - agent: kubernetes + always_run: true branches: - master - dockerless-build-temporary context: ci/prow/backend - rerun_command: "/test backend" - always_run: true - trigger: "((?m)^/test( all| backend),?(\\s+|$))" decorate: true + name: pull-ci-console-backend + rerun_command: /test backend spec: - serviceAccountName: ci-operator containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + - args: + - --artifact-dir=$(ARTIFACTS) + - --target=backend + - --target=[images] + command: + - ci-operator env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-console key: master.json - command: - - ci-operator - args: - - --artifact-dir=$(ARTIFACTS) - - --target=backend - - --target=[images] - - name: pull-ci-console-frontend - agent: kubernetes + name: ci-operator-openshift-console + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + serviceAccountName: ci-operator + trigger: ((?m)^/test( all| backend),?(\s+|$)) + - agent: kubernetes + always_run: true branches: - master - dockerless-build-temporary context: ci/prow/frontend - rerun_command: "/test frontend" - always_run: true - trigger: "((?m)^/test( all| frontend),?(\\s+|$))" decorate: true + name: pull-ci-console-frontend + rerun_command: /test frontend spec: - serviceAccountName: ci-operator containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + - args: + - --artifact-dir=$(ARTIFACTS) + - --target=frontend + command: + - ci-operator env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-console key: master.json - command: - - ci-operator - args: - - --artifact-dir=$(ARTIFACTS) - - --target=frontend \ No newline at end of file + name: ci-operator-openshift-console + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + serviceAccountName: ci-operator + trigger: ((?m)^/test( all| frontend),?(\s+|$)) diff --git a/ci-operator/jobs/openshift/coredns/openshift-coredns-postsubmits.yaml b/ci-operator/jobs/openshift/coredns/openshift-coredns-postsubmits.yaml index 2e936e21188ae..742960ff19cd0 100644 --- a/ci-operator/jobs/openshift/coredns/openshift-coredns-postsubmits.yaml +++ b/ci-operator/jobs/openshift/coredns/openshift-coredns-postsubmits.yaml @@ -1,28 +1,32 @@ postsubmits: openshift/coredns: - - name: branch-ci-kubernetes-coredns-images - agent: kubernetes - labels: - artifacts: images + - agent: kubernetes branches: - master decorate: true + labels: + artifacts: images + name: branch-ci-kubernetes-coredns-images skip_cloning: true spec: - serviceAccountName: ci-operator containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + - args: + - --artifact-dir=$(ARTIFACTS) + - --target=[images] + - --promote + command: + - ci-operator env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-kubernetes-coredns key: master.json - command: - - ci-operator - args: - - --artifact-dir=$(ARTIFACTS) - - --target=[images] - - --promote \ No newline at end of file + name: ci-operator-kubernetes-coredns + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + serviceAccountName: ci-operator diff --git a/ci-operator/jobs/openshift/coredns/openshift-coredns-presubmits.yaml b/ci-operator/jobs/openshift/coredns/openshift-coredns-presubmits.yaml index 5e3e922d6e6f3..3d7a8c405ae30 100644 --- a/ci-operator/jobs/openshift/coredns/openshift-coredns-presubmits.yaml +++ b/ci-operator/jobs/openshift/coredns/openshift-coredns-presubmits.yaml @@ -1,30 +1,34 @@ presubmits: openshift/coredns: - - name: pull-ci-kubernetes-coredns-unit - agent: kubernetes - context: ci/prow/unit + - agent: kubernetes + always_run: true branches: - master - rerun_command: "/test unit" - always_run: true - trigger: "((?m)^/test( all| unit),?(\\s+|$))" + context: ci/prow/unit decorate: true + name: pull-ci-kubernetes-coredns-unit + rerun_command: /test unit skip_cloning: true spec: - serviceAccountName: ci-operator containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + - args: + - --artifact-dir=$(ARTIFACTS) + - --target=unit + - --target=[images] + command: + - ci-operator env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-kubernetes-coredns key: master.json - command: - - ci-operator - args: - - --artifact-dir=$(ARTIFACTS) - - --target=unit - - --target=[images] \ No newline at end of file + name: ci-operator-kubernetes-coredns + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + serviceAccountName: ci-operator + trigger: ((?m)^/test( all| unit),?(\s+|$)) diff --git a/ci-operator/jobs/openshift/descheduler/openshift-descheduler-postsubmits.yaml b/ci-operator/jobs/openshift/descheduler/openshift-descheduler-postsubmits.yaml index 76b95e1a434c7..cfd60906186b7 100644 --- a/ci-operator/jobs/openshift/descheduler/openshift-descheduler-postsubmits.yaml +++ b/ci-operator/jobs/openshift/descheduler/openshift-descheduler-postsubmits.yaml @@ -1,54 +1,62 @@ postsubmits: openshift/descheduler: - - name: branch-ci-kubernetes-descheduler-images - agent: kubernetes - labels: - artifacts: images + - agent: kubernetes branches: - master decorate: true + labels: + artifacts: images + name: branch-ci-kubernetes-descheduler-images skip_cloning: true spec: - serviceAccountName: ci-operator containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + - args: + - --artifact-dir=$(ARTIFACTS) + - --target=[images] + - --promote + command: + - ci-operator env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-kubernetes-descheduler key: master.json - command: - - ci-operator - args: - - --artifact-dir=$(ARTIFACTS) - - --target=[images] - - --promote - - name: branch-ci-kubernetes-descheduler-images-3.10 - agent: kubernetes - labels: - artifacts: images + name: ci-operator-kubernetes-descheduler + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + serviceAccountName: ci-operator + - agent: kubernetes branches: - release-3.10 decorate: true + labels: + artifacts: images + name: branch-ci-kubernetes-descheduler-images-3.10 skip_cloning: true spec: - serviceAccountName: ci-operator containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + - args: + - --artifact-dir=$(ARTIFACTS) + - --target=[images] + - --promote + command: + - ci-operator env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-kubernetes-descheduler key: release-3.10.json - command: - - ci-operator - args: - - --artifact-dir=$(ARTIFACTS) - - --target=[images] - - --promote \ No newline at end of file + name: ci-operator-kubernetes-descheduler + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + serviceAccountName: ci-operator diff --git a/ci-operator/jobs/openshift/descheduler/openshift-descheduler-presubmits.yaml b/ci-operator/jobs/openshift/descheduler/openshift-descheduler-presubmits.yaml index e745932c7d0e8..a27530be33c44 100644 --- a/ci-operator/jobs/openshift/descheduler/openshift-descheduler-presubmits.yaml +++ b/ci-operator/jobs/openshift/descheduler/openshift-descheduler-presubmits.yaml @@ -1,94 +1,92 @@ presubmits: openshift/descheduler: - - name: pull-ci-kubernetes-descheduler-unit - agent: kubernetes - context: ci/prow/unit + - agent: kubernetes + always_run: true branches: - master - rerun_command: "/test unit" - always_run: true - trigger: "((?m)^/test( all| unit),?(\\s+|$))" + context: ci/prow/unit decorate: true + name: pull-ci-kubernetes-descheduler-unit + rerun_command: /test unit skip_cloning: true spec: - serviceAccountName: ci-operator containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + - args: + - --artifact-dir=$(ARTIFACTS) + - --target=unit + - --target=[images] + command: + - ci-operator env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-kubernetes-descheduler key: master.json - command: - - ci-operator - args: - - --artifact-dir=$(ARTIFACTS) - - --target=unit - - --target=[images] - - name: pull-ci-kubernetes-descheduler-unit-3.10 - agent: kubernetes - context: ci/prow/unit + name: ci-operator-kubernetes-descheduler + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + serviceAccountName: ci-operator + trigger: ((?m)^/test( all| unit),?(\s+|$)) + - agent: kubernetes + always_run: true branches: - release-3.10 - rerun_command: "/test unit" - always_run: true - trigger: "((?m)^/test( all| unit),?(\\s+|$))" + context: ci/prow/unit decorate: true + name: pull-ci-kubernetes-descheduler-unit-3.10 + rerun_command: /test unit skip_cloning: true spec: - serviceAccountName: ci-operator containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + - args: + - --artifact-dir=$(ARTIFACTS) + - --target=unit + - --target=[images] + command: + - ci-operator env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-kubernetes-descheduler key: release-3.10.json - command: - - ci-operator - args: - - --artifact-dir=$(ARTIFACTS) - - --target=unit - - --target=[images] - - name: pull-ci-kubernetes-descheduler-e2e-gce-3.10 - agent: kubernetes + name: ci-operator-kubernetes-descheduler + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + serviceAccountName: ci-operator + trigger: ((?m)^/test( all| unit),?(\s+|$)) + - agent: kubernetes always_run: true - context: ci/prow/e2e branches: - release-3.10 - rerun_command: "/test e2e" - trigger: "((?m)^/test( all| e2e),?(\\s+|$))" + context: ci/prow/e2e decorate: true + name: pull-ci-kubernetes-descheduler-e2e-gce-3.10 + rerun_command: /test e2e skip_cloning: true spec: - serviceAccountName: ci-operator - volumes: - - name: job-definition - configMap: - name: prow-job-cluster-launch-src - - name: cluster-profile - projected: - sources: - - secret: - name: cluster-secrets-gcp - - configMap: - name: cluster-profile-gcp containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} - volumeMounts: - - name: job-definition - mountPath: /usr/local/e2e-gcp - subPath: cluster-launch-src.yaml - - name: cluster-profile - mountPath: /usr/local/kubernetes-descheduler-e2e-cluster-profile + - command: + - /bin/bash + - -c + - |- + #!/bin/bash + set -e + export RPM_REPO="$( curl -q "${RPM_REPO_BASEURL_REF}" 2>/dev/null)" + ci-operator \ + --artifact-dir=$(ARTIFACTS) \ + --secret-dir=/usr/local/kubernetes-descheduler-e2e-cluster-profile \ + --template=/usr/local/e2e-gcp \ + --target=e2e-gcp env: - name: JOB_NAME_SAFE value: kubernetes-descheduler-e2e @@ -97,21 +95,35 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-kubernetes-descheduler key: release-3.10.json + name: ci-operator-kubernetes-descheduler - name: TEST_COMMAND - value: "cp /tmp/admin.kubeconfig /tmp/admin.conf && make test-e2e" + value: cp /tmp/admin.kubeconfig /tmp/admin.conf && make test-e2e - name: RPM_REPO_BASEURL_REF value: https://storage.googleapis.com/origin-ci-test/releases/openshift/origin/release-3.10/.latest-rpms - command: - - /bin/bash - - -c - - | - #!/bin/bash - set -e - export RPM_REPO="$( curl -q "${RPM_REPO_BASEURL_REF}" 2>/dev/null)" - ci-operator \ - --artifact-dir=$(ARTIFACTS) \ - --secret-dir=/usr/local/kubernetes-descheduler-e2e-cluster-profile \ - --template=/usr/local/e2e-gcp \ - --target=e2e-gcp \ No newline at end of file + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + volumeMounts: + - mountPath: /usr/local/e2e-gcp + name: job-definition + subPath: cluster-launch-src.yaml + - mountPath: /usr/local/kubernetes-descheduler-e2e-cluster-profile + name: cluster-profile + serviceAccountName: ci-operator + volumes: + - configMap: + name: prow-job-cluster-launch-src + name: job-definition + - name: cluster-profile + projected: + sources: + - secret: + name: cluster-secrets-gcp + - configMap: + name: cluster-profile-gcp + trigger: ((?m)^/test( all| e2e),?(\s+|$)) diff --git a/ci-operator/jobs/openshift/image-registry/openshift-image-registry-postsubmits.yaml b/ci-operator/jobs/openshift/image-registry/openshift-image-registry-postsubmits.yaml index cde7b987a3c3f..d6cbf4ab1581c 100644 --- a/ci-operator/jobs/openshift/image-registry/openshift-image-registry-postsubmits.yaml +++ b/ci-operator/jobs/openshift/image-registry/openshift-image-registry-postsubmits.yaml @@ -1,70 +1,78 @@ postsubmits: openshift/image-registry: - - name: test_branch_image_registry_extended - agent: jenkins - labels: - master: ci.openshift.redhat.com + - agent: jenkins branches: - master - - name: test_branch_image_registry_integration - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_branch_image_registry_extended + - agent: jenkins branches: - master - - name: test_branch_image_registry_unit - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_branch_image_registry_integration + - agent: jenkins branches: - master - - name: branch-ci-image-registry-images - agent: kubernetes labels: - artifacts: images + master: ci.openshift.redhat.com + name: test_branch_image_registry_unit + - agent: kubernetes branches: - master decorate: true + labels: + artifacts: images + name: branch-ci-image-registry-images skip_cloning: true spec: - serviceAccountName: ci-operator containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + - command: + - ci-operator + - --artifact-dir=$(ARTIFACTS) + - --target=[images] + - --promote env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-image-registry key: master.json - command: - - ci-operator - - --artifact-dir=$(ARTIFACTS) - - --target=[images] - - --promote - - name: branch-ci-image-registry-images-3.10 - agent: kubernetes - labels: - artifacts: images + name: ci-operator-openshift-image-registry + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + serviceAccountName: ci-operator + - agent: kubernetes branches: - release-3.10 decorate: true + labels: + artifacts: images + name: branch-ci-image-registry-images-3.10 skip_cloning: true spec: - serviceAccountName: ci-operator containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + - command: + - ci-operator + - --artifact-dir=$(ARTIFACTS) + - --target=[images] + - --promote env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-image-registry key: release-3.10.json - command: - - ci-operator - - --artifact-dir=$(ARTIFACTS) - - --target=[images] - - --promote \ No newline at end of file + name: ci-operator-openshift-image-registry + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + serviceAccountName: ci-operator diff --git a/ci-operator/jobs/openshift/image-registry/openshift-image-registry-presubmits.yaml b/ci-operator/jobs/openshift/image-registry/openshift-image-registry-presubmits.yaml index 88386be63c35d..7f0176633cbac 100644 --- a/ci-operator/jobs/openshift/image-registry/openshift-image-registry-presubmits.yaml +++ b/ci-operator/jobs/openshift/image-registry/openshift-image-registry-presubmits.yaml @@ -1,171 +1,178 @@ presubmits: openshift/image-registry: - - name: pull-ci-image-registry-unit - agent: kubernetes - context: ci/prow/unit + - agent: kubernetes + always_run: true branches: - master - dockerless-build-temporary - rerun_command: "/test unit" - always_run: true - trigger: "((?m)^/test( all| unit),?(\\s+|$))" + context: ci/prow/unit decorate: true + name: pull-ci-image-registry-unit + rerun_command: /test unit skip_cloning: true spec: - serviceAccountName: ci-operator containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + - args: + - --artifact-dir=$(ARTIFACTS) + - --target=unit + command: + - ci-operator env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-image-registry key: master.json - command: - - ci-operator - args: - - --artifact-dir=$(ARTIFACTS) - - --target=unit - - name: pull-ci-image-registry-unit-3.10 - agent: kubernetes - context: ci/prow/unit + name: ci-operator-openshift-image-registry + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + serviceAccountName: ci-operator + trigger: ((?m)^/test( all| unit),?(\s+|$)) + - agent: kubernetes + always_run: true branches: - release-3.10 - rerun_command: "/test unit" - always_run: true - trigger: "((?m)^/test( all| unit),?(\\s+|$))" + context: ci/prow/unit decorate: true + name: pull-ci-image-registry-unit-3.10 + rerun_command: /test unit skip_cloning: true spec: - serviceAccountName: ci-operator containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + - args: + - --artifact-dir=$(ARTIFACTS) + - --target=unit + command: + - ci-operator env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-image-registry key: release-3.10.json - command: - - ci-operator - args: - - --artifact-dir=$(ARTIFACTS) - - --target=unit - - name: pull-ci-image-registry-integration - agent: kubernetes - context: ci/prow/integration + name: ci-operator-openshift-image-registry + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + serviceAccountName: ci-operator + trigger: ((?m)^/test( all| unit),?(\s+|$)) + - agent: kubernetes + always_run: true branches: - master - dockerless-build-temporary - rerun_command: "/test integration" - always_run: true - trigger: "((?m)^/test( all| integration),?(\\s+|$))" + context: ci/prow/integration decorate: true + name: pull-ci-image-registry-integration + rerun_command: /test integration skip_cloning: true spec: - serviceAccountName: ci-operator - volumes: - - name: job-definition - configMap: - name: prow-job-master-sidecar containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} - volumeMounts: - - name: job-definition - mountPath: /usr/local/integration - subPath: master-sidecar.yaml + - args: + - --artifact-dir=$(ARTIFACTS) + - --template=/usr/local/integration + - --target=integration + command: + - ci-operator env: - name: COMMAND - value: TEST_KUBECONFIG=${KUBECONFIG} ARTIFACT_DIR=/tmp/artifacts JUNIT_REPORT=true make test-integration + value: TEST_KUBECONFIG=${KUBECONFIG} ARTIFACT_DIR=/tmp/artifacts JUNIT_REPORT=true + make test-integration - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-image-registry key: master.json - command: - - ci-operator - args: - - --artifact-dir=$(ARTIFACTS) - - --template=/usr/local/integration - - --target=integration - - name: pull-ci-image-registry-integration-3.10 - agent: kubernetes - context: ci/prow/integration + name: ci-operator-openshift-image-registry + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + volumeMounts: + - mountPath: /usr/local/integration + name: job-definition + subPath: master-sidecar.yaml + serviceAccountName: ci-operator + volumes: + - configMap: + name: prow-job-master-sidecar + name: job-definition + trigger: ((?m)^/test( all| integration),?(\s+|$)) + - agent: kubernetes + always_run: true branches: - release-3.10 - rerun_command: "/test integration" - always_run: true - trigger: "((?m)^/test( all| integration),?(\\s+|$))" + context: ci/prow/integration decorate: true + name: pull-ci-image-registry-integration-3.10 + rerun_command: /test integration skip_cloning: true spec: - serviceAccountName: ci-operator - volumes: - - name: job-definition - configMap: - name: prow-job-master-sidecar containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} - volumeMounts: - - name: job-definition - mountPath: /usr/local/integration - subPath: master-sidecar.yaml + - args: + - --artifact-dir=$(ARTIFACTS) + - --template=/usr/local/integration + - --target=integration + command: + - ci-operator env: - name: COMMAND - value: TEST_KUBECONFIG=${KUBECONFIG} ARTIFACT_DIR=/tmp/artifacts JUNIT_REPORT=true make test-integration + value: TEST_KUBECONFIG=${KUBECONFIG} ARTIFACT_DIR=/tmp/artifacts JUNIT_REPORT=true + make test-integration - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-image-registry key: release-3.10.json - command: - - ci-operator - args: - - --artifact-dir=$(ARTIFACTS) - - --template=/usr/local/integration - - --target=integration - - name: pull-ci-image-registry-e2e - agent: kubernetes - context: ci/prow/e2e + name: ci-operator-openshift-image-registry + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + volumeMounts: + - mountPath: /usr/local/integration + name: job-definition + subPath: master-sidecar.yaml + serviceAccountName: ci-operator + volumes: + - configMap: + name: prow-job-master-sidecar + name: job-definition + trigger: ((?m)^/test( all| integration),?(\s+|$)) + - agent: kubernetes + always_run: true branches: - master - dockerless-build-temporary - rerun_command: "/test e2e" - always_run: true - trigger: "((?m)^/test( all| e2e),?(\\s+|$))" + context: ci/prow/e2e decorate: true + name: pull-ci-image-registry-e2e + rerun_command: /test e2e skip_cloning: true spec: - serviceAccountName: ci-operator - volumes: - - name: job-definition - configMap: - name: prow-job-cluster-launch-e2e - - name: cluster-profile - projected: - sources: - - secret: - name: cluster-secrets-gcp - - configMap: - name: cluster-profile-gcp containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} - volumeMounts: - - name: job-definition - mountPath: /usr/local/e2e-gcp - subPath: cluster-launch-e2e.yaml - - name: cluster-profile - mountPath: /usr/local/e2e-gcp-cluster-profile + - command: + - /bin/bash + - -c + - | + #!/bin/bash + set -e + export RPM_REPO="$( curl -q "${RPM_REPO_BASEURL_REF}" 2>/dev/null)" + ci-operator \ + --artifact-dir=$(ARTIFACTS) \ + --secret-dir=/usr/local/e2e-gcp-cluster-profile --template=/usr/local/e2e-gcp \ + --target=e2e-gcp env: - name: TEST_FOCUS value: Suite:openshift/conformance/parallel @@ -178,37 +185,28 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-image-registry key: master.json + name: ci-operator-openshift-image-registry - name: RPM_REPO_BASEURL_REF value: https://storage.googleapis.com/origin-ci-test/releases/openshift/origin/master/.latest-rpms - command: - - /bin/bash - - -c - - | - #!/bin/bash - set -e - export RPM_REPO="$( curl -q "${RPM_REPO_BASEURL_REF}" 2>/dev/null)" - ci-operator \ - --artifact-dir=$(ARTIFACTS) \ - --secret-dir=/usr/local/e2e-gcp-cluster-profile --template=/usr/local/e2e-gcp \ - --target=e2e-gcp - - name: pull-ci-image-registry-e2e-3.10 - agent: kubernetes - context: ci/prow/e2e - branches: - - release-3.10 - rerun_command: "/test e2e" - always_run: true - trigger: "((?m)^/test( all| e2e),?(\\s+|$))" - decorate: true - skip_cloning: true - spec: + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + volumeMounts: + - mountPath: /usr/local/e2e-gcp + name: job-definition + subPath: cluster-launch-e2e.yaml + - mountPath: /usr/local/e2e-gcp-cluster-profile + name: cluster-profile serviceAccountName: ci-operator volumes: - - name: job-definition - configMap: + - configMap: name: prow-job-cluster-launch-e2e + name: job-definition - name: cluster-profile projected: sources: @@ -216,16 +214,29 @@ presubmits: name: cluster-secrets-gcp - configMap: name: cluster-profile-gcp + trigger: ((?m)^/test( all| e2e),?(\s+|$)) + - agent: kubernetes + always_run: true + branches: + - release-3.10 + context: ci/prow/e2e + decorate: true + name: pull-ci-image-registry-e2e-3.10 + rerun_command: /test e2e + skip_cloning: true + spec: containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} - volumeMounts: - - name: job-definition - mountPath: /usr/local/e2e-gcp - subPath: cluster-launch-e2e.yaml - - name: cluster-profile - mountPath: /usr/local/e2e-gcp-cluster-profile + - command: + - /bin/bash + - -c + - |- + #!/bin/bash + set -e + export RPM_REPO="$( curl -q "${RPM_REPO_BASEURL_REF}" 2>/dev/null)" + ci-operator \ + --artifact-dir=$(ARTIFACTS) \ + --secret-dir=/usr/local/e2e-gcp-cluster-profile --template=/usr/local/e2e-gcp \ + --target=e2e-gcp env: - name: TEST_FOCUS value: Suite:openshift/conformance/parallel @@ -238,18 +249,33 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-image-registry key: release-3.10.json + name: ci-operator-openshift-image-registry - name: RPM_REPO_BASEURL_REF value: https://storage.googleapis.com/origin-ci-test/releases/openshift/origin/release-3.10/.latest-rpms - command: - - /bin/bash - - -c - - | - #!/bin/bash - set -e - export RPM_REPO="$( curl -q "${RPM_REPO_BASEURL_REF}" 2>/dev/null)" - ci-operator \ - --artifact-dir=$(ARTIFACTS) \ - --secret-dir=/usr/local/e2e-gcp-cluster-profile --template=/usr/local/e2e-gcp \ - --target=e2e-gcp \ No newline at end of file + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + volumeMounts: + - mountPath: /usr/local/e2e-gcp + name: job-definition + subPath: cluster-launch-e2e.yaml + - mountPath: /usr/local/e2e-gcp-cluster-profile + name: cluster-profile + serviceAccountName: ci-operator + volumes: + - configMap: + name: prow-job-cluster-launch-e2e + name: job-definition + - name: cluster-profile + projected: + sources: + - secret: + name: cluster-secrets-gcp + - configMap: + name: cluster-profile-gcp + trigger: ((?m)^/test( all| e2e),?(\s+|$)) diff --git a/ci-operator/jobs/openshift/imagebuilder/openshift-imagebuilder-presubmits.yaml b/ci-operator/jobs/openshift/imagebuilder/openshift-imagebuilder-presubmits.yaml index d8f73fb4c9584..e45f196a28e1f 100644 --- a/ci-operator/jobs/openshift/imagebuilder/openshift-imagebuilder-presubmits.yaml +++ b/ci-operator/jobs/openshift/imagebuilder/openshift-imagebuilder-presubmits.yaml @@ -1,29 +1,33 @@ presubmits: openshift/imagebuilder: - - name: pull-ci-openshift-imagebuilder-unit - agent: kubernetes - context: ci/prow/unit + - agent: kubernetes + always_run: true branches: - master - rerun_command: "/test unit" - always_run: true - trigger: "((?m)^/test( all| unit),?(\\s+|$))" + context: ci/prow/unit decorate: true + name: pull-ci-openshift-imagebuilder-unit + rerun_command: /test unit skip_cloning: true spec: - serviceAccountName: ci-operator containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + - args: + - --artifact-dir=$(ARTIFACTS) + - --target=unit + command: + - ci-operator env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-imagebuilder key: master.json - command: - - ci-operator - args: - - --artifact-dir=$(ARTIFACTS) - - --target=unit + name: ci-operator-openshift-imagebuilder + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + serviceAccountName: ci-operator + trigger: ((?m)^/test( all| unit),?(\s+|$)) diff --git a/ci-operator/jobs/openshift/installer/openshift-installer-postsubmits.yaml b/ci-operator/jobs/openshift/installer/openshift-installer-postsubmits.yaml index 4d1fdbbca03a0..55cc0752e26c7 100644 --- a/ci-operator/jobs/openshift/installer/openshift-installer-postsubmits.yaml +++ b/ci-operator/jobs/openshift/installer/openshift-installer-postsubmits.yaml @@ -1,28 +1,32 @@ postsubmits: openshift/installer: - - name: branch-ci-origin-installer-images - agent: kubernetes - labels: - artifacts: images + - agent: kubernetes branches: - master decorate: true + labels: + artifacts: images + name: branch-ci-origin-installer-images skip_cloning: true spec: - serviceAccountName: ci-operator containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + - args: + - --artifact-dir=$(ARTIFACTS) + - --target=[images] + - --promote + command: + - ci-operator env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-installer key: master.json - command: - - ci-operator - args: - - --artifact-dir=$(ARTIFACTS) - - --target=[images] - - --promote \ No newline at end of file + name: ci-operator-openshift-installer + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + serviceAccountName: ci-operator diff --git a/ci-operator/jobs/openshift/installer/openshift-installer-presubmits.yaml b/ci-operator/jobs/openshift/installer/openshift-installer-presubmits.yaml index c569f99471996..cb539b949209d 100644 --- a/ci-operator/jobs/openshift/installer/openshift-installer-presubmits.yaml +++ b/ci-operator/jobs/openshift/installer/openshift-installer-presubmits.yaml @@ -1,71 +1,58 @@ presubmits: openshift/installer: - - name: pull-ci-origin-installer-unit - agent: kubernetes - context: ci/prow/unit + - agent: kubernetes + always_run: true branches: - master - rerun_command: "/test unit" - always_run: true - trigger: "((?m)^/test( all| unit),?(\\s+|$))" + context: ci/prow/unit decorate: true + name: pull-ci-origin-installer-unit + rerun_command: /test unit skip_cloning: true spec: - serviceAccountName: ci-operator containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + - args: + - --artifact-dir=$(ARTIFACTS) + - --target=unit + command: + - ci-operator env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-installer key: master.json - command: - - ci-operator - args: - - --artifact-dir=$(ARTIFACTS) - - --target=unit - - - name: pull-ci-origin-installer-e2e-aws - agent: kubernetes - context: ci/prow/e2e-aws + name: ci-operator-openshift-installer + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + serviceAccountName: ci-operator + trigger: ((?m)^/test( all| unit),?(\s+|$)) + - agent: kubernetes + always_run: false branches: - master - rerun_command: "/test e2e-aws" - # The abomination below is equivilent to `^((?!Documentation).)*$`. Since - # Go doesn't support negative lookaheads, we are stuck with the following. - run_if_changed: "^([^D]|D(D|oD|ocD|ocuD|ocum(D|e(D|n(D|t(D|aD|atD|atiD|atioD)))))*([^Do]|o[^Dc]|oc[^Du]|ocu[^Dm]|ocum([^De]|e([^Dn]|n([^Dt]|t([^Da]|a[^Dt]|at[^Di]|ati[^Do]|atio[^Dn]))))))*(D(D|oD|ocD|ocuD|ocum(D|e(D|n(D|t(D|aD|atD|atiD|atioD)))))*(o|oc|ocu|ocum(e(n(t(a|at|ati|atio)?)?)?)?)?)?$" - trigger: "((?m)^/test( all| e2e-aws),?(\\s+|$))" + context: ci/prow/e2e-aws decorate: true + name: pull-ci-origin-installer-e2e-aws + rerun_command: /test e2e-aws + run_if_changed: ^([^D]|D(D|oD|ocD|ocuD|ocum(D|e(D|n(D|t(D|aD|atD|atiD|atioD)))))*([^Do]|o[^Dc]|oc[^Du]|ocu[^Dm]|ocum([^De]|e([^Dn]|n([^Dt]|t([^Da]|a[^Dt]|at[^Di]|ati[^Do]|atio[^Dn]))))))*(D(D|oD|ocD|ocuD|ocum(D|e(D|n(D|t(D|aD|atD|atiD|atioD)))))*(o|oc|ocu|ocum(e(n(t(a|at|ati|atio)?)?)?)?)?)?$ skip_cloning: true spec: - serviceAccountName: ci-operator - volumes: - - name: job-definition - configMap: - name: prow-job-cluster-launch-installer-e2e - - name: cluster-profile - projected: - sources: - - secret: - name: cluster-secrets-aws - - configMap: - name: cluster-profile-aws containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} - volumeMounts: - - name: job-definition - mountPath: /usr/local/e2e-aws - subPath: cluster-launch-installer-e2e.yaml - - name: cluster-profile - mountPath: /usr/local/e2e-aws-cluster-profile + - command: + - ci-operator + - --artifact-dir=$(ARTIFACTS) + - --secret-dir=/usr/local/e2e-aws-cluster-profile + - --template=/usr/local/e2e-aws + - --target=e2e-aws env: - name: TEST_FOCUS - value: "Secrets should be consumable from pods in volume with defaultMode set" + value: Secrets should be consumable from pods in volume with defaultMode + set - name: JOB_NAME_SAFE value: e2e-aws - name: CLUSTER_TYPE @@ -73,31 +60,26 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-installer key: master.json - command: - - ci-operator - - --artifact-dir=$(ARTIFACTS) - - --secret-dir=/usr/local/e2e-aws-cluster-profile - - --template=/usr/local/e2e-aws - - --target=e2e-aws - - - name: pull-ci-origin-installer-e2e-aws-all - agent: kubernetes - context: ci/prow/e2e-aws-all - branches: - - master - rerun_command: "/test e2e-aws-all" - always_run: false - trigger: "((?m)^/test( e2e-aws-all),?(\\s+|$))" - decorate: true - skip_cloning: true - spec: + name: ci-operator-openshift-installer + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + volumeMounts: + - mountPath: /usr/local/e2e-aws + name: job-definition + subPath: cluster-launch-installer-e2e.yaml + - mountPath: /usr/local/e2e-aws-cluster-profile + name: cluster-profile serviceAccountName: ci-operator volumes: - - name: job-definition - configMap: + - configMap: name: prow-job-cluster-launch-installer-e2e + name: job-definition - name: cluster-profile projected: sources: @@ -105,16 +87,24 @@ presubmits: name: cluster-secrets-aws - configMap: name: cluster-profile-aws + trigger: ((?m)^/test( all| e2e-aws),?(\s+|$)) + - agent: kubernetes + always_run: false + branches: + - master + context: ci/prow/e2e-aws-all + decorate: true + name: pull-ci-origin-installer-e2e-aws-all + rerun_command: /test e2e-aws-all + skip_cloning: true + spec: containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} - volumeMounts: - - name: job-definition - mountPath: /usr/local/e2e-aws-all - subPath: cluster-launch-installer-e2e.yaml - - name: cluster-profile - mountPath: /usr/local/e2e-aws-all-cluster-profile + - command: + - ci-operator + - --artifact-dir=$(ARTIFACTS) + - --secret-dir=/usr/local/e2e-aws-all-cluster-profile + - --template=/usr/local/e2e-aws-all + - --target=e2e-aws-all env: - name: TEST_FOCUS value: Suite:openshift/conformance/parallel @@ -127,101 +117,123 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-installer key: master.json - command: - - ci-operator - - --artifact-dir=$(ARTIFACTS) - - --secret-dir=/usr/local/e2e-aws-all-cluster-profile - - --template=/usr/local/e2e-aws-all - - --target=e2e-aws-all - - - name: ci-pull-openshift-installer-yaml-lint - trigger: "(?m)^/test yaml-lint" - rerun_command: "/test yaml-lint" - context: ci/prow/yaml-lint + name: ci-operator-openshift-installer + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + volumeMounts: + - mountPath: /usr/local/e2e-aws-all + name: job-definition + subPath: cluster-launch-installer-e2e.yaml + - mountPath: /usr/local/e2e-aws-all-cluster-profile + name: cluster-profile + serviceAccountName: ci-operator + volumes: + - configMap: + name: prow-job-cluster-launch-installer-e2e + name: job-definition + - name: cluster-profile + projected: + sources: + - secret: + name: cluster-secrets-aws + - configMap: + name: cluster-profile-aws + trigger: ((?m)^/test( e2e-aws-all),?(\s+|$)) + - agent: kubernetes always_run: true - skip_report: false - agent: kubernetes + context: ci/prow/yaml-lint decorate: true + name: ci-pull-openshift-installer-yaml-lint + rerun_command: /test yaml-lint spec: containers: - - image: quay.io/coreos/yamllint + - args: + - ./hack/yaml-lint.sh + command: + - sh env: - name: IS_CONTAINER - value: 'TRUE' - command: - - sh - args: - - ./hack/yaml-lint.sh - - - name: ci-pull-openshift-installer-tf-lint - trigger: "(?m)^/test tf-lint" - rerun_command: "/test tf-lint" - context: ci/prow/tf-lint + value: "TRUE" + image: quay.io/coreos/yamllint + name: "" + resources: {} + trigger: (?m)^/test yaml-lint + - agent: kubernetes always_run: true - skip_report: false - agent: kubernetes + context: ci/prow/tf-lint decorate: true + name: ci-pull-openshift-installer-tf-lint + rerun_command: /test tf-lint spec: containers: - - image: quay.io/coreos/tflint + - args: + - ./hack/tf-lint.sh + command: + - sh env: - name: IS_CONTAINER - value: 'TRUE' - command: - - sh - args: - - ./hack/tf-lint.sh - - - name: ci-pull-openshift-installer-shellcheck - trigger: "(?m)^/test shellcheck" - rerun_command: "/test shellcheck" - context: ci/prow/shellcheck + value: "TRUE" + image: quay.io/coreos/tflint + name: "" + resources: {} + trigger: (?m)^/test tf-lint + - agent: kubernetes always_run: true - skip_report: false - agent: kubernetes + context: ci/prow/shellcheck decorate: true + name: ci-pull-openshift-installer-shellcheck + rerun_command: /test shellcheck spec: containers: - - image: quay.io/coreos/shellcheck-alpine:v0.5.0 + - args: + - ./hack/shellcheck.sh + command: + - sh env: - name: IS_CONTAINER value: "TRUE" - command: - - sh - args: - - ./hack/shellcheck.sh - - - name: pull-ci-origin-installer-tf-fmt - trigger: "((?m)^/test( all| tf-fmt),?(\\s+|$))" - rerun_command: "/test tf-fmt" - context: ci/prow/tf-fmt + image: quay.io/coreos/shellcheck-alpine:v0.5.0 + name: "" + resources: {} + trigger: (?m)^/test shellcheck + - agent: kubernetes always_run: true - agent: kubernetes + context: ci/prow/tf-fmt decorate: true + name: pull-ci-origin-installer-tf-fmt + rerun_command: /test tf-fmt spec: containers: - - image: quay.io/coreos/terraform-alpine:v0.11.7 - env: - - name: IS_CONTAINER - value: 'TRUE' + - args: + - ./hack/tf-fmt.sh command: - sh - args: - - ./hack/tf-fmt.sh - - - name: ci-pull-openshift-installer-bazel-build-tarball - trigger: "(?m)^/test build-tarball" - rerun_command: "/test build-tarball" - context: ci/prow/build-tarball + env: + - name: IS_CONTAINER + value: "TRUE" + image: quay.io/coreos/terraform-alpine:v0.11.7 + name: "" + resources: {} + trigger: ((?m)^/test( all| tf-fmt),?(\s+|$)) + - agent: kubernetes always_run: true - skip_report: false - agent: kubernetes + context: ci/prow/build-tarball decorate: true + name: ci-pull-openshift-installer-bazel-build-tarball + rerun_command: /test build-tarball spec: containers: - - image: quay.io/coreos/tectonic-builder:bazel-v0.3 + - args: + - ./hack/test-bazel-build-tarball.sh + - --action_env=HOME=/tmp + command: + - sh env: - name: HOME value: /tmp @@ -229,69 +241,68 @@ presubmits: value: "TRUE" - name: USER value: bazel - command: - - sh - args: - - ./hack/test-bazel-build-tarball.sh - - --action_env=HOME=/tmp - - - name: ci-pull-openshift-installer-go-fmt - trigger: "(?m)^/test go-fmt" - rerun_command: "/test go-fmt" - context: ci/prow/go-fmt + image: quay.io/coreos/tectonic-builder:bazel-v0.3 + name: "" + resources: {} + trigger: (?m)^/test build-tarball + - agent: kubernetes always_run: true - skip_report: false - agent: kubernetes + context: ci/prow/go-fmt decorate: true + name: ci-pull-openshift-installer-go-fmt + rerun_command: /test go-fmt spec: containers: - - image: quay.io/coreos/golang-testing - env: - - name: IS_CONTAINER - value: 'TRUE' - command: - - sh - args: + - args: - ./hack/go-fmt.sh - . - - - name: ci-pull-openshift-installer-go-vet - trigger: "(?m)^/test go-vet" - rerun_command: "/test go-vet" - context: ci/prow/go-vet + command: + - sh + env: + - name: IS_CONTAINER + value: "TRUE" + image: quay.io/coreos/golang-testing + name: "" + resources: {} + trigger: (?m)^/test go-fmt + - agent: kubernetes always_run: true - skip_report: false - agent: kubernetes + context: ci/prow/go-vet decorate: true + name: ci-pull-openshift-installer-go-vet + rerun_command: /test go-vet spec: containers: - - image: quay.io/coreos/golang-testing - env: - - name: IS_CONTAINER - value: 'TRUE' - command: - - sh - args: + - args: - ./hack/go-vet.sh - ./... - - - name: ci-pull-openshift-installer-golint - trigger: "(?m)^/test golint" - rerun_command: "/test golint" - context: ci/prow/golint + command: + - sh + env: + - name: IS_CONTAINER + value: "TRUE" + image: quay.io/coreos/golang-testing + name: "" + resources: {} + trigger: (?m)^/test go-vet + - agent: kubernetes always_run: true - skip_report: false - agent: kubernetes + context: ci/prow/golint decorate: true + name: ci-pull-openshift-installer-golint + rerun_command: /test golint spec: containers: - - image: quay.io/coreos/golang-testing - env: - - name: IS_CONTAINER - value: "TRUE" - command: - - sh - args: + - args: - ./hack/go-lint.sh - installer/... - tests/smoke + command: + - sh + env: + - name: IS_CONTAINER + value: "TRUE" + image: quay.io/coreos/golang-testing + name: "" + resources: {} + trigger: (?m)^/test golint diff --git a/ci-operator/jobs/openshift/jenkins-client-plugin/openshift-jenkins-client-plugin-postsubmits.yaml b/ci-operator/jobs/openshift/jenkins-client-plugin/openshift-jenkins-client-plugin-postsubmits.yaml index 2e7547f0ad935..bacc9ec0dbca9 100644 --- a/ci-operator/jobs/openshift/jenkins-client-plugin/openshift-jenkins-client-plugin-postsubmits.yaml +++ b/ci-operator/jobs/openshift/jenkins-client-plugin/openshift-jenkins-client-plugin-postsubmits.yaml @@ -1,8 +1,8 @@ postsubmits: openshift/jenkins-client-plugin: - - name: test_branch_jenkins_client_plugin - agent: jenkins + - agent: jenkins + branches: + - master labels: master: ci.openshift.redhat.com - branches: - - master \ No newline at end of file + name: test_branch_jenkins_client_plugin diff --git a/ci-operator/jobs/openshift/jenkins-client-plugin/openshift-jenkins-client-plugin-presubmits.yaml b/ci-operator/jobs/openshift/jenkins-client-plugin/openshift-jenkins-client-plugin-presubmits.yaml index 196de67dab31a..81e16d5a938f6 100644 --- a/ci-operator/jobs/openshift/jenkins-client-plugin/openshift-jenkins-client-plugin-presubmits.yaml +++ b/ci-operator/jobs/openshift/jenkins-client-plugin/openshift-jenkins-client-plugin-presubmits.yaml @@ -1,10 +1,10 @@ presubmits: openshift/jenkins-client-plugin: - - name: test_pull_request_jenkins_client_plugin - agent: jenkins - labels: - master: ci.openshift.redhat.com + - agent: jenkins always_run: true context: ci/openshift-jenkins - rerun_command: "/test" - trigger: "((?m)^/test,?(\\s+|$))" \ No newline at end of file + labels: + master: ci.openshift.redhat.com + name: test_pull_request_jenkins_client_plugin + rerun_command: /test + trigger: ((?m)^/test,?(\s+|$)) diff --git a/ci-operator/jobs/openshift/jenkins-openshift-login-plugin/openshift-jenkins-openshift-login-plugin-postsubmits.yaml b/ci-operator/jobs/openshift/jenkins-openshift-login-plugin/openshift-jenkins-openshift-login-plugin-postsubmits.yaml index b444ae94d0523..f204beb37564f 100644 --- a/ci-operator/jobs/openshift/jenkins-openshift-login-plugin/openshift-jenkins-openshift-login-plugin-postsubmits.yaml +++ b/ci-operator/jobs/openshift/jenkins-openshift-login-plugin/openshift-jenkins-openshift-login-plugin-postsubmits.yaml @@ -1,8 +1,8 @@ postsubmits: openshift/jenkins-openshift-login-plugin: - - name: test_branch_jenkins_openshift_login_plugin - agent: jenkins + - agent: jenkins + branches: + - master labels: master: ci.openshift.redhat.com - branches: - - master \ No newline at end of file + name: test_branch_jenkins_openshift_login_plugin diff --git a/ci-operator/jobs/openshift/jenkins-openshift-login-plugin/openshift-jenkins-openshift-login-plugin-presubmits.yaml b/ci-operator/jobs/openshift/jenkins-openshift-login-plugin/openshift-jenkins-openshift-login-plugin-presubmits.yaml index 712f54a225bd3..d85852c24750b 100644 --- a/ci-operator/jobs/openshift/jenkins-openshift-login-plugin/openshift-jenkins-openshift-login-plugin-presubmits.yaml +++ b/ci-operator/jobs/openshift/jenkins-openshift-login-plugin/openshift-jenkins-openshift-login-plugin-presubmits.yaml @@ -1,10 +1,10 @@ presubmits: openshift/jenkins-openshift-login-plugin: - - name: test_pull_request_jenkins_openshift_login_plugin - agent: jenkins - labels: - master: ci.openshift.redhat.com + - agent: jenkins always_run: true context: ci/openshift-jenkins - rerun_command: "/test" - trigger: "((?m)^/test,?(\\s+|$))" \ No newline at end of file + labels: + master: ci.openshift.redhat.com + name: test_pull_request_jenkins_openshift_login_plugin + rerun_command: /test + trigger: ((?m)^/test,?(\s+|$)) diff --git a/ci-operator/jobs/openshift/jenkins-plugin/openshift-jenkins-plugin-postsubmits.yaml b/ci-operator/jobs/openshift/jenkins-plugin/openshift-jenkins-plugin-postsubmits.yaml index 88f20aba93787..6bb7bd994840e 100644 --- a/ci-operator/jobs/openshift/jenkins-plugin/openshift-jenkins-plugin-postsubmits.yaml +++ b/ci-operator/jobs/openshift/jenkins-plugin/openshift-jenkins-plugin-postsubmits.yaml @@ -1,8 +1,8 @@ postsubmits: openshift/jenkins-plugin: - - name: test_branch_jenkins_plugin - agent: jenkins + - agent: jenkins + branches: + - master labels: master: ci.openshift.redhat.com - branches: - - master \ No newline at end of file + name: test_branch_jenkins_plugin diff --git a/ci-operator/jobs/openshift/jenkins-plugin/openshift-jenkins-plugin-presubmits.yaml b/ci-operator/jobs/openshift/jenkins-plugin/openshift-jenkins-plugin-presubmits.yaml index dee5e75c9f04e..31f089f9a7a94 100644 --- a/ci-operator/jobs/openshift/jenkins-plugin/openshift-jenkins-plugin-presubmits.yaml +++ b/ci-operator/jobs/openshift/jenkins-plugin/openshift-jenkins-plugin-presubmits.yaml @@ -1,10 +1,10 @@ presubmits: openshift/jenkins-plugin: - - name: test_pull_request_jenkins_plugin - agent: jenkins - labels: - master: ci.openshift.redhat.com + - agent: jenkins always_run: true context: ci/openshift-jenkins - rerun_command: "/test" - trigger: "((?m)^/test,?(\\s+|$))" \ No newline at end of file + labels: + master: ci.openshift.redhat.com + name: test_pull_request_jenkins_plugin + rerun_command: /test + trigger: ((?m)^/test,?(\s+|$)) diff --git a/ci-operator/jobs/openshift/jenkins-sync-plugin/openshift-jenkins-sync-plugin-postsubmits.yaml b/ci-operator/jobs/openshift/jenkins-sync-plugin/openshift-jenkins-sync-plugin-postsubmits.yaml index ed2e717c6b298..f8d8f4324a75f 100644 --- a/ci-operator/jobs/openshift/jenkins-sync-plugin/openshift-jenkins-sync-plugin-postsubmits.yaml +++ b/ci-operator/jobs/openshift/jenkins-sync-plugin/openshift-jenkins-sync-plugin-postsubmits.yaml @@ -1,8 +1,8 @@ postsubmits: openshift/jenkins-sync-plugin: - - name: test_branch_jenkins_sync_plugin - agent: jenkins + - agent: jenkins + branches: + - master labels: master: ci.openshift.redhat.com - branches: - - master \ No newline at end of file + name: test_branch_jenkins_sync_plugin diff --git a/ci-operator/jobs/openshift/jenkins-sync-plugin/openshift-jenkins-sync-plugin-presubmits.yaml b/ci-operator/jobs/openshift/jenkins-sync-plugin/openshift-jenkins-sync-plugin-presubmits.yaml index a0d5c38abb4a8..75a2a8393881c 100644 --- a/ci-operator/jobs/openshift/jenkins-sync-plugin/openshift-jenkins-sync-plugin-presubmits.yaml +++ b/ci-operator/jobs/openshift/jenkins-sync-plugin/openshift-jenkins-sync-plugin-presubmits.yaml @@ -1,10 +1,10 @@ presubmits: openshift/jenkins-sync-plugin: - - name: test_pull_request_jenkins_sync_plugin - agent: jenkins - labels: - master: ci.openshift.redhat.com + - agent: jenkins always_run: true context: ci/openshift-jenkins - rerun_command: "/test" - trigger: "((?m)^/test,?(\\s+|$))" \ No newline at end of file + labels: + master: ci.openshift.redhat.com + name: test_pull_request_jenkins_sync_plugin + rerun_command: /test + trigger: ((?m)^/test,?(\s+|$)) diff --git a/ci-operator/jobs/openshift/jenkins/openshift-jenkins-postsubmits.yaml b/ci-operator/jobs/openshift/jenkins/openshift-jenkins-postsubmits.yaml index 1f4a1a3bc6267..ca0a36158147c 100644 --- a/ci-operator/jobs/openshift/jenkins/openshift-jenkins-postsubmits.yaml +++ b/ci-operator/jobs/openshift/jenkins/openshift-jenkins-postsubmits.yaml @@ -1,20 +1,20 @@ postsubmits: openshift/jenkins: - - name: push_jenkins_images - agent: jenkins - labels: - master: ci.openshift.redhat.com + - agent: jenkins branches: - master - - name: push_jenkins_images_310 - agent: jenkins labels: master: ci.openshift.redhat.com + name: push_jenkins_images + - agent: jenkins branches: - openshift-3.10 - - name: test_branch_jenkins_images - agent: jenkins labels: master: ci.openshift.redhat.com + name: push_jenkins_images_310 + - agent: jenkins branches: - - master \ No newline at end of file + - master + labels: + master: ci.openshift.redhat.com + name: test_branch_jenkins_images diff --git a/ci-operator/jobs/openshift/jenkins/openshift-jenkins-presubmits.yaml b/ci-operator/jobs/openshift/jenkins/openshift-jenkins-presubmits.yaml index 125cac9bb2978..164ddd85d5370 100644 --- a/ci-operator/jobs/openshift/jenkins/openshift-jenkins-presubmits.yaml +++ b/ci-operator/jobs/openshift/jenkins/openshift-jenkins-presubmits.yaml @@ -1,45 +1,36 @@ presubmits: openshift/jenkins: - - name: test_pull_request_jenkins_images - agent: jenkins - labels: - master: ci.openshift.redhat.com + - agent: jenkins always_run: true context: ci/openshift-jenkins - rerun_command: "/test" - trigger: "((?m)^/test,?(\\s+|$))" - - name: pull-ci-jenkins-e2e-canary - agent: kubernetes - context: ci/prow/e2e + labels: + master: ci.openshift.redhat.com + name: test_pull_request_jenkins_images + rerun_command: /test + trigger: ((?m)^/test,?(\s+|$)) + - agent: kubernetes + always_run: false branches: - master - rerun_command: "/test e2e" - always_run: false - trigger: "((?m)^/test( all| e2e),?(\\s+|$))" + context: ci/prow/e2e decorate: true + name: pull-ci-jenkins-e2e-canary + rerun_command: /test e2e spec: - serviceAccountName: ci-operator - volumes: - - name: job-definition - configMap: - name: prow-job-cluster-launch-e2e-gmontero-testing - - name: cluster-profile - projected: - sources: - - secret: - name: cluster-secrets-gcp - - configMap: - name: cluster-profile-gcp containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} - volumeMounts: - - name: job-definition - mountPath: /usr/local/e2e-gcp - subPath: cluster-launch-e2e-gmontero-testing.yaml - - name: cluster-profile - mountPath: /usr/local/e2e-gcp-cluster-profile + - command: + - /bin/bash + - -c + - | + #!/bin/bash + set -e + export RPM_REPO="$( curl -q "${RPM_REPO_BASEURL_REF}" 2>/dev/null)" + ci-operator \ + --give-pr-author-access-to-namespace=true \ + --delete-when-idle=10m --dry-run=false \ + --artifact-dir=$(ARTIFACTS) \ + --secret-dir=/usr/local/e2e-gcp-cluster-profile --template=/usr/local/e2e-gcp \ + --target=e2e-gcp env: - name: PREPARE_COMMAND value: tag-in-image.sh @@ -54,38 +45,28 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-jenkins-canary key: master.json + name: ci-operator-openshift-jenkins-canary - name: RPM_REPO_BASEURL_REF value: https://storage.googleapis.com/origin-ci-test/releases/openshift/origin/master/.latest-rpms - command: - - /bin/bash - - -c - - | - #!/bin/bash - set -e - export RPM_REPO="$( curl -q "${RPM_REPO_BASEURL_REF}" 2>/dev/null)" - ci-operator \ - --give-pr-author-access-to-namespace=true \ - --delete-when-idle=10m --dry-run=false \ - --artifact-dir=$(ARTIFACTS) \ - --secret-dir=/usr/local/e2e-gcp-cluster-profile --template=/usr/local/e2e-gcp \ - --target=e2e-gcp - - name: pull-ci-jenkins-e2e-3.10-canary - agent: kubernetes - context: ci/prow/e2e - branches: - - openshift-3.10 - rerun_command: "/test e2e" - always_run: false - trigger: "((?m)^/test( all| e2e),?(\\s+|$))" - decorate: true - spec: + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + volumeMounts: + - mountPath: /usr/local/e2e-gcp + name: job-definition + subPath: cluster-launch-e2e-gmontero-testing.yaml + - mountPath: /usr/local/e2e-gcp-cluster-profile + name: cluster-profile serviceAccountName: ci-operator volumes: - - name: job-definition - configMap: + - configMap: name: prow-job-cluster-launch-e2e-gmontero-testing + name: job-definition - name: cluster-profile projected: sources: @@ -93,16 +74,25 @@ presubmits: name: cluster-secrets-gcp - configMap: name: cluster-profile-gcp + trigger: ((?m)^/test( all| e2e),?(\s+|$)) + - agent: kubernetes + always_run: false + branches: + - openshift-3.10 + context: ci/prow/e2e + decorate: true + name: pull-ci-jenkins-e2e-3.10-canary + rerun_command: /test e2e + spec: containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} - volumeMounts: - - name: job-definition - mountPath: /usr/local/e2e-gcp - subPath: cluster-launch-e2e-gmontero-testing.yaml - - name: cluster-profile - mountPath: /usr/local/e2e-gcp-cluster-profile + - command: + - /bin/bash + - -c + - "#!/bin/bash\nset -e\nexport RPM_REPO=\"$( curl -q \"${RPM_REPO_BASEURL_REF}\" + 2>/dev/null)\"\nci-operator \\\n --give-pr-author-access-to-namespace=true + \\\n --delete-when-idle=10m --dry-run=false \\\n --artifact-dir=$(ARTIFACTS) + \\\n --secret-dir=/usr/local/e2e-gcp-cluster-profile --template=/usr/local/e2e-gcp + \\\n --target=e2e-gcp " env: - name: PREPARE_COMMAND value: tag-in-image.sh @@ -117,20 +107,33 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-jenkins-canary key: openshift-3.10.json + name: ci-operator-openshift-jenkins-canary - name: RPM_REPO_BASEURL_REF value: https://storage.googleapis.com/origin-ci-test/releases/openshift/origin/master/.latest-rpms - command: - - /bin/bash - - -c - - | - #!/bin/bash - set -e - export RPM_REPO="$( curl -q "${RPM_REPO_BASEURL_REF}" 2>/dev/null)" - ci-operator \ - --give-pr-author-access-to-namespace=true \ - --delete-when-idle=10m --dry-run=false \ - --artifact-dir=$(ARTIFACTS) \ - --secret-dir=/usr/local/e2e-gcp-cluster-profile --template=/usr/local/e2e-gcp \ - --target=e2e-gcp \ No newline at end of file + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + volumeMounts: + - mountPath: /usr/local/e2e-gcp + name: job-definition + subPath: cluster-launch-e2e-gmontero-testing.yaml + - mountPath: /usr/local/e2e-gcp-cluster-profile + name: cluster-profile + serviceAccountName: ci-operator + volumes: + - configMap: + name: prow-job-cluster-launch-e2e-gmontero-testing + name: job-definition + - name: cluster-profile + projected: + sources: + - secret: + name: cluster-secrets-gcp + - configMap: + name: cluster-profile-gcp + trigger: ((?m)^/test( all| e2e),?(\s+|$)) diff --git a/ci-operator/jobs/openshift/kube-rbac-proxy/openshift-kube-rbac-proxy-postsubmits.yaml b/ci-operator/jobs/openshift/kube-rbac-proxy/openshift-kube-rbac-proxy-postsubmits.yaml index f6e5e4a30537b..6e638651208d7 100644 --- a/ci-operator/jobs/openshift/kube-rbac-proxy/openshift-kube-rbac-proxy-postsubmits.yaml +++ b/ci-operator/jobs/openshift/kube-rbac-proxy/openshift-kube-rbac-proxy-postsubmits.yaml @@ -1,28 +1,32 @@ postsubmits: openshift/kube-rbac-proxy: - - name: branch-ci-openshift-kube-rbac-proxy-images - agent: kubernetes - labels: - artifacts: images + - agent: kubernetes branches: - openshift-master decorate: true + labels: + artifacts: images + name: branch-ci-openshift-kube-rbac-proxy-images skip_cloning: true spec: - serviceAccountName: ci-operator containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + - args: + - --artifact-dir=$(ARTIFACTS) + - --target=[images] + - --promote + command: + - ci-operator env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-kube-rbac-proxy key: master.json - command: - - ci-operator - args: - - --artifact-dir=$(ARTIFACTS) - - --target=[images] - - --promote \ No newline at end of file + name: ci-operator-openshift-kube-rbac-proxy + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + serviceAccountName: ci-operator diff --git a/ci-operator/jobs/openshift/kube-state-metrics/openshift-kube-state-metrics-postsubmits.yaml b/ci-operator/jobs/openshift/kube-state-metrics/openshift-kube-state-metrics-postsubmits.yaml index 735267fee3943..071aab000fdf2 100644 --- a/ci-operator/jobs/openshift/kube-state-metrics/openshift-kube-state-metrics-postsubmits.yaml +++ b/ci-operator/jobs/openshift/kube-state-metrics/openshift-kube-state-metrics-postsubmits.yaml @@ -1,28 +1,32 @@ postsubmits: openshift/kube-state-metrics: - - name: branch-ci-openshift-kube-state-metrics-images - agent: kubernetes - labels: - artifacts: images + - agent: kubernetes branches: - openshift-master decorate: true + labels: + artifacts: images + name: branch-ci-openshift-kube-state-metrics-images skip_cloning: true spec: - serviceAccountName: ci-operator containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + - args: + - --artifact-dir=$(ARTIFACTS) + - --target=[images] + - --promote + command: + - ci-operator env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-kube-state-metrics key: master.json - command: - - ci-operator - args: - - --artifact-dir=$(ARTIFACTS) - - --target=[images] - - --promote \ No newline at end of file + name: ci-operator-openshift-kube-state-metrics + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + serviceAccountName: ci-operator diff --git a/ci-operator/jobs/openshift/kubernetes-autoscaler/openshift-kubernetes-autoscaler-postsubmits.yaml b/ci-operator/jobs/openshift/kubernetes-autoscaler/openshift-kubernetes-autoscaler-postsubmits.yaml index 8ade308878165..1cf0d37ac4c56 100644 --- a/ci-operator/jobs/openshift/kubernetes-autoscaler/openshift-kubernetes-autoscaler-postsubmits.yaml +++ b/ci-operator/jobs/openshift/kubernetes-autoscaler/openshift-kubernetes-autoscaler-postsubmits.yaml @@ -1,54 +1,62 @@ postsubmits: openshift/kubernetes-autoscaler: - - name: branch-ci-kubernetes-autoscaler-images - agent: kubernetes - labels: - artifacts: images + - agent: kubernetes branches: - master decorate: true + labels: + artifacts: images + name: branch-ci-kubernetes-autoscaler-images skip_cloning: true spec: - serviceAccountName: ci-operator containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + - args: + - --artifact-dir=$(ARTIFACTS) + - --target=[images] + - --promote + command: + - ci-operator env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-kubernetes-autoscaler key: master.json - command: - - ci-operator - args: - - --artifact-dir=$(ARTIFACTS) - - --target=[images] - - --promote - - name: branch-ci-kubernetes-autoscaler-images-3.10 - agent: kubernetes - labels: - artifacts: images + name: ci-operator-kubernetes-autoscaler + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + serviceAccountName: ci-operator + - agent: kubernetes branches: - release-3.10 decorate: true + labels: + artifacts: images + name: branch-ci-kubernetes-autoscaler-images-3.10 skip_cloning: true spec: - serviceAccountName: ci-operator containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + - args: + - --artifact-dir=$(ARTIFACTS) + - --target=[images] + - --promote + command: + - ci-operator env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-kubernetes-autoscaler key: release-3.10.json - command: - - ci-operator - args: - - --artifact-dir=$(ARTIFACTS) - - --target=[images] - - --promote \ No newline at end of file + name: ci-operator-kubernetes-autoscaler + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + serviceAccountName: ci-operator diff --git a/ci-operator/jobs/openshift/kubernetes-autoscaler/openshift-kubernetes-autoscaler-presubmits.yaml b/ci-operator/jobs/openshift/kubernetes-autoscaler/openshift-kubernetes-autoscaler-presubmits.yaml index f5257053e18b8..eb52ca93641d8 100644 --- a/ci-operator/jobs/openshift/kubernetes-autoscaler/openshift-kubernetes-autoscaler-presubmits.yaml +++ b/ci-operator/jobs/openshift/kubernetes-autoscaler/openshift-kubernetes-autoscaler-presubmits.yaml @@ -1,58 +1,66 @@ presubmits: openshift/kubernetes-autoscaler: - - name: pull-ci-kubernetes-autoscaler-unit - agent: kubernetes - context: ci/prow/unit + - agent: kubernetes + always_run: true branches: - master - rerun_command: "/test unit" - always_run: true - trigger: "((?m)^/test( all| unit),?(\\s+|$))" + context: ci/prow/unit decorate: true + name: pull-ci-kubernetes-autoscaler-unit + rerun_command: /test unit skip_cloning: true spec: - serviceAccountName: ci-operator containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + - args: + - --artifact-dir=$(ARTIFACTS) + - --target=unit + - --target=[images] + command: + - ci-operator env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-kubernetes-autoscaler key: master.json - command: - - ci-operator - args: - - --artifact-dir=$(ARTIFACTS) - - --target=unit - - --target=[images] - - name: pull-ci-kubernetes-autoscaler-unit-3.10 - agent: kubernetes - context: ci/prow/unit + name: ci-operator-kubernetes-autoscaler + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + serviceAccountName: ci-operator + trigger: ((?m)^/test( all| unit),?(\s+|$)) + - agent: kubernetes + always_run: true branches: - release-3.10 - rerun_command: "/test unit" - always_run: true - trigger: "((?m)^/test( all| unit),?(\\s+|$))" + context: ci/prow/unit decorate: true + name: pull-ci-kubernetes-autoscaler-unit-3.10 + rerun_command: /test unit skip_cloning: true spec: - serviceAccountName: ci-operator containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + - args: + - --artifact-dir=$(ARTIFACTS) + - --target=unit + - --target=[images] + command: + - ci-operator env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-kubernetes-autoscaler key: release-3.10.json - command: - - ci-operator - args: - - --artifact-dir=$(ARTIFACTS) - - --target=unit - - --target=[images] \ No newline at end of file + name: ci-operator-kubernetes-autoscaler + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + serviceAccountName: ci-operator + trigger: ((?m)^/test( all| unit),?(\s+|$)) diff --git a/ci-operator/jobs/openshift/kubernetes-metrics-server/openshift-kubernetes-metrics-server-postsubmits.yaml b/ci-operator/jobs/openshift/kubernetes-metrics-server/openshift-kubernetes-metrics-server-postsubmits.yaml index b0d76c8e5c8d5..0e79a7a01ea54 100644 --- a/ci-operator/jobs/openshift/kubernetes-metrics-server/openshift-kubernetes-metrics-server-postsubmits.yaml +++ b/ci-operator/jobs/openshift/kubernetes-metrics-server/openshift-kubernetes-metrics-server-postsubmits.yaml @@ -1,54 +1,62 @@ postsubmits: openshift/kubernetes-metrics-server: - - name: branch-ci-kubernetes-metrics-server-images - agent: kubernetes - labels: - artifacts: images + - agent: kubernetes branches: - master decorate: true + labels: + artifacts: images + name: branch-ci-kubernetes-metrics-server-images skip_cloning: true spec: - serviceAccountName: ci-operator containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + - args: + - --artifact-dir=$(ARTIFACTS) + - --target=[images] + - --promote + command: + - ci-operator env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-kubernetes-metrics-server key: master.json - command: - - ci-operator - args: - - --artifact-dir=$(ARTIFACTS) - - --target=[images] - - --promote - - name: branch-ci-kubernetes-metrics-server-images-3.10 - agent: kubernetes - labels: - artifacts: images + name: ci-operator-kubernetes-metrics-server + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + serviceAccountName: ci-operator + - agent: kubernetes branches: - release-3.10 decorate: true + labels: + artifacts: images + name: branch-ci-kubernetes-metrics-server-images-3.10 skip_cloning: true spec: - serviceAccountName: ci-operator containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + - args: + - --artifact-dir=$(ARTIFACTS) + - --target=[images] + - --promote + command: + - ci-operator env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-kubernetes-metrics-server key: release-3.10.json - command: - - ci-operator - args: - - --artifact-dir=$(ARTIFACTS) - - --target=[images] - - --promote \ No newline at end of file + name: ci-operator-kubernetes-metrics-server + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + serviceAccountName: ci-operator diff --git a/ci-operator/jobs/openshift/kubernetes-metrics-server/openshift-kubernetes-metrics-server-presubmits.yaml b/ci-operator/jobs/openshift/kubernetes-metrics-server/openshift-kubernetes-metrics-server-presubmits.yaml index bad39a0ab555b..12da2d2171b3c 100644 --- a/ci-operator/jobs/openshift/kubernetes-metrics-server/openshift-kubernetes-metrics-server-presubmits.yaml +++ b/ci-operator/jobs/openshift/kubernetes-metrics-server/openshift-kubernetes-metrics-server-presubmits.yaml @@ -1,58 +1,66 @@ presubmits: openshift/kubernetes-metrics-server: - - name: pull-ci-kubernetes-metrics-server-unit - agent: kubernetes - context: ci/prow/unit + - agent: kubernetes + always_run: true branches: - master - rerun_command: "/test unit" - always_run: true - trigger: "((?m)^/test( all| unit),?(\\s+|$))" + context: ci/prow/unit decorate: true + name: pull-ci-kubernetes-metrics-server-unit + rerun_command: /test unit skip_cloning: true spec: - serviceAccountName: ci-operator containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + - args: + - --artifact-dir=$(ARTIFACTS) + - --target=unit + - --target=[images] + command: + - ci-operator env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-kubernetes-metrics-server key: master.json - command: - - ci-operator - args: - - --artifact-dir=$(ARTIFACTS) - - --target=unit - - --target=[images] - - name: pull-ci-kubernetes-metrics-server-unit-3.10 - agent: kubernetes - context: ci/prow/unit + name: ci-operator-kubernetes-metrics-server + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + serviceAccountName: ci-operator + trigger: ((?m)^/test( all| unit),?(\s+|$)) + - agent: kubernetes + always_run: true branches: - release-3.10 - rerun_command: "/test unit" - always_run: true - trigger: "((?m)^/test( all| unit),?(\\s+|$))" + context: ci/prow/unit decorate: true + name: pull-ci-kubernetes-metrics-server-unit-3.10 + rerun_command: /test unit skip_cloning: true spec: - serviceAccountName: ci-operator containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + - args: + - --artifact-dir=$(ARTIFACTS) + - --target=unit + - --target=[images] + command: + - ci-operator env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-kubernetes-metrics-server key: release-3.10.json - command: - - ci-operator - args: - - --artifact-dir=$(ARTIFACTS) - - --target=unit - - --target=[images] \ No newline at end of file + name: ci-operator-kubernetes-metrics-server + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + serviceAccountName: ci-operator + trigger: ((?m)^/test( all| unit),?(\s+|$)) diff --git a/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-postsubmits.yaml b/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-postsubmits.yaml index bfd73281377ea..306f75ff12b5f 100644 --- a/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-postsubmits.yaml +++ b/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-postsubmits.yaml @@ -1,29 +1,32 @@ ---- postsubmits: openshift/machine-api-operator: - - name: branch-ci-openshift-machine-api-operator - agent: kubernetes - labels: - artifacts: images + - agent: kubernetes branches: - master decorate: true + labels: + artifacts: images + name: branch-ci-openshift-machine-api-operator skip_cloning: true spec: - serviceAccountName: ci-operator containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + - args: + - --artifact-dir=$(ARTIFACTS) + - --target=[images] + - --promote + command: + - ci-operator env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-machine-api-operator key: master.json - command: - - ci-operator - args: - - --artifact-dir=$(ARTIFACTS) - - --target=[images] - - --promote + name: ci-operator-openshift-machine-api-operator + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + serviceAccountName: ci-operator diff --git a/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-presubmits.yaml b/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-presubmits.yaml index e0467cf897c5c..8763bcb5015c4 100644 --- a/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-presubmits.yaml +++ b/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-presubmits.yaml @@ -1,64 +1,72 @@ ---- presubmits: openshift/machine-api-operator: - - name: pull-ci-openshift-machine-api-operator-unit - agent: kubernetes - context: ci/prow/unit + - agent: kubernetes + always_run: true branches: - master - rerun_command: "/test unit" - always_run: true - trigger: "((?m)^/test( all| unit),?(\\s+|$))" + context: ci/prow/unit decorate: true + name: pull-ci-openshift-machine-api-operator-unit + rerun_command: /test unit skip_cloning: true spec: - serviceAccountName: ci-operator containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + - args: + - --artifact-dir=$(ARTIFACTS) + - --target=unit + command: + - ci-operator env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-machine-api-operator key: master.json - command: - - ci-operator - args: - - --artifact-dir=$(ARTIFACTS) - - --target=unit - - name: pull-ci-openshift-machine-api-operator-images - agent: kubernetes - context: ci/prow/images + name: ci-operator-openshift-machine-api-operator + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + serviceAccountName: ci-operator + trigger: ((?m)^/test( all| unit),?(\s+|$)) + - agent: kubernetes + always_run: true branches: - master - rerun_command: "/test images" - always_run: true - trigger: "((?m)^/test( all| images),?(\\s+|$))" + context: ci/prow/images decorate: true + name: pull-ci-openshift-machine-api-operator-images + rerun_command: /test images skip_cloning: true spec: - serviceAccountName: ci-operator containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + - args: + - --artifact-dir=$(ARTIFACTS) + - --target=[images] + command: + - ci-operator env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-machine-api-operator key: master.json - command: - - ci-operator - args: - - --artifact-dir=$(ARTIFACTS) - - --target=[images] - - name: ci-kubernetes-machine-api-operator - agent: jenkins + name: ci-operator-openshift-machine-api-operator + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + serviceAccountName: ci-operator + trigger: ((?m)^/test( all| images),?(\s+|$)) + - agent: jenkins + always_run: false + context: ci/jenkins/e2e labels: master: ci.openshift.redhat.com - context: ci/jenkins/e2e - rerun_command: "/test e2e" - trigger: "((?m)^/test( all| e2e),?(\\s+|$))" + name: ci-kubernetes-machine-api-operator + rerun_command: /test e2e + trigger: ((?m)^/test( all| e2e),?(\s+|$)) diff --git a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-postsubmits.yaml b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-postsubmits.yaml index 0117e42e1a991..7381799ed4171 100644 --- a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-postsubmits.yaml +++ b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-postsubmits.yaml @@ -1,28 +1,32 @@ postsubmits: openshift/machine-config-operator: - - name: branch-ci-openshift-machine-config-operator-images - agent: kubernetes - labels: - artifacts: images + - agent: kubernetes branches: - master decorate: true + labels: + artifacts: images + name: branch-ci-openshift-machine-config-operator-images skip_cloning: true spec: - serviceAccountName: ci-operator containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + - args: + - --artifact-dir=$(ARTIFACTS) + - --target=[images] + - --promote + command: + - ci-operator env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-machine-config-operator key: master.json - command: - - ci-operator - args: - - --artifact-dir=$(ARTIFACTS) - - --target=[images] - - --promote + name: ci-operator-openshift-machine-config-operator + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + serviceAccountName: ci-operator diff --git a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-presubmits.yaml b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-presubmits.yaml index 68b976185a4dc..c338fbc426283 100644 --- a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-presubmits.yaml +++ b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-presubmits.yaml @@ -1,30 +1,34 @@ presubmits: openshift/machine-config-operator: - - name: pull-ci-openshift-machine-config-operator-unit - agent: kubernetes - context: ci/prow/unit + - agent: kubernetes + always_run: true branches: - master - rerun_command: "/test unit" - always_run: true - trigger: "((?m)^/test( all| unit),?(\\s+|$))" + context: ci/prow/unit decorate: true + name: pull-ci-openshift-machine-config-operator-unit + rerun_command: /test unit skip_cloning: true spec: - serviceAccountName: ci-operator containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + - args: + - --artifact-dir=$(ARTIFACTS) + - --target=unit + - --target=[images] + command: + - ci-operator env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-machine-config-operator key: master.json - command: - - ci-operator - args: - - --artifact-dir=$(ARTIFACTS) - - --target=unit - - --target=[images] + name: ci-operator-openshift-machine-config-operator + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + serviceAccountName: ci-operator + trigger: ((?m)^/test( all| unit),?(\s+|$)) diff --git a/ci-operator/jobs/openshift/online-console-extensions/openshift-online-console-extensions-postsubmits.yaml b/ci-operator/jobs/openshift/online-console-extensions/openshift-online-console-extensions-postsubmits.yaml index 36035564ecf62..ce6e416c2f960 100644 --- a/ci-operator/jobs/openshift/online-console-extensions/openshift-online-console-extensions-postsubmits.yaml +++ b/ci-operator/jobs/openshift/online-console-extensions/openshift-online-console-extensions-postsubmits.yaml @@ -1,8 +1,8 @@ postsubmits: openshift/online-console-extensions: - - name: test_branch_online_console_extensions - agent: jenkins + - agent: jenkins + branches: + - master labels: master: ci.openshift.redhat.com - branches: - - master \ No newline at end of file + name: test_branch_online_console_extensions diff --git a/ci-operator/jobs/openshift/online-console-extensions/openshift-online-console-extensions-presubmits.yaml b/ci-operator/jobs/openshift/online-console-extensions/openshift-online-console-extensions-presubmits.yaml index 6dbc513ca3e67..adf903381a39f 100644 --- a/ci-operator/jobs/openshift/online-console-extensions/openshift-online-console-extensions-presubmits.yaml +++ b/ci-operator/jobs/openshift/online-console-extensions/openshift-online-console-extensions-presubmits.yaml @@ -1,10 +1,10 @@ presubmits: openshift/online-console-extensions: - - name: test_pull_request_online_console_extensions - agent: jenkins - labels: - master: ci.openshift.redhat.com + - agent: jenkins always_run: true context: ci/openshift-jenkins - rerun_command: "/test" - trigger: "((?m)^/test,?(\\s+|$))" \ No newline at end of file + labels: + master: ci.openshift.redhat.com + name: test_pull_request_online_console_extensions + rerun_command: /test + trigger: ((?m)^/test,?(\s+|$)) diff --git a/ci-operator/jobs/openshift/online-hibernation/openshift-online-hibernation-postsubmits.yaml b/ci-operator/jobs/openshift/online-hibernation/openshift-online-hibernation-postsubmits.yaml index 6f42bd6181873..015f5c5b1ed05 100644 --- a/ci-operator/jobs/openshift/online-hibernation/openshift-online-hibernation-postsubmits.yaml +++ b/ci-operator/jobs/openshift/online-hibernation/openshift-online-hibernation-postsubmits.yaml @@ -1,10 +1,10 @@ postsubmits: openshift/online-hibernation: - - name: test_branch_online_hibernation_unit - agent: jenkins - labels: - master: ci.openshift.redhat.com + - agent: jenkins branches: - master - prod - - stage \ No newline at end of file + - stage + labels: + master: ci.openshift.redhat.com + name: test_branch_online_hibernation_unit diff --git a/ci-operator/jobs/openshift/online-hibernation/openshift-online-hibernation-presubmits.yaml b/ci-operator/jobs/openshift/online-hibernation/openshift-online-hibernation-presubmits.yaml index 1ce975a0ed0ed..98c057f5bdb7e 100644 --- a/ci-operator/jobs/openshift/online-hibernation/openshift-online-hibernation-presubmits.yaml +++ b/ci-operator/jobs/openshift/online-hibernation/openshift-online-hibernation-presubmits.yaml @@ -1,10 +1,10 @@ presubmits: openshift/online-hibernation: - - name: test_pull_request_online_hibernation_unit - agent: jenkins - labels: - master: ci.openshift.redhat.com + - agent: jenkins always_run: false context: ci/openshift-jenkins/unit - rerun_command: "/test" - trigger: "((?m)^/test,?(\\s+|$))" \ No newline at end of file + labels: + master: ci.openshift.redhat.com + name: test_pull_request_online_hibernation_unit + rerun_command: /test + trigger: ((?m)^/test,?(\s+|$)) diff --git a/ci-operator/jobs/openshift/online-registration/openshift-online-registration-presubmits.yaml b/ci-operator/jobs/openshift/online-registration/openshift-online-registration-presubmits.yaml index 5f5b193ab5f5e..e91bdab2c7ef9 100644 --- a/ci-operator/jobs/openshift/online-registration/openshift-online-registration-presubmits.yaml +++ b/ci-operator/jobs/openshift/online-registration/openshift-online-registration-presubmits.yaml @@ -1,10 +1,10 @@ presubmits: openshift/online-registration: - - name: test_pull_request_online_registration - agent: jenkins - labels: - master: ci.dev.openshift.redhat.com + - agent: jenkins always_run: true context: ci/openshift-jenkins - rerun_command: "/test" - trigger: "((?m)^/test,?(\\s+|$))" \ No newline at end of file + labels: + master: ci.dev.openshift.redhat.com + name: test_pull_request_online_registration + rerun_command: /test + trigger: ((?m)^/test,?(\s+|$)) diff --git a/ci-operator/jobs/openshift/openshift-ansible/openshift-openshift-ansible-postsubmits.yaml b/ci-operator/jobs/openshift/openshift-ansible/openshift-openshift-ansible-postsubmits.yaml index ea65e8c2140c7..46271e21a5ecc 100644 --- a/ci-operator/jobs/openshift/openshift-ansible/openshift-openshift-ansible-postsubmits.yaml +++ b/ci-operator/jobs/openshift/openshift-ansible/openshift-openshift-ansible-postsubmits.yaml @@ -1,144 +1,152 @@ postsubmits: openshift/openshift-ansible: - - name: branch-ci-openshift-openshift-ansible-images - agent: kubernetes - labels: - artifacts: images + - agent: kubernetes branches: - master decorate: true + labels: + artifacts: images + name: branch-ci-openshift-openshift-ansible-images skip_cloning: true spec: - serviceAccountName: ci-operator containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + - command: + - ci-operator + - --artifact-dir=$(ARTIFACTS) + - --target=[images] + - --promote env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-openshift-ansible key: master.json - command: - - ci-operator - - --artifact-dir=$(ARTIFACTS) - - --target=[images] - - --promote - - name: branch-ci-openshift-openshift-ansible-images - agent: kubernetes - labels: - artifacts: images + name: ci-operator-openshift-openshift-ansible + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + serviceAccountName: ci-operator + - agent: kubernetes branches: - release-3.10 decorate: true + labels: + artifacts: images + name: branch-ci-openshift-openshift-ansible-images skip_cloning: true spec: - serviceAccountName: ci-operator containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + - command: + - ci-operator + - --artifact-dir=$(ARTIFACTS) + - --target=[images] + - --promote env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-openshift-ansible key: release-3.10.json - command: - - ci-operator - - --artifact-dir=$(ARTIFACTS) - - --target=[images] - - --promote - - name: test_branch_openshift_ansible_extended_conformance_gce_37 - agent: jenkins - labels: - master: ci.openshift.redhat.com + name: ci-operator-openshift-openshift-ansible + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + serviceAccountName: ci-operator + - agent: jenkins branches: - release-3.7 - - name: test_branch_openshift_ansible_extended_conformance_gce_39 - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_branch_openshift_ansible_extended_conformance_gce_37 + - agent: jenkins branches: - release-3.9 - - name: test_branch_openshift_ansible_extended_conformance_gce_310 - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_branch_openshift_ansible_extended_conformance_gce_39 + - agent: jenkins branches: - release-3.10 - - name: test_branch_openshift_ansible_extended_conformance_gce - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_branch_openshift_ansible_extended_conformance_gce_310 + - agent: jenkins branches: - master - stage - - name: test_branch_openshift_ansible_extended_conformance_azure - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_branch_openshift_ansible_extended_conformance_gce + - agent: jenkins branches: - master - stage - - name: test_branch_openshift_ansible_extended_conformance_azure_310 - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_branch_openshift_ansible_extended_conformance_azure + - agent: jenkins branches: - release-3.10 - - name: test_branch_openshift_ansible_logging - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_branch_openshift_ansible_extended_conformance_azure_310 + - agent: jenkins branches: - master - - name: test_branch_openshift_ansible_logging_310 - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_branch_openshift_ansible_logging + - agent: jenkins branches: - release-3.10 - - name: test_branch_openshift_ansible_logging_json_file - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_branch_openshift_ansible_logging_310 + - agent: jenkins branches: - master - - name: test_branch_origin_extended_conformance_install_containerized - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_branch_openshift_ansible_logging_json_file + - agent: jenkins branches: - master - - name: test_branch_origin_extended_conformance_install_containerized_310 - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_branch_origin_extended_conformance_install_containerized + - agent: jenkins branches: - release-3.10 - - name: test_branch_origin_extended_conformance_install_in_tree - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_branch_origin_extended_conformance_install_containerized_310 + - agent: jenkins branches: - master - - name: test_branch_origin_extended_conformance_install_in_tree_310 - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_branch_origin_extended_conformance_install_in_tree + - agent: jenkins branches: - release-3.10 - - name: test_branch_origin_extended_conformance_install_update_containerized - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_branch_origin_extended_conformance_install_in_tree_310 + - agent: jenkins branches: - master - - name: test_branch_origin_extended_conformance_install_update_containerized_310 - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_branch_origin_extended_conformance_install_update_containerized + - agent: jenkins branches: - release-3.10 + labels: + master: ci.openshift.redhat.com + name: test_branch_origin_extended_conformance_install_update_containerized_310 diff --git a/ci-operator/jobs/openshift/openshift-ansible/openshift-openshift-ansible-presubmits.yaml b/ci-operator/jobs/openshift/openshift-ansible/openshift-openshift-ansible-presubmits.yaml index 055f1be489ad9..6a06a6f3929e9 100644 --- a/ci-operator/jobs/openshift/openshift-ansible/openshift-openshift-ansible-presubmits.yaml +++ b/ci-operator/jobs/openshift/openshift-ansible/openshift-openshift-ansible-presubmits.yaml @@ -1,166 +1,152 @@ presubmits: openshift/openshift-ansible: - - name: pull-ci-openshift-openshift-ansible-unit - agent: kubernetes - context: ci/prow/unit + - agent: kubernetes + always_run: true branches: - master - dockerless-build-temporary - rerun_command: "/test unit" - always_run: true - trigger: "((?m)^/test( all| unit| tox),?(\\s+|$))" + context: ci/prow/unit decorate: true + name: pull-ci-openshift-openshift-ansible-unit + rerun_command: /test unit skip_cloning: true spec: - serviceAccountName: ci-operator containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + - args: + - --artifact-dir=$(ARTIFACTS) + - --target=unit + - --target=[images] + command: + - ci-operator env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-openshift-ansible key: master.json + name: ci-operator-openshift-openshift-ansible - name: HOME value: /tmp/home - command: - - ci-operator - args: - - --artifact-dir=$(ARTIFACTS) - - --target=unit - - --target=[images] - - - name: test_pull_request_openshift_ansible_tox_310 - agent: jenkins - labels: - master: ci.openshift.redhat.com + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + serviceAccountName: ci-operator + trigger: ((?m)^/test( all| unit| tox),?(\s+|$)) + - agent: jenkins always_run: true - context: ci/openshift-jenkins/tox - rerun_command: "/test tox" - trigger: "((?m)^/test( all| tox),?(\\s+|$))" branches: - release-3.10 - release-3.9 - release-3.7 - - - name: test_pull_request_openshift_ansible_logging - agent: jenkins + context: ci/openshift-jenkins/tox labels: master: ci.openshift.redhat.com - skip_report: false + name: test_pull_request_openshift_ansible_tox_310 + rerun_command: /test tox + trigger: ((?m)^/test( all| tox),?(\s+|$)) + - agent: jenkins + always_run: false branches: - - master - - stage - - es5.x + - master + - stage + - es5.x context: ci/openshift-jenkins/logging - run_if_changed: "^roles/openshift_logging.*|playbooks/openshift-logging/.*" - rerun_command: "/test logging" - trigger: "((?m)^/test( all| logging),?(\\s+|$))" - - - name: test_pull_request_openshift_ansible_logging_310 - agent: jenkins labels: master: ci.openshift.redhat.com - skip_report: false + name: test_pull_request_openshift_ansible_logging + rerun_command: /test logging + run_if_changed: ^roles/openshift_logging.*|playbooks/openshift-logging/.* + trigger: ((?m)^/test( all| logging),?(\s+|$)) + - agent: jenkins + always_run: false branches: - - release-3.10 + - release-3.10 context: ci/openshift-jenkins/logging - rerun_command: "/test logging" - run_if_changed: "^roles/openshift_logging.*|playbooks/openshift-logging/.*" - trigger: "((?m)^/test( all| logging),?(\\s+|$))" - - - name: test_pull_request_openshift_ansible_logging_39 - agent: jenkins labels: master: ci.openshift.redhat.com - skip_report: false + name: test_pull_request_openshift_ansible_logging_310 + rerun_command: /test logging + run_if_changed: ^roles/openshift_logging.*|playbooks/openshift-logging/.* + trigger: ((?m)^/test( all| logging),?(\s+|$)) + - agent: jenkins + always_run: false branches: - - release-3.9 + - release-3.9 context: ci/openshift-jenkins/logging - rerun_command: "/test logging" - run_if_changed: "^roles/openshift_logging.*|playbooks/openshift-logging/.*" - trigger: "((?m)^/test( all| logging),?(\\s+|$))" - - - name: test_pull_request_openshift_ansible_logging_37 - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_pull_request_openshift_ansible_logging_39 + rerun_command: /test logging + run_if_changed: ^roles/openshift_logging.*|playbooks/openshift-logging/.* + trigger: ((?m)^/test( all| logging),?(\s+|$)) + - agent: jenkins + always_run: false branches: - - release-3.7 + - release-3.7 context: ci/openshift-jenkins/logging - rerun_command: "/test logging" - run_if_changed: "^roles/openshift_logging.*|playbooks/.+/openshift-cluster/openshift.logging.*" - trigger: "((?m)^/test( all| logging),?(\\s+|$))" - - - name: test_pull_request_openshift_ansible_logging_36 - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_pull_request_openshift_ansible_logging_37 + rerun_command: /test logging + run_if_changed: ^roles/openshift_logging.*|playbooks/.+/openshift-cluster/openshift.logging.* + trigger: ((?m)^/test( all| logging),?(\s+|$)) + - agent: jenkins + always_run: false branches: - - release-3.6 + - release-3.6 context: ci/openshift-jenkins/logging - rerun_command: "/test logging" - run_if_changed: "^roles/openshift_logging.*|playbooks/.+/openshift-cluster/openshift.logging.*" - trigger: "((?m)^/test( all| logging),?(\\s+|$))" - - - name: test_pull_request_openshift_ansible_extended_conformance_gce_37 - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_pull_request_openshift_ansible_logging_36 + rerun_command: /test logging + run_if_changed: ^roles/openshift_logging.*|playbooks/.+/openshift-cluster/openshift.logging.* + trigger: ((?m)^/test( all| logging),?(\s+|$)) + - agent: jenkins always_run: true - context: ci/openshift-jenkins/gcp - rerun_command: "/test gcp" - trigger: "((?m)^/test( all| gcp),?(\\s+|$))" branches: - release-3.7 - - - name: test_pull_request_openshift_ansible_extended_conformance_gce_39 - agent: jenkins + context: ci/openshift-jenkins/gcp labels: master: ci.openshift.redhat.com + name: test_pull_request_openshift_ansible_extended_conformance_gce_37 + rerun_command: /test gcp + trigger: ((?m)^/test( all| gcp),?(\s+|$)) + - agent: jenkins always_run: true - context: ci/openshift-jenkins/gcp - rerun_command: "/test gcp" - trigger: "((?m)^/test( all| gcp),?(\\s+|$))" branches: - release-3.9 - - - name: pull-ci-openshift-openshift-ansible-e2e-gcp - agent: kubernetes - context: ci/prow/gcp + context: ci/openshift-jenkins/gcp + labels: + master: ci.openshift.redhat.com + name: test_pull_request_openshift_ansible_extended_conformance_gce_39 + rerun_command: /test gcp + trigger: ((?m)^/test( all| gcp),?(\s+|$)) + - agent: kubernetes + always_run: true branches: - master - dockerless-build-temporary - rerun_command: "/test gcp" - always_run: true - trigger: "((?m)^/test( all| gcp),?(\\s+|$))" + context: ci/prow/gcp decorate: true + name: pull-ci-openshift-openshift-ansible-e2e-gcp + rerun_command: /test gcp skip_cloning: true spec: - serviceAccountName: ci-operator - volumes: - - name: job-definition - configMap: - name: prow-job-cluster-launch-e2e - - name: cluster-profile - projected: - sources: - - secret: - name: cluster-secrets-gcp - - configMap: - name: cluster-profile-gcp containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} - volumeMounts: - - name: job-definition - mountPath: /usr/local/e2e-gcp - subPath: cluster-launch-e2e.yaml - - name: cluster-profile - mountPath: /usr/local/e2e-gcp-cluster-profile + - command: + - /bin/bash + - -c + - | + #!/bin/bash + set -e + export RPM_REPO="$( curl -q "${RPM_REPO_BASEURL_REF}" 2>/dev/null)" + ci-operator \ + --artifact-dir=$(ARTIFACTS) \ + --secret-dir=/usr/local/e2e-gcp-cluster-profile --template=/usr/local/e2e-gcp \ + --target=e2e-gcp env: - name: TEST_FOCUS value: Suite:openshift/conformance/parallel @@ -171,38 +157,28 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-openshift-ansible key: master.json + name: ci-operator-openshift-openshift-ansible - name: RPM_REPO_BASEURL_REF value: https://storage.googleapis.com/origin-ci-test/releases/openshift/origin/master/.latest-rpms - command: - - /bin/bash - - -c - - | - #!/bin/bash - set -e - export RPM_REPO="$( curl -q "${RPM_REPO_BASEURL_REF}" 2>/dev/null)" - ci-operator \ - --artifact-dir=$(ARTIFACTS) \ - --secret-dir=/usr/local/e2e-gcp-cluster-profile --template=/usr/local/e2e-gcp \ - --target=e2e-gcp - - - name: pull-ci-openshift-openshift-ansible-e2e-gcp-310 - agent: kubernetes - context: ci/prow/gcp - branches: - - release-3.10 - rerun_command: "/test gcp" - always_run: true - trigger: "((?m)^/test( all| gcp),?(\\s+|$))" - decorate: true - skip_cloning: true - spec: + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + volumeMounts: + - mountPath: /usr/local/e2e-gcp + name: job-definition + subPath: cluster-launch-e2e.yaml + - mountPath: /usr/local/e2e-gcp-cluster-profile + name: cluster-profile serviceAccountName: ci-operator volumes: - - name: job-definition - configMap: + - configMap: name: prow-job-cluster-launch-e2e + name: job-definition - name: cluster-profile projected: sources: @@ -210,16 +186,29 @@ presubmits: name: cluster-secrets-gcp - configMap: name: cluster-profile-gcp + trigger: ((?m)^/test( all| gcp),?(\s+|$)) + - agent: kubernetes + always_run: true + branches: + - release-3.10 + context: ci/prow/gcp + decorate: true + name: pull-ci-openshift-openshift-ansible-e2e-gcp-310 + rerun_command: /test gcp + skip_cloning: true + spec: containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} - volumeMounts: - - name: job-definition - mountPath: /usr/local/e2e-gcp - subPath: cluster-launch-e2e.yaml - - name: cluster-profile - mountPath: /usr/local/e2e-gcp-cluster-profile + - command: + - /bin/bash + - -c + - | + #!/bin/bash + set -e + export RPM_REPO="$( curl -q "${RPM_REPO_BASEURL_REF}" 2>/dev/null)" + ci-operator \ + --artifact-dir=$(ARTIFACTS) \ + --secret-dir=/usr/local/e2e-gcp-cluster-profile --template=/usr/local/e2e-gcp \ + --target=e2e-gcp env: - name: TEST_FOCUS value: Suite:openshift/conformance/parallel @@ -230,57 +219,61 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-openshift-ansible key: release-3.10.json + name: ci-operator-openshift-openshift-ansible - name: RPM_REPO_BASEURL_REF value: https://storage.googleapis.com/origin-ci-test/releases/openshift/origin/release-3.10/.latest-rpms - command: - - /bin/bash - - -c - - | - #!/bin/bash - set -e - export RPM_REPO="$( curl -q "${RPM_REPO_BASEURL_REF}" 2>/dev/null)" - ci-operator \ - --artifact-dir=$(ARTIFACTS) \ - --secret-dir=/usr/local/e2e-gcp-cluster-profile --template=/usr/local/e2e-gcp \ - --target=e2e-gcp - - - name: pull-ci-openshift-openshift-ansible-e2e-gcp-crio - agent: kubernetes - context: ci/prow/gcp-crio - branches: - - master - - dockerless-build-temporary - rerun_command: "/test gcp-crio" - always_run: false - run_if_changed: '^roles/(container_runtime|openshift_node|openshift_node_group)|^(playbooks/prerequisites)' - trigger: "((?m)^/test( gcp-crio),?(\\s+|$))" - decorate: true - skip_cloning: true - spec: + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + volumeMounts: + - mountPath: /usr/local/e2e-gcp + name: job-definition + subPath: cluster-launch-e2e.yaml + - mountPath: /usr/local/e2e-gcp-cluster-profile + name: cluster-profile serviceAccountName: ci-operator volumes: - - name: job-definition - configMap: + - configMap: name: prow-job-cluster-launch-e2e + name: job-definition - name: cluster-profile projected: sources: - secret: name: cluster-secrets-gcp - configMap: - name: cluster-profile-gcp-crio + name: cluster-profile-gcp + trigger: ((?m)^/test( all| gcp),?(\s+|$)) + - agent: kubernetes + always_run: false + branches: + - master + - dockerless-build-temporary + context: ci/prow/gcp-crio + decorate: true + name: pull-ci-openshift-openshift-ansible-e2e-gcp-crio + rerun_command: /test gcp-crio + run_if_changed: ^roles/(container_runtime|openshift_node|openshift_node_group)|^(playbooks/prerequisites) + skip_cloning: true + spec: containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} - volumeMounts: - - name: job-definition - mountPath: /usr/local/e2e-gcp-crio - subPath: cluster-launch-e2e.yaml - - name: cluster-profile - mountPath: /usr/local/e2e-gcp-crio-cluster-profile + - command: + - /bin/bash + - -c + - | + #!/bin/bash + set -e + export RPM_REPO="$( curl -q "${RPM_REPO_BASEURL_REF}" 2>/dev/null)" + ci-operator \ + --artifact-dir=$(ARTIFACTS) \ + --secret-dir=/usr/local/e2e-gcp-crio-cluster-profile \ + --template=/usr/local/e2e-gcp-crio \ + --target=e2e-gcp-crio env: - name: TEST_FOCUS value: Suite:openshift/conformance/parallel @@ -291,57 +284,59 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-openshift-ansible key: master.json + name: ci-operator-openshift-openshift-ansible - name: RPM_REPO_BASEURL_REF value: https://storage.googleapis.com/origin-ci-test/releases/openshift/origin/master/.latest-rpms - command: - - /bin/bash - - -c - - | - #!/bin/bash - set -e - export RPM_REPO="$( curl -q "${RPM_REPO_BASEURL_REF}" 2>/dev/null)" - ci-operator \ - --artifact-dir=$(ARTIFACTS) \ - --secret-dir=/usr/local/e2e-gcp-crio-cluster-profile \ - --template=/usr/local/e2e-gcp-crio \ - --target=e2e-gcp-crio - - - name: pull-ci-openshift-openshift-ansible-e2e-gcp-ha - agent: kubernetes - context: ci/prow/gcp-ha - branches: - - master - - dockerless-build-temporary - rerun_command: "/test gcp-ha" - always_run: false - trigger: "((?m)^/test( all| gcp-ha),?(\\s+|$))" - decorate: true - skip_cloning: true - spec: + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + volumeMounts: + - mountPath: /usr/local/e2e-gcp-crio + name: job-definition + subPath: cluster-launch-e2e.yaml + - mountPath: /usr/local/e2e-gcp-crio-cluster-profile + name: cluster-profile serviceAccountName: ci-operator volumes: - - name: job-definition - configMap: + - configMap: name: prow-job-cluster-launch-e2e + name: job-definition - name: cluster-profile projected: sources: - secret: name: cluster-secrets-gcp - configMap: - name: cluster-profile-gcp-ha + name: cluster-profile-gcp-crio + trigger: ((?m)^/test( gcp-crio),?(\s+|$)) + - agent: kubernetes + always_run: false + branches: + - master + - dockerless-build-temporary + context: ci/prow/gcp-ha + decorate: true + name: pull-ci-openshift-openshift-ansible-e2e-gcp-ha + rerun_command: /test gcp-ha + skip_cloning: true + spec: containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} - volumeMounts: - - name: job-definition - mountPath: /usr/local/e2e-gcp - subPath: cluster-launch-e2e.yaml - - name: cluster-profile - mountPath: /usr/local/e2e-gcp-cluster-profile + - command: + - /bin/bash + - -c + - | + #!/bin/bash + set -e + export RPM_REPO="$( curl -q "${RPM_REPO_BASEURL_REF}" 2>/dev/null)" + ci-operator \ + --artifact-dir=$(ARTIFACTS) \ + --secret-dir=/usr/local/e2e-gcp-cluster-profile --template=/usr/local/e2e-gcp \ + --target=e2e-gcp env: - name: TEST_FOCUS value: Suite:openshift/conformance/parallel @@ -352,58 +347,62 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-openshift-ansible key: master.json + name: ci-operator-openshift-openshift-ansible - name: RPM_REPO_BASEURL_REF value: https://storage.googleapis.com/origin-ci-test/releases/openshift/origin/master/.latest-rpms - command: - - /bin/bash - - -c - - | - #!/bin/bash - set -e - export RPM_REPO="$( curl -q "${RPM_REPO_BASEURL_REF}" 2>/dev/null)" - ci-operator \ - --artifact-dir=$(ARTIFACTS) \ - --secret-dir=/usr/local/e2e-gcp-cluster-profile --template=/usr/local/e2e-gcp \ - --target=e2e-gcp - - - name: pull-ci-openshift-openshift-ansible-launch-gcp - agent: kubernetes - context: ci/prow/launch-gcp - branches: - - master - - dockerless-build-temporary - rerun_command: "/test launch-gcp" - trigger: "((?m)^/test( launch-gcp),?(\\s+|$))" - decorate: true - skip_cloning: true - spec: + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + volumeMounts: + - mountPath: /usr/local/e2e-gcp + name: job-definition + subPath: cluster-launch-e2e.yaml + - mountPath: /usr/local/e2e-gcp-cluster-profile + name: cluster-profile serviceAccountName: ci-operator volumes: - - name: job-definition - configMap: + - configMap: name: prow-job-cluster-launch-e2e + name: job-definition - name: cluster-profile projected: sources: - secret: name: cluster-secrets-gcp - configMap: - name: cluster-profile-gcp + name: cluster-profile-gcp-ha + trigger: ((?m)^/test( all| gcp-ha),?(\s+|$)) + - agent: kubernetes + always_run: false + branches: + - master + - dockerless-build-temporary + context: ci/prow/launch-gcp + decorate: true + name: pull-ci-openshift-openshift-ansible-launch-gcp + rerun_command: /test launch-gcp + skip_cloning: true + spec: containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} - volumeMounts: - - name: job-definition - mountPath: /usr/local/e2e-gcp - subPath: cluster-launch-e2e.yaml - - name: cluster-profile - mountPath: /usr/local/e2e-gcp-cluster-profile + - command: + - /bin/bash + - -c + - | + #!/bin/bash + set -e + export RPM_REPO="$( curl -q "${RPM_REPO_BASEURL_REF}" 2>/dev/null)" + ci-operator \ + --artifact-dir=$(ARTIFACTS) \ + --secret-dir=/usr/local/e2e-gcp-cluster-profile --template=/usr/local/e2e-gcp \ + --target=e2e-gcp env: - name: TEST_COMMAND - value: "sleep 7200 & wait" + value: sleep 7200 & wait - name: JOB_NAME_SAFE value: e2e-gcp - name: CLUSTER_TYPE @@ -411,218 +410,217 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-openshift-ansible key: master.json + name: ci-operator-openshift-openshift-ansible - name: RPM_REPO_BASEURL_REF value: https://storage.googleapis.com/origin-ci-test/releases/openshift/origin/master/.latest-rpms - command: - - /bin/bash - - -c - - | - #!/bin/bash - set -e - export RPM_REPO="$( curl -q "${RPM_REPO_BASEURL_REF}" 2>/dev/null)" - ci-operator \ - --artifact-dir=$(ARTIFACTS) \ - --secret-dir=/usr/local/e2e-gcp-cluster-profile --template=/usr/local/e2e-gcp \ - --target=e2e-gcp - - - name: test_pull_request_openshift_ansible_extended_conformance_gce_ha_310 - agent: jenkins - labels: - master: ci.openshift.redhat.com - context: ci/openshift-jenkins/gcp-ha - rerun_command: "/test gcp-ha" - trigger: "((?m)^/test gcp-ha,?(\\s+|$))" + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + volumeMounts: + - mountPath: /usr/local/e2e-gcp + name: job-definition + subPath: cluster-launch-e2e.yaml + - mountPath: /usr/local/e2e-gcp-cluster-profile + name: cluster-profile + serviceAccountName: ci-operator + volumes: + - configMap: + name: prow-job-cluster-launch-e2e + name: job-definition + - name: cluster-profile + projected: + sources: + - secret: + name: cluster-secrets-gcp + - configMap: + name: cluster-profile-gcp + trigger: ((?m)^/test( launch-gcp),?(\s+|$)) + - agent: jenkins + always_run: false branches: - release-3.10 - - - name: test_pull_request_openshift_ansible_install_upgrade_gce_310 - agent: jenkins + context: ci/openshift-jenkins/gcp-ha labels: master: ci.openshift.redhat.com + name: test_pull_request_openshift_ansible_extended_conformance_gce_ha_310 + rerun_command: /test gcp-ha + trigger: ((?m)^/test gcp-ha,?(\s+|$)) + - agent: jenkins always_run: false - skip_report: true - context: ci/openshift-jenkins/gcp-upgrade - rerun_command: "/test gcp-upgrade" - trigger: "((?m)^/test( all| gcp-upgrade),?(\\s+|$))" branches: - release-3.10 - - - name: test_pull_request_openshift_ansible_extended_conformance_azure - agent: jenkins + context: ci/openshift-jenkins/gcp-upgrade labels: master: ci.openshift.redhat.com - always_run: true + name: test_pull_request_openshift_ansible_install_upgrade_gce_310 + rerun_command: /test gcp-upgrade skip_report: true - context: ci/openshift-jenkins/azure - rerun_command: "/test azure" - trigger: "((?m)^/test( all| azure),?(\\s+|$))" + trigger: ((?m)^/test( all| gcp-upgrade),?(\s+|$)) + - agent: jenkins + always_run: true branches: - master - dockerless-build-temporary - - - name: test_pull_request_openshift_ansible_extended_conformance_azure_310 - agent: jenkins + context: ci/openshift-jenkins/azure labels: master: ci.openshift.redhat.com - always_run: true + name: test_pull_request_openshift_ansible_extended_conformance_azure + rerun_command: /test azure skip_report: true - context: ci/openshift-jenkins/azure - rerun_command: "/test azure" - trigger: "((?m)^/test( all| azure),?(\\s+|$))" + trigger: ((?m)^/test( all| azure),?(\s+|$)) + - agent: jenkins + always_run: true branches: - release-3.10 - - - name: test_pull_request_openshift_ansible_extended_conformance_install - agent: jenkins + context: ci/openshift-jenkins/azure labels: master: ci.openshift.redhat.com + name: test_pull_request_openshift_ansible_extended_conformance_azure_310 + rerun_command: /test azure + skip_report: true + trigger: ((?m)^/test( all| azure),?(\s+|$)) + - agent: jenkins always_run: true branches: - - master - - dockerless-build-temporary + - master + - dockerless-build-temporary context: ci/openshift-jenkins/install - rerun_command: "/test install" - trigger: "((?m)^/test( all| install),?(\\s+|$))" - - - name: test_pull_request_openshift_ansible_extended_conformance_install_310 - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_pull_request_openshift_ansible_extended_conformance_install + rerun_command: /test install + trigger: ((?m)^/test( all| install),?(\s+|$)) + - agent: jenkins always_run: true branches: - - release-3.10 + - release-3.10 context: ci/openshift-jenkins/install - rerun_command: "/test install" - trigger: "((?m)^/test( all| install),?(\\s+|$))" - - - name: test_pull_request_openshift_ansible_extended_conformance_install_release_36 - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_pull_request_openshift_ansible_extended_conformance_install_310 + rerun_command: /test install + trigger: ((?m)^/test( all| install),?(\s+|$)) + - agent: jenkins always_run: true branches: - - release-3.6 + - release-3.6 context: ci/openshift-jenkins/install - rerun_command: "/test install" - trigger: "((?m)^/test( all| install),?(\\s+|$))" - - - name: test_pull_request_openshift_ansible_extended_conformance_install_release_37 - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_pull_request_openshift_ansible_extended_conformance_install_release_36 + rerun_command: /test install + trigger: ((?m)^/test( all| install),?(\s+|$)) + - agent: jenkins always_run: true branches: - - release-3.7 + - release-3.7 context: ci/openshift-jenkins/install - rerun_command: "/test install" - trigger: "((?m)^/test( all| install),?(\\s+|$))" - - - name: test_pull_request_openshift_ansible_extended_conformance_install_release_39 - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_pull_request_openshift_ansible_extended_conformance_install_release_37 + rerun_command: /test install + trigger: ((?m)^/test( all| install),?(\s+|$)) + - agent: jenkins always_run: true branches: - - release-3.9 + - release-3.9 context: ci/openshift-jenkins/install - rerun_command: "/test install" - trigger: "((?m)^/test( all| install),?(\\s+|$))" - - - name: test_pull_request_openshift_ansible_extended_conformance_install_update - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_pull_request_openshift_ansible_extended_conformance_install_release_39 + rerun_command: /test install + trigger: ((?m)^/test( all| install),?(\s+|$)) + - agent: jenkins always_run: false - skip_report: true branches: - release-3.10 context: ci/openshift-jenkins/upgrade - rerun_command: "/test upgrade" - trigger: "((?m)^/test( upgrade),?(\\s+|$))" - - - name: test_pull_request_openshift_ansible_extended_conformance_install_containerized - agent: jenkins labels: master: ci.openshift.redhat.com - always_run: true + name: test_pull_request_openshift_ansible_extended_conformance_install_update + rerun_command: /test upgrade skip_report: true + trigger: ((?m)^/test( upgrade),?(\s+|$)) + - agent: jenkins + always_run: true branches: - release-3.7 - release-3.8 - release-3.9 context: ci/openshift-jenkins/containerized - rerun_command: "/test containerized" - trigger: "((?m)^/test( all| containerized),?(\\s+|$))" - - - name: test_pull_request_openshift_ansible_extended_conformance_install_crio_rpm_310 - agent: jenkins labels: master: ci.openshift.redhat.com - always_run: true + name: test_pull_request_openshift_ansible_extended_conformance_install_containerized + rerun_command: /test containerized skip_report: true - context: ci/openshift-jenkins/extended_conformance_install_crio_rpm - rerun_command: "/test crio" - trigger: "((?m)^/test( all| crio),?(\\s+|$))" + trigger: ((?m)^/test( all| containerized),?(\s+|$)) + - agent: jenkins + always_run: true branches: - release-3.10 - - - name: test_pull_request_openshift_ansible_extended_conformance_install_update_containerized - agent: jenkins + context: ci/openshift-jenkins/extended_conformance_install_crio_rpm labels: master: ci.openshift.redhat.com + name: test_pull_request_openshift_ansible_extended_conformance_install_crio_rpm_310 + rerun_command: /test crio + skip_report: true + trigger: ((?m)^/test( all| crio),?(\s+|$)) + - agent: jenkins always_run: false branches: - release-3.7 - release-3.8 - release-3.9 - skip_report: true context: ci/openshift-jenkins/containerized_upgrade - rerun_command: "/test containerized-upgrade" - trigger: "((?m)^/test( containerized-upgrade),?(\\s+|$))" - - - name: test_pull_request_openshift_ansible_extended_conformance_install_in_tree - agent: jenkins labels: master: ci.openshift.redhat.com - always_run: false + name: test_pull_request_openshift_ansible_extended_conformance_install_update_containerized + rerun_command: /test containerized-upgrade skip_report: true + trigger: ((?m)^/test( containerized-upgrade),?(\s+|$)) + - agent: jenkins + always_run: false context: ci/openshift-jenkins/install_in_tree - rerun_command: "/test install-in-tree" - trigger: "((?m)^/test install-in-tree,?(\\s+|$))" - - - name: test_pull_request_openshift_ansible_extended_conformance_install_system_containers_39 - agent: jenkins labels: master: ci.openshift.redhat.com - always_run: true + name: test_pull_request_openshift_ansible_extended_conformance_install_in_tree + rerun_command: /test install-in-tree skip_report: true + trigger: ((?m)^/test install-in-tree,?(\s+|$)) + - agent: jenkins + always_run: true branches: - release-3.9 context: ci/openshift-jenkins/system-containers - rerun_command: "/test system-containers" - trigger: "((?m)^/test( all| system-containers),?(\\s+|$))" - - - name: test_pull_request_openshift_ansible_extended_conformance_install_system_containers_37 - agent: jenkins labels: master: ci.openshift.redhat.com - always_run: true + name: test_pull_request_openshift_ansible_extended_conformance_install_system_containers_39 + rerun_command: /test system-containers skip_report: true + trigger: ((?m)^/test( all| system-containers),?(\s+|$)) + - agent: jenkins + always_run: true branches: - release-3.7 context: ci/openshift-jenkins/system-containers - rerun_command: "/test system-containers" - trigger: "((?m)^/test( all| system-containers),?(\\s+|$))" - - - name: test_pull_request_openshift_ansible_launch_gce_310 - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_pull_request_openshift_ansible_extended_conformance_install_system_containers_37 + rerun_command: /test system-containers + skip_report: true + trigger: ((?m)^/test( all| system-containers),?(\s+|$)) + - agent: jenkins always_run: false - context: ci/openshift-jenkins/launch-gcp - rerun_command: "/test launch-gcp" - trigger: "((?m)^/test launch-gcp,?(\\s+|$))" branches: - release-3.10 + context: ci/openshift-jenkins/launch-gcp + labels: + master: ci.openshift.redhat.com + name: test_pull_request_openshift_ansible_launch_gce_310 + rerun_command: /test launch-gcp + trigger: ((?m)^/test launch-gcp,?(\s+|$)) diff --git a/ci-operator/jobs/openshift/openshift-azure/openshift-openshift-azure-periodics.yaml b/ci-operator/jobs/openshift/openshift-azure/openshift-openshift-azure-periodics.yaml index 7f94b0b29c742..4a4d77c871ec6 100644 --- a/ci-operator/jobs/openshift/openshift-azure/openshift-openshift-azure-periodics.yaml +++ b/ci-operator/jobs/openshift/openshift-azure/openshift-openshift-azure-periodics.yaml @@ -1,25 +1,33 @@ periodics: -- name: azure_build_base_image_centos - agent: jenkins - labels: - master: ci.openshift.redhat.com +- agent: jenkins + cron: "" interval: 24h + labels: + master: ci.openshift.redhat.com + name: azure_build_base_image_centos run_after_success: - - name: azure_build_node_image_centos_310 - agent: jenkins + - agent: jenkins + cron: "" + interval: "" labels: - master: ci.openshift.redhat.com - - name: azure_build_node_image_centos - agent: jenkins + master: ci.openshift.redhat.com + name: azure_build_node_image_centos_310 + - agent: jenkins + cron: "" + interval: "" labels: - master: ci.openshift.redhat.com -- name: azure_build_base_image_rhel - agent: jenkins - labels: master: ci.openshift.redhat.com + name: azure_build_node_image_centos +- agent: jenkins + cron: "" interval: 24h + labels: + master: ci.openshift.redhat.com + name: azure_build_base_image_rhel run_after_success: - - name: azure_build_node_image_rhel_310 - agent: jenkins + - agent: jenkins + cron: "" + interval: "" labels: - master: ci.openshift.redhat.com \ No newline at end of file + master: ci.openshift.redhat.com + name: azure_build_node_image_rhel_310 diff --git a/ci-operator/jobs/openshift/openshift-azure/openshift-openshift-azure-postsubmits.yaml b/ci-operator/jobs/openshift/openshift-azure/openshift-openshift-azure-postsubmits.yaml index 8d5c8a2033ce4..7e48829baa295 100644 --- a/ci-operator/jobs/openshift/openshift-azure/openshift-openshift-azure-postsubmits.yaml +++ b/ci-operator/jobs/openshift/openshift-azure/openshift-openshift-azure-postsubmits.yaml @@ -1,47 +1,51 @@ postsubmits: openshift/openshift-azure: - - name: branch-ci-openshift-azure-images - agent: kubernetes - labels: - artifacts: images + - agent: kubernetes branches: - master decorate: true + labels: + artifacts: images + name: branch-ci-openshift-azure-images skip_cloning: true spec: - serviceAccountName: ci-operator - volumes: - - name: job-definition - configMap: - name: prow-job-cluster-launch-e2e-azure - - name: cluster-secrets-azure - projected: - sources: - - secret: - name: cluster-secrets-azure containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} - volumeMounts: - - name: job-definition - mountPath: /usr/local/e2e-azure - subPath: cluster-launch-e2e-azure.yaml - - name: cluster-secrets-azure - mountPath: /usr/local/e2e-azure-secret + - args: + - --secret-dir=/usr/local/e2e-azure-secret + - --template=/usr/local/e2e-azure + - --promote + command: + - ci-operator env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-openshift-azure key: master.json + name: ci-operator-openshift-openshift-azure - name: JOB_NAME_SAFE value: post-azure-images - name: CLUSTER_TYPE value: azure - command: - - ci-operator - args: - - --secret-dir=/usr/local/e2e-azure-secret - - --template=/usr/local/e2e-azure - - --promote + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + volumeMounts: + - mountPath: /usr/local/e2e-azure + name: job-definition + subPath: cluster-launch-e2e-azure.yaml + - mountPath: /usr/local/e2e-azure-secret + name: cluster-secrets-azure + serviceAccountName: ci-operator + volumes: + - configMap: + name: prow-job-cluster-launch-e2e-azure + name: job-definition + - name: cluster-secrets-azure + projected: + sources: + - secret: + name: cluster-secrets-azure diff --git a/ci-operator/jobs/openshift/openshift-azure/openshift-openshift-azure-presubmits.yaml b/ci-operator/jobs/openshift/openshift-azure/openshift-openshift-azure-presubmits.yaml index 83675974844f3..70b01eb5d174b 100644 --- a/ci-operator/jobs/openshift/openshift-azure/openshift-openshift-azure-presubmits.yaml +++ b/ci-operator/jobs/openshift/openshift-azure/openshift-openshift-azure-presubmits.yaml @@ -1,51 +1,54 @@ presubmits: openshift/openshift-azure: - - name: pull-ci-openshift-azure - agent: kubernetes - labels: - artifacts: images - context: ci/prow/build + - agent: kubernetes + always_run: true branches: - master - rerun_command: "/test build" - always_run: true - trigger: "((?m)^/test( all| build),?(\\s+|$))" + context: ci/prow/build decorate: true + labels: + artifacts: images + name: pull-ci-openshift-azure + rerun_command: /test build skip_cloning: true spec: - serviceAccountName: ci-operator - volumes: - - name: job-definition - configMap: - name: prow-job-cluster-launch-e2e-azure - - name: cluster-secrets-azure - projected: - sources: - - secret: - name: cluster-secrets-azure containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} - volumeMounts: - - name: job-definition - mountPath: /usr/local/e2e-azure - subPath: cluster-launch-e2e-azure.yaml - - name: cluster-secrets-azure - mountPath: /usr/local/e2e-azure-secret + - args: + - --secret-dir=/usr/local/e2e-azure-secret + - --template=/usr/local/e2e-azure + command: + - ci-operator env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-openshift-azure key: master.json + name: ci-operator-openshift-openshift-azure - name: JOB_NAME_SAFE value: e2e-azure - name: CLUSTER_TYPE value: azure - command: - - ci-operator - args: - #no targets, run everything - - --secret-dir=/usr/local/e2e-azure-secret - - --template=/usr/local/e2e-azure + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + volumeMounts: + - mountPath: /usr/local/e2e-azure + name: job-definition + subPath: cluster-launch-e2e-azure.yaml + - mountPath: /usr/local/e2e-azure-secret + name: cluster-secrets-azure + serviceAccountName: ci-operator + volumes: + - configMap: + name: prow-job-cluster-launch-e2e-azure + name: job-definition + - name: cluster-secrets-azure + projected: + sources: + - secret: + name: cluster-secrets-azure + trigger: ((?m)^/test( all| build),?(\s+|$)) diff --git a/ci-operator/jobs/openshift/origin-aggregated-logging/openshift-origin-aggregated-logging-postsubmits.yaml b/ci-operator/jobs/openshift/origin-aggregated-logging/openshift-origin-aggregated-logging-postsubmits.yaml index 2d167fa793692..f2b0ad9139fce 100644 --- a/ci-operator/jobs/openshift/origin-aggregated-logging/openshift-origin-aggregated-logging-postsubmits.yaml +++ b/ci-operator/jobs/openshift/origin-aggregated-logging/openshift-origin-aggregated-logging-postsubmits.yaml @@ -1,34 +1,38 @@ postsubmits: openshift/origin-aggregated-logging: - - name: branch-ci-openshift-origin-aggregated-logging-images - agent: kubernetes - labels: - artifacts: images + - agent: kubernetes branches: - master decorate: true + labels: + artifacts: images + name: branch-ci-openshift-origin-aggregated-logging-images skip_cloning: true spec: - serviceAccountName: ci-operator containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + - args: + - --artifact-dir=$(ARTIFACTS) + - --target=[images] + - --promote + command: + - ci-operator env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-origin-aggregated-logging key: master.json - command: - - ci-operator - args: - - --artifact-dir=$(ARTIFACTS) - - --target=[images] - - --promote - - name: push_origin_aggregated_logging_release_310 - agent: jenkins + name: ci-operator-openshift-origin-aggregated-logging + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + serviceAccountName: ci-operator + - agent: jenkins + branches: + - release-3.10 labels: master: ci.openshift.redhat.com - branches: - - release-3.10 \ No newline at end of file + name: push_origin_aggregated_logging_release_310 diff --git a/ci-operator/jobs/openshift/origin-aggregated-logging/openshift-origin-aggregated-logging-presubmits.yaml b/ci-operator/jobs/openshift/origin-aggregated-logging/openshift-origin-aggregated-logging-presubmits.yaml index d9438bae7a924..eeed938059e2f 100644 --- a/ci-operator/jobs/openshift/origin-aggregated-logging/openshift-origin-aggregated-logging-presubmits.yaml +++ b/ci-operator/jobs/openshift/origin-aggregated-logging/openshift-origin-aggregated-logging-presubmits.yaml @@ -1,143 +1,137 @@ presubmits: openshift/origin-aggregated-logging: - - name: test_pull_request_origin_aggregated_logging_journald - agent: jenkins - labels: - master: ci.openshift.redhat.com + - agent: jenkins always_run: true branches: - - master - - stage - - es5.x + - master + - stage + - es5.x context: ci/openshift-jenkins/logging - rerun_command: "/test logging" - trigger: "((?m)^/test( all| logging),?(\\s+|$))" - - - name: test_pull_request_origin_aggregated_logging_journald_310 - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_pull_request_origin_aggregated_logging_journald + rerun_command: /test logging + trigger: ((?m)^/test( all| logging),?(\s+|$)) + - agent: jenkins always_run: true branches: - - release-3.10 + - release-3.10 context: ci/openshift-jenkins/logging - rerun_command: "/test logging" - trigger: "((?m)^/test( all| logging),?(\\s+|$))" - - - name: test_pull_request_origin_aggregated_logging_journald_39 - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_pull_request_origin_aggregated_logging_journald_310 + rerun_command: /test logging + trigger: ((?m)^/test( all| logging),?(\s+|$)) + - agent: jenkins always_run: true branches: - - release-3.9 + - release-3.9 context: ci/openshift-jenkins/logging - rerun_command: "/test logging" - trigger: "((?m)^/test( all| logging),?(\\s+|$))" - - - name: test_pull_request_origin_aggregated_logging_journald_37 - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_pull_request_origin_aggregated_logging_journald_39 + rerun_command: /test logging + trigger: ((?m)^/test( all| logging),?(\s+|$)) + - agent: jenkins always_run: true branches: - - release-3.7 + - release-3.7 context: ci/openshift-jenkins/logging - rerun_command: "/test logging" - trigger: "((?m)^/test( all| logging),?(\\s+|$))" - - - name: test_pull_request_origin_aggregated_logging_journald_36 - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_pull_request_origin_aggregated_logging_journald_37 + rerun_command: /test logging + trigger: ((?m)^/test( all| logging),?(\s+|$)) + - agent: jenkins always_run: true branches: - - release-3.6 + - release-3.6 context: ci/openshift-jenkins/logging - rerun_command: "/test logging" - trigger: "((?m)^/test( all| logging),?(\\s+|$))" - - - name: test_pull_request_origin_aggregated_logging_json_file - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_pull_request_origin_aggregated_logging_journald_36 + rerun_command: /test logging + trigger: ((?m)^/test( all| logging),?(\s+|$)) + - agent: jenkins always_run: true branches: - - master - - stage - - es5.x + - master + - stage + - es5.x context: ci/openshift-jenkins/json-file - rerun_command: "/test json-file" - trigger: "((?m)^/test( all| json-file),?(\\s+|$))" - - - name: test_pull_request_origin_aggregated_logging_json_file_310 - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_pull_request_origin_aggregated_logging_json_file + rerun_command: /test json-file + trigger: ((?m)^/test( all| json-file),?(\s+|$)) + - agent: jenkins always_run: true branches: - - release-3.10 + - release-3.10 context: ci/openshift-jenkins/json-file - rerun_command: "/test json-file" - trigger: "((?m)^/test( all| json-file),?(\\s+|$))" - - - name: test_pull_request_origin_aggregated_logging_json_file_39 - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_pull_request_origin_aggregated_logging_json_file_310 + rerun_command: /test json-file + trigger: ((?m)^/test( all| json-file),?(\s+|$)) + - agent: jenkins always_run: true branches: - - release-3.9 + - release-3.9 context: ci/openshift-jenkins/json-file - rerun_command: "/test json-file" - trigger: "((?m)^/test( all| json-file),?(\\s+|$))" - - - name: test_pull_request_origin_aggregated_logging_json_file_37 - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_pull_request_origin_aggregated_logging_json_file_39 + rerun_command: /test json-file + trigger: ((?m)^/test( all| json-file),?(\s+|$)) + - agent: jenkins always_run: true branches: - - release-3.7 + - release-3.7 context: ci/openshift-jenkins/json-file - rerun_command: "/test json-file" - trigger: "((?m)^/test( all| json-file),?(\\s+|$))" - - - name: test_pull_request_origin_aggregated_logging_json_file_36 - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_pull_request_origin_aggregated_logging_json_file_37 + rerun_command: /test json-file + trigger: ((?m)^/test( all| json-file),?(\s+|$)) + - agent: jenkins always_run: true branches: - - release-3.6 + - release-3.6 context: ci/openshift-jenkins/json-file - rerun_command: "/test json-file" - trigger: "((?m)^/test( all| json-file),?(\\s+|$))" - - - name: pull-ci-openshift-origin-aggregated-logging-images - agent: kubernetes - context: ci/prow/images + labels: + master: ci.openshift.redhat.com + name: test_pull_request_origin_aggregated_logging_json_file_36 + rerun_command: /test json-file + trigger: ((?m)^/test( all| json-file),?(\s+|$)) + - agent: kubernetes + always_run: true branches: - master - rerun_command: "/test images" - always_run: true - trigger: "((?m)^/test( all| images),?(\\s+|$))" + context: ci/prow/images decorate: true + name: pull-ci-openshift-origin-aggregated-logging-images + rerun_command: /test images skip_cloning: true spec: - serviceAccountName: ci-operator containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + - args: + - --artifact-dir=$(ARTIFACTS) + - --target=[images] + command: + - ci-operator env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-origin-aggregated-logging key: master.json - command: - - ci-operator - args: - - --artifact-dir=$(ARTIFACTS) - - --target=[images] + name: ci-operator-openshift-origin-aggregated-logging + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + serviceAccountName: ci-operator + trigger: ((?m)^/test( all| images),?(\s+|$)) diff --git a/ci-operator/jobs/openshift/origin-metrics/openshift-origin-metrics-postsubmits.yaml b/ci-operator/jobs/openshift/origin-metrics/openshift-origin-metrics-postsubmits.yaml index 3481965868a33..39ebd86944e79 100644 --- a/ci-operator/jobs/openshift/origin-metrics/openshift-origin-metrics-postsubmits.yaml +++ b/ci-operator/jobs/openshift/origin-metrics/openshift-origin-metrics-postsubmits.yaml @@ -1,34 +1,38 @@ postsubmits: openshift/origin-metrics: - - name: branch-ci-openshift-origin-metrics-images - agent: kubernetes - labels: - artifacts: images + - agent: kubernetes branches: - master decorate: true + labels: + artifacts: images + name: branch-ci-openshift-origin-metrics-images skip_cloning: true spec: - serviceAccountName: ci-operator containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + - args: + - --artifact-dir=$(ARTIFACTS) + - --target=[images] + - --promote + command: + - ci-operator env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-origin-metrics key: master.json - command: - - ci-operator - args: - - --artifact-dir=$(ARTIFACTS) - - --target=[images] - - --promote - - name: push_origin_metrics_release_310 - agent: jenkins + name: ci-operator-openshift-origin-metrics + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + serviceAccountName: ci-operator + - agent: jenkins + branches: + - release-3.10 labels: master: ci.openshift.redhat.com - branches: - - release-3.10 \ No newline at end of file + name: push_origin_metrics_release_310 diff --git a/ci-operator/jobs/openshift/origin-metrics/openshift-origin-metrics-presubmits.yaml b/ci-operator/jobs/openshift/origin-metrics/openshift-origin-metrics-presubmits.yaml index 06a28ef805844..a194e729a8de7 100644 --- a/ci-operator/jobs/openshift/origin-metrics/openshift-origin-metrics-presubmits.yaml +++ b/ci-operator/jobs/openshift/origin-metrics/openshift-origin-metrics-presubmits.yaml @@ -1,29 +1,33 @@ presubmits: openshift/origin-metrics: - - name: pull-ci-openshift-origin-metrics-images - agent: kubernetes - context: ci/prow/images + - agent: kubernetes + always_run: true branches: - master - rerun_command: "/test images" - always_run: true - trigger: "((?m)^/test( all| images),?(\\s+|$))" + context: ci/prow/images decorate: true + name: pull-ci-openshift-origin-metrics-images + rerun_command: /test images skip_cloning: true spec: - serviceAccountName: ci-operator containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + - args: + - --artifact-dir=$(ARTIFACTS) + - --target=[images] + command: + - ci-operator env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-origin-metrics key: master.json - command: - - ci-operator - args: - - --artifact-dir=$(ARTIFACTS) - - --target=[images] \ No newline at end of file + name: ci-operator-openshift-origin-metrics + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + serviceAccountName: ci-operator + trigger: ((?m)^/test( all| images),?(\s+|$)) diff --git a/ci-operator/jobs/openshift/origin-web-console-server/openshift-origin-web-console-server-postsubmits.yaml b/ci-operator/jobs/openshift/origin-web-console-server/openshift-origin-web-console-server-postsubmits.yaml index 8d14bd7f66464..03b6c26838558 100644 --- a/ci-operator/jobs/openshift/origin-web-console-server/openshift-origin-web-console-server-postsubmits.yaml +++ b/ci-operator/jobs/openshift/origin-web-console-server/openshift-origin-web-console-server-postsubmits.yaml @@ -1,52 +1,60 @@ postsubmits: openshift/origin-web-console-server: - - name: branch-ci-origin-web-console-server-images - agent: kubernetes - labels: - artifacts: images + - agent: kubernetes branches: - master decorate: true + labels: + artifacts: images + name: branch-ci-origin-web-console-server-images skip_cloning: true spec: - serviceAccountName: ci-operator containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + - command: + - ci-operator + - --artifact-dir=$(ARTIFACTS) + - --target=[images] + - --promote env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-origin-web-console-server key: master.json - command: - - ci-operator - - --artifact-dir=$(ARTIFACTS) - - --target=[images] - - --promote - - name: branch-ci-origin-web-console-server-images-3.10 - agent: kubernetes - labels: - artifacts: images + name: ci-operator-openshift-origin-web-console-server + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + serviceAccountName: ci-operator + - agent: kubernetes branches: - release-3.10 decorate: true + labels: + artifacts: images + name: branch-ci-origin-web-console-server-images-3.10 skip_cloning: true spec: - serviceAccountName: ci-operator containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + - command: + - ci-operator + - --artifact-dir=$(ARTIFACTS) + - --target=[images] + - --promote env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-origin-web-console-server key: release-3.10.json - command: - - ci-operator - - --artifact-dir=$(ARTIFACTS) - - --target=[images] - - --promote \ No newline at end of file + name: ci-operator-openshift-origin-web-console-server + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + serviceAccountName: ci-operator diff --git a/ci-operator/jobs/openshift/origin-web-console-server/openshift-origin-web-console-server-presubmits.yaml b/ci-operator/jobs/openshift/origin-web-console-server/openshift-origin-web-console-server-presubmits.yaml index af1c8199f6a73..18cf3e8e59b40 100644 --- a/ci-operator/jobs/openshift/origin-web-console-server/openshift-origin-web-console-server-presubmits.yaml +++ b/ci-operator/jobs/openshift/origin-web-console-server/openshift-origin-web-console-server-presubmits.yaml @@ -1,94 +1,91 @@ presubmits: openshift/origin-web-console-server: - - name: pull-ci-origin-web-console-server-unit - agent: kubernetes - context: ci/prow/unit + - agent: kubernetes + always_run: true branches: - master - dockerless-build-temporary - rerun_command: "/test unit" - always_run: true - trigger: "((?m)^/test( all| unit),?(\\s+|$))" + context: ci/prow/unit decorate: true + name: pull-ci-origin-web-console-server-unit + rerun_command: /test unit skip_cloning: true spec: - serviceAccountName: ci-operator containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + - args: + - --artifact-dir=$(ARTIFACTS) + - --target=unit + command: + - ci-operator env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-origin-web-console-server key: master.json - command: - - ci-operator - args: - - --artifact-dir=$(ARTIFACTS) - - --target=unit - - name: pull-ci-origin-web-console-server-unit-3.10 - agent: kubernetes - context: ci/prow/unit + name: ci-operator-openshift-origin-web-console-server + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + serviceAccountName: ci-operator + trigger: ((?m)^/test( all| unit),?(\s+|$)) + - agent: kubernetes + always_run: true branches: - release-3.10 - rerun_command: "/test unit" - always_run: true - trigger: "((?m)^/test( all| unit),?(\\s+|$))" + context: ci/prow/unit decorate: true + name: pull-ci-origin-web-console-server-unit-3.10 + rerun_command: /test unit skip_cloning: true spec: - serviceAccountName: ci-operator containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + - args: + - --artifact-dir=$(ARTIFACTS) + - --target=unit + command: + - ci-operator env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-origin-web-console-server key: release-3.10.json - command: - - ci-operator - args: - - --artifact-dir=$(ARTIFACTS) - - --target=unit - - name: pull-ci-origin-web-console-server-e2e - agent: kubernetes - context: ci/prow/e2e + name: ci-operator-openshift-origin-web-console-server + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + serviceAccountName: ci-operator + trigger: ((?m)^/test( all| unit),?(\s+|$)) + - agent: kubernetes + always_run: true branches: - master - dockerless-build-temporary - rerun_command: "/test e2e" - always_run: true - trigger: "((?m)^/test( all| e2e),?(\\s+|$))" + context: ci/prow/e2e decorate: true + name: pull-ci-origin-web-console-server-e2e + rerun_command: /test e2e skip_cloning: true spec: - serviceAccountName: ci-operator - volumes: - - name: job-definition - configMap: - name: prow-job-cluster-launch-e2e - - name: cluster-profile - projected: - sources: - - secret: - name: cluster-secrets-gcp - - configMap: - name: cluster-profile-gcp containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} - volumeMounts: - - name: job-definition - mountPath: /usr/local/e2e-gcp - subPath: cluster-launch-e2e.yaml - - name: cluster-profile - mountPath: /usr/local/e2e-gcp-cluster-profile + - command: + - /bin/bash + - -c + - | + #!/bin/bash + set -e + export RPM_REPO="$( curl -q "${RPM_REPO_BASEURL_REF}" 2>/dev/null)" + ci-operator \ + --artifact-dir=$(ARTIFACTS) \ + --secret-dir=/usr/local/e2e-gcp-cluster-profile --template=/usr/local/e2e-gcp \ + --target=e2e-gcp env: - name: TEST_FOCUS value: Suite:openshift/conformance/parallel @@ -99,37 +96,28 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-origin-web-console-server key: master.json + name: ci-operator-openshift-origin-web-console-server - name: RPM_REPO_BASEURL_REF value: https://storage.googleapis.com/origin-ci-test/releases/openshift/origin/master/.latest-rpms - command: - - /bin/bash - - -c - - | - #!/bin/bash - set -e - export RPM_REPO="$( curl -q "${RPM_REPO_BASEURL_REF}" 2>/dev/null)" - ci-operator \ - --artifact-dir=$(ARTIFACTS) \ - --secret-dir=/usr/local/e2e-gcp-cluster-profile --template=/usr/local/e2e-gcp \ - --target=e2e-gcp - - name: pull-ci-origin-web-console-server-e2e-3.10 - agent: kubernetes - context: ci/prow/e2e - branches: - - release-3.10 - rerun_command: "/test e2e" - always_run: true - trigger: "((?m)^/test( all| e2e),?(\\s+|$))" - decorate: true - skip_cloning: true - spec: + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + volumeMounts: + - mountPath: /usr/local/e2e-gcp + name: job-definition + subPath: cluster-launch-e2e.yaml + - mountPath: /usr/local/e2e-gcp-cluster-profile + name: cluster-profile serviceAccountName: ci-operator volumes: - - name: job-definition - configMap: + - configMap: name: prow-job-cluster-launch-e2e + name: job-definition - name: cluster-profile projected: sources: @@ -137,16 +125,29 @@ presubmits: name: cluster-secrets-gcp - configMap: name: cluster-profile-gcp + trigger: ((?m)^/test( all| e2e),?(\s+|$)) + - agent: kubernetes + always_run: true + branches: + - release-3.10 + context: ci/prow/e2e + decorate: true + name: pull-ci-origin-web-console-server-e2e-3.10 + rerun_command: /test e2e + skip_cloning: true + spec: containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} - volumeMounts: - - name: job-definition - mountPath: /usr/local/e2e-gcp - subPath: cluster-launch-e2e.yaml - - name: cluster-profile - mountPath: /usr/local/e2e-gcp-cluster-profile + - command: + - /bin/bash + - -c + - |- + #!/bin/bash + set -e + export RPM_REPO="$( curl -q "${RPM_REPO_BASEURL_REF}" 2>/dev/null)" + ci-operator \ + --artifact-dir=$(ARTIFACTS) \ + --secret-dir=/usr/local/e2e-gcp-cluster-profile --template=/usr/local/e2e-gcp \ + --target=e2e-gcp env: - name: TEST_FOCUS value: Suite:openshift/conformance/parallel @@ -157,18 +158,33 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-origin-web-console-server key: release-3.10.json + name: ci-operator-openshift-origin-web-console-server - name: RPM_REPO_BASEURL_REF value: https://storage.googleapis.com/origin-ci-test/releases/openshift/origin/release-3.10/.latest-rpms - command: - - /bin/bash - - -c - - | - #!/bin/bash - set -e - export RPM_REPO="$( curl -q "${RPM_REPO_BASEURL_REF}" 2>/dev/null)" - ci-operator \ - --artifact-dir=$(ARTIFACTS) \ - --secret-dir=/usr/local/e2e-gcp-cluster-profile --template=/usr/local/e2e-gcp \ - --target=e2e-gcp \ No newline at end of file + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + volumeMounts: + - mountPath: /usr/local/e2e-gcp + name: job-definition + subPath: cluster-launch-e2e.yaml + - mountPath: /usr/local/e2e-gcp-cluster-profile + name: cluster-profile + serviceAccountName: ci-operator + volumes: + - configMap: + name: prow-job-cluster-launch-e2e + name: job-definition + - name: cluster-profile + projected: + sources: + - secret: + name: cluster-secrets-gcp + - configMap: + name: cluster-profile-gcp + trigger: ((?m)^/test( all| e2e),?(\s+|$)) diff --git a/ci-operator/jobs/openshift/origin-web-console/openshift-origin-web-console-postsubmits.yaml b/ci-operator/jobs/openshift/origin-web-console/openshift-origin-web-console-postsubmits.yaml index 055ac2d619eb4..0e410fa573816 100644 --- a/ci-operator/jobs/openshift/origin-web-console/openshift-origin-web-console-postsubmits.yaml +++ b/ci-operator/jobs/openshift/origin-web-console/openshift-origin-web-console-postsubmits.yaml @@ -1,8 +1,8 @@ postsubmits: openshift/origin-web-console: - - name: test_branch_origin_web_console - agent: jenkins + - agent: jenkins + branches: + - master labels: master: ci.openshift.redhat.com - branches: - - master \ No newline at end of file + name: test_branch_origin_web_console diff --git a/ci-operator/jobs/openshift/origin-web-console/openshift-origin-web-console-presubmits.yaml b/ci-operator/jobs/openshift/origin-web-console/openshift-origin-web-console-presubmits.yaml index 5637086464b11..9e55b6c9403d0 100644 --- a/ci-operator/jobs/openshift/origin-web-console/openshift-origin-web-console-presubmits.yaml +++ b/ci-operator/jobs/openshift/origin-web-console/openshift-origin-web-console-presubmits.yaml @@ -1,35 +1,33 @@ presubmits: openshift/origin-web-console: - - name: test_pull_request_origin_web_console_39 - agent: jenkins - labels: - master: ci.openshift.redhat.com + - agent: jenkins always_run: true branches: - enterprise-3.9 context: ci/openshift-jenkins - rerun_command: "/test" - trigger: "((?m)^/test,?(\\s+|$))" - - - name: test_pull_request_origin_web_console_310 - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_pull_request_origin_web_console_39 + rerun_command: /test + trigger: ((?m)^/test,?(\s+|$)) + - agent: jenkins always_run: true branches: - enterprise-3.10 context: ci/openshift-jenkins - rerun_command: "/test" - trigger: "((?m)^/test,?(\\s+|$))" - - - name: test_pull_request_origin_web_console - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_pull_request_origin_web_console_310 + rerun_command: /test + trigger: ((?m)^/test,?(\s+|$)) + - agent: jenkins always_run: true branches: - master - dockerless-build-temporary context: ci/openshift-jenkins - rerun_command: "/test" - trigger: "((?m)^/test,?(\\s+|$))" + labels: + master: ci.openshift.redhat.com + name: test_pull_request_origin_web_console + rerun_command: /test + trigger: ((?m)^/test,?(\s+|$)) diff --git a/ci-operator/jobs/openshift/origin/openshift-origin-periodics.yaml b/ci-operator/jobs/openshift/origin/openshift-origin-periodics.yaml index 6a1d7afb190b8..dcbd9867acde8 100644 --- a/ci-operator/jobs/openshift/origin/openshift-origin-periodics.yaml +++ b/ci-operator/jobs/openshift/origin/openshift-origin-periodics.yaml @@ -1,37 +1,26 @@ periodics: -- name: ami_build_origin_int_rhel_base - agent: jenkins - labels: - master: ci.openshift.redhat.com - interval: 24h -- name: periodic-ci-origin-conformance-k8s +- agent: jenkins + cron: "" interval: 24h - agent: kubernetes + labels: + master: ci.openshift.redhat.com + name: ami_build_origin_int_rhel_base +- agent: kubernetes + cron: "" decorate: true + interval: 24h + name: periodic-ci-origin-conformance-k8s skip_cloning: true spec: - serviceAccountName: ci-operator - volumes: - - name: job-definition - configMap: - name: prow-job-cluster-launch-src - - name: cluster-profile - projected: - sources: - - secret: - name: cluster-secrets-gcp - - configMap: - name: cluster-profile-gcp containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} - volumeMounts: - - name: job-definition - mountPath: /usr/local/e2e-gcp - subPath: cluster-launch-src.yaml - - name: cluster-profile - mountPath: /usr/local/e2e-gcp-cluster-profile + - args: + - --artifact-dir=$(ARTIFACTS) + - --secret-dir=/usr/local/e2e-gcp-cluster-profile + - --template=/usr/local/e2e-gcp + - --target=e2e-gcp + - --git-ref=openshift/origin@master + command: + - ci-operator env: - name: TEST_COMMAND value: test/extended/conformance-k8s.sh @@ -42,66 +31,93 @@ periodics: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-origin key: master.json + name: ci-operator-openshift-origin - name: OVERRIDE_SPEC - value: '{"test_base_image": {"cluster": "", "namespace": "ci", "name": "src-cache-origin", "tag": "master"}}' - command: - - ci-operator - args: - - --artifact-dir=$(ARTIFACTS) - - --secret-dir=/usr/local/e2e-gcp-cluster-profile - - --template=/usr/local/e2e-gcp - - --target=e2e-gcp - - --git-ref=openshift/origin@master - -- name: test_branch_origin_extended_conformance_k8s_310 - agent: jenkins - labels: - master: ci.openshift.redhat.com + value: '{"test_base_image": {"cluster": "", "namespace": "ci", "name": "src-cache-origin", + "tag": "master"}}' + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + volumeMounts: + - mountPath: /usr/local/e2e-gcp + name: job-definition + subPath: cluster-launch-src.yaml + - mountPath: /usr/local/e2e-gcp-cluster-profile + name: cluster-profile + serviceAccountName: ci-operator + volumes: + - configMap: + name: prow-job-cluster-launch-src + name: job-definition + - name: cluster-profile + projected: + sources: + - secret: + name: cluster-secrets-gcp + - configMap: + name: cluster-profile-gcp +- agent: jenkins + cron: "" interval: 24h -- name: test_branch_origin_extended_builds - agent: jenkins labels: - master: ci.openshift.redhat.com + master: ci.openshift.redhat.com + name: test_branch_origin_extended_conformance_k8s_310 +- agent: jenkins + cron: "" interval: 24h -- name: test_branch_origin_extended_clusterup - agent: jenkins labels: - master: ci.openshift.redhat.com + master: ci.openshift.redhat.com + name: test_branch_origin_extended_builds +- agent: jenkins + cron: "" interval: 24h -- name: test_branch_origin_extended_gssapi - agent: jenkins labels: - master: ci.openshift.redhat.com + master: ci.openshift.redhat.com + name: test_branch_origin_extended_clusterup +- agent: jenkins + cron: "" interval: 24h -- name: test_branch_origin_extended_image_ecosystem - agent: jenkins labels: - master: ci.openshift.redhat.com + master: ci.openshift.redhat.com + name: test_branch_origin_extended_gssapi +- agent: jenkins + cron: "" interval: 24h -- name: test_branch_origin_extended_image_registry - agent: jenkins labels: - master: ci.openshift.redhat.com + master: ci.openshift.redhat.com + name: test_branch_origin_extended_image_ecosystem +- agent: jenkins + cron: "" interval: 24h -- name: test_branch_origin_extended_ldap_groups - agent: jenkins labels: - master: ci.openshift.redhat.com + master: ci.openshift.redhat.com + name: test_branch_origin_extended_image_registry +- agent: jenkins + cron: "" interval: 24h -- name: test_branch_origin_extended_networking - agent: jenkins labels: - master: ci.openshift.redhat.com + master: ci.openshift.redhat.com + name: test_branch_origin_extended_ldap_groups +- agent: jenkins + cron: "" interval: 24h -- name: ci-kubernetes-conformance-node-e2e-rhel - agent: jenkins labels: - master: ci.openshift.redhat.com + master: ci.openshift.redhat.com + name: test_branch_origin_extended_networking +- agent: jenkins + cron: "" interval: 2h -- name: ci-kubernetes-conformance-node-e2e-containerized-rhel - agent: jenkins labels: - master: ci.openshift.redhat.com + master: ci.openshift.redhat.com + name: ci-kubernetes-conformance-node-e2e-rhel +- agent: jenkins + cron: "" interval: 2h + labels: + master: ci.openshift.redhat.com + name: ci-kubernetes-conformance-node-e2e-containerized-rhel diff --git a/ci-operator/jobs/openshift/origin/openshift-origin-postsubmits.yaml b/ci-operator/jobs/openshift/origin/openshift-origin-postsubmits.yaml index cff901d8ca1d6..682bde3feffa0 100644 --- a/ci-operator/jobs/openshift/origin/openshift-origin-postsubmits.yaml +++ b/ci-operator/jobs/openshift/origin/openshift-origin-postsubmits.yaml @@ -1,219 +1,224 @@ postsubmits: openshift/origin: - - name: branch-ci-origin-images - agent: kubernetes - labels: - artifacts: images + - agent: kubernetes branches: - master decorate: true + labels: + artifacts: images + name: branch-ci-origin-images skip_cloning: true spec: - serviceAccountName: ci-operator containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + - args: + - --artifact-dir=$(ARTIFACTS) + - --target=[images] + - --target=artifacts + - --promote + command: + - ci-operator env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-origin key: master.json + name: ci-operator-openshift-origin - name: OVERRIDE_SPEC - value: '{"promotion": {"cluster": "https://api.ci.openshift.org", "namespace": "openshift", "name": "origin-v3.11", "additional_images": {"base": "base"}}}' - command: - - ci-operator - args: - - --artifact-dir=$(ARTIFACTS) - - --target=[images] - - --target=artifacts - - --promote - - name: ami_build_origin_int_rhel_build - agent: jenkins - labels: - master: ci.openshift.redhat.com + value: '{"promotion": {"cluster": "https://api.ci.openshift.org", "namespace": + "openshift", "name": "origin-v3.11", "additional_images": {"base": "base"}}}' + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + serviceAccountName: ci-operator + - agent: jenkins branches: - master - - name: push_origin_release_36 - agent: jenkins labels: master: ci.openshift.redhat.com + name: ami_build_origin_int_rhel_build + - agent: jenkins branches: - release-3.6 - - name: push_origin_release_37 - agent: jenkins labels: master: ci.openshift.redhat.com + name: push_origin_release_36 + - agent: jenkins branches: - release-3.7 - - name: push_origin_release_38 - agent: jenkins labels: master: ci.openshift.redhat.com + name: push_origin_release_37 + - agent: jenkins branches: - release-3.8 - - name: push_origin_release_39 - agent: jenkins labels: master: ci.openshift.redhat.com + name: push_origin_release_38 + - agent: jenkins branches: - release-3.9 - - name: push_origin_release_310 - agent: jenkins labels: master: ci.openshift.redhat.com + name: push_origin_release_39 + - agent: jenkins branches: - release-3.10 - - name: test_branch_origin_check - agent: jenkins labels: master: ci.openshift.redhat.com + name: push_origin_release_310 + - agent: jenkins branches: - release-3.6 - release-3.7 - release-3.8 - release-3.9 - - name: test_branch_origin_cmd - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_branch_origin_check + - agent: jenkins branches: - release-3.6 - release-3.7 - release-3.8 - release-3.9 - - name: test_branch_origin_cross - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_branch_origin_cmd + - agent: jenkins branches: - release-3.6 - release-3.7 - release-3.8 - release-3.9 - release-3.10 - - name: test_branch_origin_end_to_end - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_branch_origin_cross + - agent: jenkins branches: - release-3.6 - release-3.7 - release-3.8 - release-3.9 - - name: test_branch_origin_extended_conformance_gce_37 - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_branch_origin_end_to_end + - agent: jenkins branches: - release-3.7 - - name: test_branch_origin_extended_conformance_gce_38 - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_branch_origin_extended_conformance_gce_37 + - agent: jenkins branches: - release-3.8 - - name: test_branch_origin_extended_conformance_gce_39 - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_branch_origin_extended_conformance_gce_38 + - agent: jenkins branches: - release-3.9 - - name: test_branch_origin_extended_conformance_gce_310 - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_branch_origin_extended_conformance_gce_39 + - agent: jenkins branches: - release-3.10 - - name: test_branch_origin_extended_conformance_gce - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_branch_origin_extended_conformance_gce_310 + - agent: jenkins branches: - master - stage - - name: test_branch_origin_extended_conformance_install_36 - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_branch_origin_extended_conformance_gce + - agent: jenkins branches: - release-3.6 - - name: test_branch_origin_extended_conformance_install_37 - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_branch_origin_extended_conformance_install_36 + - agent: jenkins branches: - release-3.7 - - name: test_branch_origin_extended_conformance_install_38 - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_branch_origin_extended_conformance_install_37 + - agent: jenkins branches: - release-3.8 - - name: test_branch_origin_extended_conformance_install_39 - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_branch_origin_extended_conformance_install_38 + - agent: jenkins branches: - release-3.9 - - name: test_branch_origin_extended_conformance_install - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_branch_origin_extended_conformance_install_39 + - agent: jenkins branches: - master - stage - - name: test_branch_origin_extended_networking - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_branch_origin_extended_conformance_install + - agent: jenkins branches: - release-3.6 - release-3.7 - release-3.8 - release-3.9 - - name: test_branch_origin_integration - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_branch_origin_extended_networking + - agent: jenkins branches: - release-3.6 - release-3.7 - release-3.8 - release-3.9 - - name: test_branch_origin_verify_310 - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_branch_origin_integration + - agent: jenkins branches: - release-3.6 - release-3.7 - release-3.8 - release-3.9 - release-3.10 - - name: test_branch_origin_extended_conformance_crio_rpm_310 - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_branch_origin_verify_310 + - agent: jenkins branches: - release-3.9 - release-3.10 - - name: test_branch_origin_service_catalog_310 - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_branch_origin_extended_conformance_crio_rpm_310 + - agent: jenkins branches: - release-3.10 - - name: test_branch_origin_extended_conformance_azure_310 - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_branch_origin_service_catalog_310 + - agent: jenkins branches: - release-3.10 - - name: test_branch_origin_extended_conformance_azure - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_branch_origin_extended_conformance_azure_310 + - agent: jenkins branches: - - master \ No newline at end of file + - master + labels: + master: ci.openshift.redhat.com + name: test_branch_origin_extended_conformance_azure diff --git a/ci-operator/jobs/openshift/origin/openshift-origin-presubmits.yaml b/ci-operator/jobs/openshift/origin/openshift-origin-presubmits.yaml index 97a327f6d0688..0aabc3fdf0dbc 100644 --- a/ci-operator/jobs/openshift/origin/openshift-origin-presubmits.yaml +++ b/ci-operator/jobs/openshift/origin/openshift-origin-presubmits.yaml @@ -1,205 +1,201 @@ presubmits: openshift/origin: - - - name: test_pull_request_origin_verify_310 - agent: jenkins - labels: - master: ci.openshift.redhat.com + - agent: jenkins always_run: true branches: - release-3.10 context: ci/openshift-jenkins/verify - rerun_command: "/test verify" - trigger: "((?m)^/test( all| verify),?(\\s+|$))" - - - name: test_pull_request_origin_cmd - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_pull_request_origin_verify_310 + rerun_command: /test verify + trigger: ((?m)^/test( all| verify),?(\s+|$)) + - agent: jenkins always_run: true context: ci/openshift-jenkins/cmd - rerun_command: "/test cmd" - trigger: "((?m)^/test( all| cmd),?(\\s+|$))" - - - name: pull-ci-origin-unit - agent: kubernetes - context: ci/prow/unit + labels: + master: ci.openshift.redhat.com + name: test_pull_request_origin_cmd + rerun_command: /test cmd + trigger: ((?m)^/test( all| cmd),?(\s+|$)) + - agent: kubernetes + always_run: true branches: - master - dockerless-build-temporary - rerun_command: "/test unit" - always_run: true - trigger: "((?m)^/test( all| unit),?(\\s+|$))" + context: ci/prow/unit decorate: true + name: pull-ci-origin-unit + rerun_command: /test unit skip_cloning: true spec: - serviceAccountName: ci-operator containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + - args: + - --artifact-dir=$(ARTIFACTS) + - --target=unit + command: + - ci-operator env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-origin key: master.json + name: ci-operator-openshift-origin - name: OVERRIDE_SPEC - value: '{"test_base_image": {"cluster": "", "namespace": "ci", "name": "src-cache-origin", "tag": "master"}}' - command: - - ci-operator - args: - - --artifact-dir=$(ARTIFACTS) - - --target=unit - - name: pull-ci-origin-unit-3.10 - agent: kubernetes - context: ci/prow/unit + value: '{"test_base_image": {"cluster": "", "namespace": "ci", "name": "src-cache-origin", + "tag": "master"}}' + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + serviceAccountName: ci-operator + trigger: ((?m)^/test( all| unit),?(\s+|$)) + - agent: kubernetes + always_run: true branches: - release-3.10 - rerun_command: "/test unit" - always_run: true - trigger: "((?m)^/test( all| unit),?(\\s+|$))" + context: ci/prow/unit decorate: true + name: pull-ci-origin-unit-3.10 + rerun_command: /test unit skip_cloning: true spec: - serviceAccountName: ci-operator containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + - args: + - --artifact-dir=$(ARTIFACTS) + - --target=unit + command: + - ci-operator env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-origin key: release-3.10.json - command: - - ci-operator - args: - - --artifact-dir=$(ARTIFACTS) - - --target=unit - - - name: test_pull_request_origin_unit - agent: jenkins - labels: - master: ci.openshift.redhat.com + name: ci-operator-openshift-origin + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + serviceAccountName: ci-operator + trigger: ((?m)^/test( all| unit),?(\s+|$)) + - agent: jenkins + always_run: true branches: - cli-pre-rebase - release-3.9 - release-3.8 - release-3.7 - always_run: true context: ci/openshift-jenkins/unit - rerun_command: "/test unit" - trigger: "((?m)^/test( all| unit),?(\\s+|$))" - - - name: test_pull_request_origin_integration_310 - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_pull_request_origin_unit + rerun_command: /test unit + trigger: ((?m)^/test( all| unit),?(\s+|$)) + - agent: jenkins always_run: true branches: - release-3.10 context: ci/openshift-jenkins/integration - rerun_command: "/test integration" - trigger: "((?m)^/test( all| integration),?(\\s+|$))" - - - name: pull-ci-origin-integration - agent: kubernetes - context: ci/prow/integration + labels: + master: ci.openshift.redhat.com + name: test_pull_request_origin_integration_310 + rerun_command: /test integration + trigger: ((?m)^/test( all| integration),?(\s+|$)) + - agent: kubernetes + always_run: true branches: - master - dockerless-build-temporary - rerun_command: "/test integration" - always_run: true - trigger: "((?m)^/test( all| integration),?(\\s+|$))" + context: ci/prow/integration decorate: true + name: pull-ci-origin-integration + rerun_command: /test integration skip_cloning: true spec: - serviceAccountName: ci-operator containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + - args: + - --artifact-dir=$(ARTIFACTS) + - --target=integration + command: + - ci-operator env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-origin key: master.json + name: ci-operator-openshift-origin - name: OVERRIDE_SPEC - value: '{"test_base_image": {"cluster": "", "namespace": "ci", "name": "src-cache-origin", "tag": "master"}}' - command: - - ci-operator - args: - - --artifact-dir=$(ARTIFACTS) - - --target=integration - - - name: pull-ci-origin-verify - agent: kubernetes - context: ci/prow/verify + value: '{"test_base_image": {"cluster": "", "namespace": "ci", "name": "src-cache-origin", + "tag": "master"}}' + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + serviceAccountName: ci-operator + trigger: ((?m)^/test( all| integration),?(\s+|$)) + - agent: kubernetes + always_run: true branches: - master - dockerless-build-temporary - rerun_command: "/test verify" - always_run: true - trigger: "((?m)^/test( all| verify),?(\\s+|$))" + context: ci/prow/verify decorate: true + name: pull-ci-origin-verify + rerun_command: /test verify skip_cloning: true spec: - serviceAccountName: ci-operator containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + - args: + - --artifact-dir=$(ARTIFACTS) + - --target=verify + command: + - ci-operator env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-origin key: master.json + name: ci-operator-openshift-origin - name: OVERRIDE_SPEC - value: '{"test_base_image": {"cluster": "", "namespace": "ci", "name": "src-cache-origin", "tag": "master"}}' - command: - - ci-operator - args: - - --artifact-dir=$(ARTIFACTS) - - --target=verify - - - name: pull-ci-origin-e2e-gcp - agent: kubernetes - context: ci/prow/gcp + value: '{"test_base_image": {"cluster": "", "namespace": "ci", "name": "src-cache-origin", + "tag": "master"}}' + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + serviceAccountName: ci-operator + trigger: ((?m)^/test( all| verify),?(\s+|$)) + - agent: kubernetes + always_run: true branches: - master - dockerless-build-temporary - rerun_command: "/test gcp" - always_run: true - trigger: "((?m)^/test( all| gcp),?(\\s+|$))" + context: ci/prow/gcp decorate: true + name: pull-ci-origin-e2e-gcp + rerun_command: /test gcp skip_cloning: true spec: - serviceAccountName: ci-operator - volumes: - - name: job-definition - configMap: - name: prow-job-cluster-launch-e2e - - name: cluster-profile - projected: - sources: - - secret: - name: cluster-secrets-gcp - - configMap: - name: cluster-profile-gcp containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} - volumeMounts: - - name: job-definition - mountPath: /usr/local/e2e-gcp - subPath: cluster-launch-e2e.yaml - - name: cluster-profile - mountPath: /usr/local/e2e-gcp-cluster-profile + - args: + - --artifact-dir=$(ARTIFACTS) + - --secret-dir=/usr/local/e2e-gcp-cluster-profile + - --template=/usr/local/e2e-gcp + - --target=e2e-gcp + command: + - ci-operator env: - name: TEST_FOCUS value: Suite:openshift/conformance/parallel @@ -212,53 +208,57 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-origin key: master.json + name: ci-operator-openshift-origin - name: OVERRIDE_SPEC - value: '{"test_base_image": {"cluster": "", "namespace": "ci", "name": "src-cache-origin", "tag": "master"}}' - command: - - ci-operator - args: - - --artifact-dir=$(ARTIFACTS) - - --secret-dir=/usr/local/e2e-gcp-cluster-profile - - --template=/usr/local/e2e-gcp - - --target=e2e-gcp - - - name: pull-ci-origin-e2e-gcp-crio - agent: kubernetes - context: ci/prow/gcp-crio - branches: - - master - - dockerless-build-temporary - rerun_command: "/test gcp-crio" - run_if_changed: '^(vendor/k8s.io/kubernetes/pkg/kubelet)|^(pkg/build/builder)' - always_run: false - trigger: "((?m)^/test( gcp-crio),?(\\s+|$))" - decorate: true - skip_cloning: true - spec: + value: '{"test_base_image": {"cluster": "", "namespace": "ci", "name": "src-cache-origin", + "tag": "master"}}' + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + volumeMounts: + - mountPath: /usr/local/e2e-gcp + name: job-definition + subPath: cluster-launch-e2e.yaml + - mountPath: /usr/local/e2e-gcp-cluster-profile + name: cluster-profile serviceAccountName: ci-operator volumes: - - name: job-definition - configMap: + - configMap: name: prow-job-cluster-launch-e2e + name: job-definition - name: cluster-profile projected: sources: - secret: name: cluster-secrets-gcp - configMap: - name: cluster-profile-gcp-crio + name: cluster-profile-gcp + trigger: ((?m)^/test( all| gcp),?(\s+|$)) + - agent: kubernetes + always_run: false + branches: + - master + - dockerless-build-temporary + context: ci/prow/gcp-crio + decorate: true + name: pull-ci-origin-e2e-gcp-crio + rerun_command: /test gcp-crio + run_if_changed: ^(vendor/k8s.io/kubernetes/pkg/kubelet)|^(pkg/build/builder) + skip_cloning: true + spec: containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} - volumeMounts: - - name: job-definition - mountPath: /usr/local/e2e-gcp-crio - subPath: cluster-launch-e2e.yaml - - name: cluster-profile - mountPath: /usr/local/e2e-gcp-crio-cluster-profile + - args: + - --artifact-dir=$(ARTIFACTS) + - --secret-dir=/usr/local/e2e-gcp-crio-cluster-profile + - --template=/usr/local/e2e-gcp-crio + - --target=e2e-gcp-crio + command: + - ci-operator env: - name: TEST_FOCUS value: Suite:openshift/conformance/parallel @@ -271,54 +271,59 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-origin key: master.json + name: ci-operator-openshift-origin - name: OVERRIDE_SPEC - value: '{"test_base_image": {"cluster": "", "namespace": "ci", "name": "src-cache-origin", "tag": "master"}}' - command: - - ci-operator - args: - - --artifact-dir=$(ARTIFACTS) - - --secret-dir=/usr/local/e2e-gcp-crio-cluster-profile - - --template=/usr/local/e2e-gcp-crio - - --target=e2e-gcp-crio - - - name: pull-ci-origin-launch-gcp - agent: kubernetes - context: ci/prow/launch-gcp - branches: - - master - - dockerless-build-temporary - rerun_command: "/test launch-gcp" - trigger: "((?m)^/test( launch-gcp),?(\\s+|$))" - decorate: true - skip_cloning: true - spec: + value: '{"test_base_image": {"cluster": "", "namespace": "ci", "name": "src-cache-origin", + "tag": "master"}}' + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + volumeMounts: + - mountPath: /usr/local/e2e-gcp-crio + name: job-definition + subPath: cluster-launch-e2e.yaml + - mountPath: /usr/local/e2e-gcp-crio-cluster-profile + name: cluster-profile serviceAccountName: ci-operator volumes: - - name: job-definition - configMap: + - configMap: name: prow-job-cluster-launch-e2e + name: job-definition - name: cluster-profile projected: sources: - secret: name: cluster-secrets-gcp - configMap: - name: cluster-profile-gcp + name: cluster-profile-gcp-crio + trigger: ((?m)^/test( gcp-crio),?(\s+|$)) + - agent: kubernetes + always_run: false + branches: + - master + - dockerless-build-temporary + context: ci/prow/launch-gcp + decorate: true + name: pull-ci-origin-launch-gcp + rerun_command: /test launch-gcp + skip_cloning: true + spec: containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} - volumeMounts: - - name: job-definition - mountPath: /usr/local/e2e-gcp-launch - subPath: cluster-launch-e2e.yaml - - name: cluster-profile - mountPath: /usr/local/e2e-gcp-launch-cluster-profile + - args: + - --artifact-dir=$(ARTIFACTS) + - --secret-dir=/usr/local/e2e-gcp-launch-cluster-profile + - --template=/usr/local/e2e-gcp-launch + - --target=e2e-gcp-launch + command: + - ci-operator env: - name: TEST_COMMAND - value: "sleep 7200 & wait" + value: sleep 7200 & wait - name: TEST_FOCUS_SERIAL value: Suite:openshift/registry/serial - name: JOB_NAME_SAFE @@ -328,86 +333,96 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-origin key: master.json + name: ci-operator-openshift-origin - name: OVERRIDE_SPEC - value: '{"test_base_image": {"cluster": "", "namespace": "ci", "name": "src-cache-origin", "tag": "master"}}' - command: - - ci-operator - args: - - --artifact-dir=$(ARTIFACTS) - - --secret-dir=/usr/local/e2e-gcp-launch-cluster-profile - - --template=/usr/local/e2e-gcp-launch - - --target=e2e-gcp-launch - - - name: test_pull_request_origin_end_to_end - agent: jenkins - labels: - master: ci.openshift.redhat.com + value: '{"test_base_image": {"cluster": "", "namespace": "ci", "name": "src-cache-origin", + "tag": "master"}}' + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + volumeMounts: + - mountPath: /usr/local/e2e-gcp-launch + name: job-definition + subPath: cluster-launch-e2e.yaml + - mountPath: /usr/local/e2e-gcp-launch-cluster-profile + name: cluster-profile + serviceAccountName: ci-operator + volumes: + - configMap: + name: prow-job-cluster-launch-e2e + name: job-definition + - name: cluster-profile + projected: + sources: + - secret: + name: cluster-secrets-gcp + - configMap: + name: cluster-profile-gcp + trigger: ((?m)^/test( launch-gcp),?(\s+|$)) + - agent: jenkins always_run: true context: ci/openshift-jenkins/end_to_end - rerun_command: "/test end_to_end" - trigger: "((?m)^/test( all| end_to_end),?(\\s+|$))" - - - name: test_pull_request_origin_extended_conformance_install_36 - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_pull_request_origin_end_to_end + rerun_command: /test end_to_end + trigger: ((?m)^/test( all| end_to_end),?(\s+|$)) + - agent: jenkins always_run: true branches: - release-3.6 context: ci/openshift-jenkins/extended_conformance_install - rerun_command: "/test extended_conformance_install" - trigger: "((?m)^/test( all| extended_conformance_install),?(\\s+|$))" - - - name: test_pull_request_origin_extended_conformance_install_37 - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_pull_request_origin_extended_conformance_install_36 + rerun_command: /test extended_conformance_install + trigger: ((?m)^/test( all| extended_conformance_install),?(\s+|$)) + - agent: jenkins always_run: true branches: - release-3.7 context: ci/openshift-jenkins/extended_conformance_install - rerun_command: "/test extended_conformance_install" - trigger: "((?m)^/test( all| extended_conformance_install),?(\\s+|$))" - - - name: test_pull_request_origin_extended_conformance_install_38 - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_pull_request_origin_extended_conformance_install_37 + rerun_command: /test extended_conformance_install + trigger: ((?m)^/test( all| extended_conformance_install),?(\s+|$)) + - agent: jenkins always_run: true branches: - release-3.8 context: ci/openshift-jenkins/extended_conformance_install - rerun_command: "/test extended_conformance_install" - trigger: "((?m)^/test( all| extended_conformance_install),?(\\s+|$))" - - - name: test_pull_request_origin_extended_conformance_install_39 - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_pull_request_origin_extended_conformance_install_38 + rerun_command: /test extended_conformance_install + trigger: ((?m)^/test( all| extended_conformance_install),?(\s+|$)) + - agent: jenkins always_run: true branches: - release-3.9 context: ci/openshift-jenkins/extended_conformance_install - rerun_command: "/test extended_conformance_install" - trigger: "((?m)^/test( all| extended_conformance_install),?(\\s+|$))" - - - name: test_pull_request_origin_extended_conformance_install_310 - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_pull_request_origin_extended_conformance_install_39 + rerun_command: /test extended_conformance_install + trigger: ((?m)^/test( all| extended_conformance_install),?(\s+|$)) + - agent: jenkins always_run: true branches: - release-3.10 context: ci/openshift-jenkins/extended_conformance_install - rerun_command: "/test extended_conformance_install" - trigger: "((?m)^/test( all| extended_conformance_install),?(\\s+|$))" - - - name: test_pull_request_origin_extended_conformance_install - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_pull_request_origin_extended_conformance_install_310 + rerun_command: /test extended_conformance_install + trigger: ((?m)^/test( all| extended_conformance_install),?(\s+|$)) + - agent: jenkins always_run: true branches: - cli-pre-rebase @@ -415,109 +430,91 @@ presubmits: - stage - dockerless-build-temporary context: ci/openshift-jenkins/extended_conformance_install - rerun_command: "/test extended_conformance_install" - trigger: "((?m)^/test( all| extended_conformance_install),?(\\s+|$))" - - - name: test_pull_request_origin_extended_conformance_install_update - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_pull_request_origin_extended_conformance_install + rerun_command: /test extended_conformance_install + trigger: ((?m)^/test( all| extended_conformance_install),?(\s+|$)) + - agent: jenkins always_run: false - skip_report: true branches: - release-3.10 context: ci/openshift-jenkins/extended_conformance_install_update - rerun_command: "/test extended_conformance_install_update" - trigger: "((?m)^/test( extended_conformance_install_update),?(\\s+|$))" - - - name: test_pull_request_origin_extended_conformance_gce_37 - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_pull_request_origin_extended_conformance_install_update + rerun_command: /test extended_conformance_install_update + skip_report: true + trigger: ((?m)^/test( extended_conformance_install_update),?(\s+|$)) + - agent: jenkins always_run: true branches: - release-3.7 context: ci/openshift-jenkins/gcp - rerun_command: "/test gcp" - trigger: "((?m)^/test( all| gcp),?(\\s+|$))" - - - name: test_pull_request_origin_extended_conformance_gce_39 - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_pull_request_origin_extended_conformance_gce_37 + rerun_command: /test gcp + trigger: ((?m)^/test( all| gcp),?(\s+|$)) + - agent: jenkins always_run: true branches: - release-3.9 context: ci/openshift-jenkins/gcp - rerun_command: "/test gcp" - trigger: "((?m)^/test( all| gcp),?(\\s+|$))" - - - name: test_pull_request_origin_extended_conformance_gce_310 - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_pull_request_origin_extended_conformance_gce_39 + rerun_command: /test gcp + trigger: ((?m)^/test( all| gcp),?(\s+|$)) + - agent: jenkins always_run: true branches: - release-3.10 context: ci/openshift-jenkins/gcp - rerun_command: "/test gcp" - trigger: "((?m)^/test( all| gcp),?(\\s+|$))" - - - name: test_pull_request_origin_extended_conformance_gce - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_pull_request_origin_extended_conformance_gce_310 + rerun_command: /test gcp + trigger: ((?m)^/test( all| gcp),?(\s+|$)) + - agent: jenkins always_run: true branches: - cli-pre-rebase context: ci/openshift-jenkins/gcp - rerun_command: "/test gcp" - trigger: "((?m)^/test( all| gcp),?(\\s+|$))" - - - name: test_pull_request_origin_extended_conformance_k8s_310 - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_pull_request_origin_extended_conformance_gce + rerun_command: /test gcp + trigger: ((?m)^/test( all| gcp),?(\s+|$)) + - agent: jenkins + always_run: false branches: - release-3.10 - always_run: false context: ci/openshift-jenkins/extended_conformance_k8s - rerun_command: "/test conformance_k8s" - trigger: "((?m)^/test conformance_k8s,?(\\s+|$))" - - - name: pull-ci-origin-conformance-k8s - agent: kubernetes - context: ci/prow/conformance-k8s + labels: + master: ci.openshift.redhat.com + name: test_pull_request_origin_extended_conformance_k8s_310 + rerun_command: /test conformance_k8s + trigger: ((?m)^/test conformance_k8s,?(\s+|$)) + - agent: kubernetes + always_run: false branches: - master - dockerless-build-temporary - rerun_command: "/test conformance-k8s" - trigger: "((?m)^/test( conformance-k8s),?(\\s+|$))" + context: ci/prow/conformance-k8s decorate: true + name: pull-ci-origin-conformance-k8s + rerun_command: /test conformance-k8s skip_cloning: true spec: - serviceAccountName: ci-operator - volumes: - - name: job-definition - configMap: - name: prow-job-cluster-launch-src - - name: cluster-profile - projected: - sources: - - secret: - name: cluster-secrets-gcp - - configMap: - name: cluster-profile-gcp containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} - volumeMounts: - - name: job-definition - mountPath: /usr/local/e2e-gcp - subPath: cluster-launch-src.yaml - - name: cluster-profile - mountPath: /usr/local/e2e-gcp-cluster-profile + - args: + - --artifact-dir=$(ARTIFACTS) + - --secret-dir=/usr/local/e2e-gcp-cluster-profile + - --template=/usr/local/e2e-gcp + - --target=e2e-gcp + command: + - ci-operator env: - name: TEST_COMMAND value: test/extended/conformance-k8s.sh @@ -528,33 +525,29 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-origin key: master.json + name: ci-operator-openshift-origin - name: OVERRIDE_SPEC - value: '{"test_base_image": {"cluster": "", "namespace": "ci", "name": "src-cache-origin", "tag": "master"}}' - command: - - ci-operator - args: - - --artifact-dir=$(ARTIFACTS) - - --secret-dir=/usr/local/e2e-gcp-cluster-profile - - --template=/usr/local/e2e-gcp - - --target=e2e-gcp - - - name: pull-ci-origin-conformance-k8s-310 - agent: kubernetes - context: ci/prow/conformance-k8s - branches: - - release-3.10 - rerun_command: "/test conformance-k8s" - trigger: "((?m)^/test( conformance-k8s),?(\\s+|$))" - decorate: true - skip_cloning: true - spec: + value: '{"test_base_image": {"cluster": "", "namespace": "ci", "name": "src-cache-origin", + "tag": "master"}}' + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + volumeMounts: + - mountPath: /usr/local/e2e-gcp + name: job-definition + subPath: cluster-launch-src.yaml + - mountPath: /usr/local/e2e-gcp-cluster-profile + name: cluster-profile serviceAccountName: ci-operator volumes: - - name: job-definition - configMap: + - configMap: name: prow-job-cluster-launch-src + name: job-definition - name: cluster-profile projected: sources: @@ -562,16 +555,25 @@ presubmits: name: cluster-secrets-gcp - configMap: name: cluster-profile-gcp + trigger: ((?m)^/test( conformance-k8s),?(\s+|$)) + - agent: kubernetes + always_run: false + branches: + - release-3.10 + context: ci/prow/conformance-k8s + decorate: true + name: pull-ci-origin-conformance-k8s-310 + rerun_command: /test conformance-k8s + skip_cloning: true + spec: containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} - volumeMounts: - - name: job-definition - mountPath: /usr/local/e2e-gcp - subPath: cluster-launch-src.yaml - - name: cluster-profile - mountPath: /usr/local/e2e-gcp-cluster-profile + - args: + - --artifact-dir=$(ARTIFACTS) + - --secret-dir=/usr/local/e2e-gcp-cluster-profile + - --template=/usr/local/e2e-gcp + - --target=e2e-gcp + command: + - ci-operator env: - name: TEST_COMMAND value: test/extended/conformance-k8s.sh @@ -582,295 +584,301 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-origin key: master.json + name: ci-operator-openshift-origin - name: OVERRIDE_SPEC - value: '{"test_base_image": {"cluster": "", "namespace": "ci", "name": "src-cache-origin", "tag": "master"}}' - command: - - ci-operator - args: - - --artifact-dir=$(ARTIFACTS) - - --secret-dir=/usr/local/e2e-gcp-cluster-profile - - --template=/usr/local/e2e-gcp - - --target=e2e-gcp - - - name: test_pull_request_origin_extended_networking_310 - agent: jenkins - labels: - master: ci.openshift.redhat.com + value: '{"test_base_image": {"cluster": "", "namespace": "ci", "name": "src-cache-origin", + "tag": "master"}}' + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + volumeMounts: + - mountPath: /usr/local/e2e-gcp + name: job-definition + subPath: cluster-launch-src.yaml + - mountPath: /usr/local/e2e-gcp-cluster-profile + name: cluster-profile + serviceAccountName: ci-operator + volumes: + - configMap: + name: prow-job-cluster-launch-src + name: job-definition + - name: cluster-profile + projected: + sources: + - secret: + name: cluster-secrets-gcp + - configMap: + name: cluster-profile-gcp + trigger: ((?m)^/test( conformance-k8s),?(\s+|$)) + - agent: jenkins always_run: false branches: - release-3.10 context: ci/openshift-jenkins/extended_networking - rerun_command: "/test extended_networking" - trigger: "((?m)^/test extended_networking,?(\\s+|$))" - - - name: test_pull_request_origin_extended_networking - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_pull_request_origin_extended_networking_310 + rerun_command: /test extended_networking + trigger: ((?m)^/test extended_networking,?(\s+|$)) + - agent: jenkins always_run: false branches: - master context: ci/openshift-jenkins/extended_networking - rerun_command: "/test extended_networking" - trigger: "((?m)^/test extended_networking,?(\\s+|$))" - - - name: test_pull_request_origin_extended_builds - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_pull_request_origin_extended_networking + rerun_command: /test extended_networking + trigger: ((?m)^/test extended_networking,?(\s+|$)) + - agent: jenkins + always_run: false branches: - master - dockerless-build-temporary - run_if_changed: '^(pkg/oc/cli/cmd/startbuild.go)|^(pkg/build)|^(pkg/cmd/infra/builder)|^(test/extended/builds)|^(test/extended/testdata/builds)|^(vendor/github.com/openshift/source-to-image)|^(vendor/github.com/openshift/imagebuilder)' context: ci/openshift-jenkins/extended_builds - rerun_command: "/test extended_builds" - trigger: "((?m)^/test extended_builds,?(\\s+|$))" - - - name: test_pull_request_origin_extended_builds_310 - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_pull_request_origin_extended_builds + rerun_command: /test extended_builds + run_if_changed: ^(pkg/oc/cli/cmd/startbuild.go)|^(pkg/build)|^(pkg/cmd/infra/builder)|^(test/extended/builds)|^(test/extended/testdata/builds)|^(vendor/github.com/openshift/source-to-image)|^(vendor/github.com/openshift/imagebuilder) + trigger: ((?m)^/test extended_builds,?(\s+|$)) + - agent: jenkins + always_run: false branches: - release-3.10 - run_if_changed: '^(pkg/oc/cli/cmd/startbuild.go)|^(pkg/build)|^(pkg/cmd/infra/builder)|^(test/extended/builds)|^(test/extended/testdata/builds)|^(vendor/github.com/openshift/source-to-image)|^(vendor/github.com/openshift/imagebuilder)' context: ci/openshift-jenkins/extended_builds - rerun_command: "/test extended_builds" - trigger: "((?m)^/test extended_builds,?(\\s+|$))" - - - name: test_pull_request_origin_extended_clusterup - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_pull_request_origin_extended_builds_310 + rerun_command: /test extended_builds + run_if_changed: ^(pkg/oc/cli/cmd/startbuild.go)|^(pkg/build)|^(pkg/cmd/infra/builder)|^(test/extended/builds)|^(test/extended/testdata/builds)|^(vendor/github.com/openshift/source-to-image)|^(vendor/github.com/openshift/imagebuilder) + trigger: ((?m)^/test extended_builds,?(\s+|$)) + - agent: jenkins + always_run: true branches: - master - dockerless-build-temporary - always_run: true context: ci/openshift-jenkins/extended_clusterup - rerun_command: "/test extended_clusterup" - trigger: "((?m)^/test extended_clusterup,?(\\s+|$))" - - - name: test_pull_request_origin_extended_clusterup_310 - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_pull_request_origin_extended_clusterup + rerun_command: /test extended_clusterup + trigger: ((?m)^/test extended_clusterup,?(\s+|$)) + - agent: jenkins always_run: true branches: - release-3.10 context: ci/openshift-jenkins/extended_clusterup - rerun_command: "/test extended_clusterup" - trigger: "((?m)^/test extended_clusterup,?(\\s+|$))" - - - name: test_pull_request_origin_extended_gssapi_310 - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_pull_request_origin_extended_clusterup_310 + rerun_command: /test extended_clusterup + trigger: ((?m)^/test extended_clusterup,?(\s+|$)) + - agent: jenkins always_run: false branches: - release-3.10 context: ci/openshift-jenkins/extended_gssapi - rerun_command: "/test extended_gssapi" - trigger: "((?m)^/test extended_gssapi,?(\\s+|$))" - - - name: test_pull_request_origin_extended_gssapi - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_pull_request_origin_extended_gssapi_310 + rerun_command: /test extended_gssapi + trigger: ((?m)^/test extended_gssapi,?(\s+|$)) + - agent: jenkins always_run: false branches: - master - dockerless-build-temporary context: ci/openshift-jenkins/extended_gssapi - rerun_command: "/test extended_gssapi" - trigger: "((?m)^/test extended_gssapi,?(\\s+|$))" - - - name: test_pull_request_origin_extended_image_ecosystem_310 - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_pull_request_origin_extended_gssapi + rerun_command: /test extended_gssapi + trigger: ((?m)^/test extended_gssapi,?(\s+|$)) + - agent: jenkins + always_run: false branches: - release-3.10 - run_if_changed: '^(test/extended/image_ecosystem)|^(examples/db-templates)|^(examples/quickstarts)|^(examples/image-streams)|^(examples/jenkins)|^(vendor/github.com/openshift/source-to-image)|^(vendor/github.com/openshift/imagebuilder)' context: ci/openshift-jenkins/extended_image_ecosystem - rerun_command: "/test extended_image_ecosystem" - trigger: "((?m)^/test extended_image_ecosystem,?(\\s+|$))" - - - name: test_pull_request_origin_extended_image_ecosystem - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_pull_request_origin_extended_image_ecosystem_310 + rerun_command: /test extended_image_ecosystem + run_if_changed: ^(test/extended/image_ecosystem)|^(examples/db-templates)|^(examples/quickstarts)|^(examples/image-streams)|^(examples/jenkins)|^(vendor/github.com/openshift/source-to-image)|^(vendor/github.com/openshift/imagebuilder) + trigger: ((?m)^/test extended_image_ecosystem,?(\s+|$)) + - agent: jenkins + always_run: false branches: - master - dockerless-build-temporary - run_if_changed: '^(test/extended/image_ecosystem)|^(examples/db-templates)|^(examples/quickstarts)|^(examples/image-streams)|^(examples/jenkins)|^(vendor/github.com/openshift/source-to-image)|^(vendor/github.com/openshift/imagebuilder)' context: ci/openshift-jenkins/extended_image_ecosystem - rerun_command: "/test extended_image_ecosystem" - trigger: "((?m)^/test extended_image_ecosystem,?(\\s+|$))" - - - name: test_pull_request_origin_extended_image_registry_310 - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_pull_request_origin_extended_image_ecosystem + rerun_command: /test extended_image_ecosystem + run_if_changed: ^(test/extended/image_ecosystem)|^(examples/db-templates)|^(examples/quickstarts)|^(examples/image-streams)|^(examples/jenkins)|^(vendor/github.com/openshift/source-to-image)|^(vendor/github.com/openshift/imagebuilder) + trigger: ((?m)^/test extended_image_ecosystem,?(\s+|$)) + - agent: jenkins always_run: false branches: - release-3.10 - run_if_changed: '^(pkg/image)|^(test/extended/registry)|^(test/extended/images)|^(test/extended/imageapis)|^(vendor/github.com/docker/distribution)' context: ci/openshift-jenkins/extended_image_registry - rerun_command: "/test extended_image_registry" - trigger: "((?m)^/test extended_image_registry,?(\\s+|$))" - - - name: test_pull_request_origin_extended_image_registry - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_pull_request_origin_extended_image_registry_310 + rerun_command: /test extended_image_registry + run_if_changed: ^(pkg/image)|^(test/extended/registry)|^(test/extended/images)|^(test/extended/imageapis)|^(vendor/github.com/docker/distribution) + trigger: ((?m)^/test extended_image_registry,?(\s+|$)) + - agent: jenkins + always_run: false branches: - master - dockerless-build-temporary - always_run: false - run_if_changed: '^(pkg/image)|^(test/extended/registry)|^(test/extended/images)|^(test/extended/imageapis)|^(vendor/github.com/docker/distribution)' context: ci/openshift-jenkins/extended_image_registry - rerun_command: "/test extended_image_registry" - trigger: "((?m)^/test extended_image_registry,?(\\s+|$))" - - - name: test_pull_request_origin_extended_ldap_groups_310 - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_pull_request_origin_extended_image_registry + rerun_command: /test extended_image_registry + run_if_changed: ^(pkg/image)|^(test/extended/registry)|^(test/extended/images)|^(test/extended/imageapis)|^(vendor/github.com/docker/distribution) + trigger: ((?m)^/test extended_image_registry,?(\s+|$)) + - agent: jenkins always_run: false branches: - release-3.10 context: ci/openshift-jenkins/extended_ldap_groups - rerun_command: "/test extended_ldap_groups" - trigger: "((?m)^/test extended_ldap_groups,?(\\s+|$))" - - - name: test_pull_request_origin_extended_ldap_groups - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_pull_request_origin_extended_ldap_groups_310 + rerun_command: /test extended_ldap_groups + trigger: ((?m)^/test extended_ldap_groups,?(\s+|$)) + - agent: jenkins always_run: false branches: - master - dockerless-build-temporary context: ci/openshift-jenkins/extended_ldap_groups - rerun_command: "/test extended_ldap_groups" - trigger: "((?m)^/test extended_ldap_groups,?(\\s+|$))" - - - name: pull-ci-origin-cross - agent: kubernetes - context: ci/prow/cross - rerun_command: "/test cross" - trigger: "((?m)^/test cross,?(\\s+|$))" - run_if_changed: '^(hack/)|(Makefile)|(.*_(windows|linux|darwin|unsupported)(_test)?\.go)$' + labels: + master: ci.openshift.redhat.com + name: test_pull_request_origin_extended_ldap_groups + rerun_command: /test extended_ldap_groups + trigger: ((?m)^/test extended_ldap_groups,?(\s+|$)) + - agent: kubernetes + always_run: false branches: - master - dockerless-build-temporary + context: ci/prow/cross decorate: true + name: pull-ci-origin-cross + rerun_command: /test cross + run_if_changed: ^(hack/)|(Makefile)|(.*_(windows|linux|darwin|unsupported)(_test)?\.go)$ skip_cloning: true spec: - serviceAccountName: ci-operator containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + - args: + - --artifact-dir=$(ARTIFACTS) + - --target=artifacts + command: + - ci-operator env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-origin key: master.json + name: ci-operator-openshift-origin - name: OVERRIDE_SPEC - value: '{"test_base_image": {"cluster": "", "namespace": "ci", "name": "src-cache-origin", "tag": "master"}}' - command: - - ci-operator - args: - - --artifact-dir=$(ARTIFACTS) - - --target=artifacts - - - name: test_pull_request_origin_launch_gce_310 - agent: jenkins - labels: - master: ci.openshift.redhat.com + value: '{"test_base_image": {"cluster": "", "namespace": "ci", "name": "src-cache-origin", + "tag": "master"}}' + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + serviceAccountName: ci-operator + trigger: ((?m)^/test cross,?(\s+|$)) + - agent: jenkins always_run: false branches: - release-3.10 context: ci/openshift-jenkins/launch-gcp - rerun_command: "/test launch-gcp" - trigger: "((?m)^/test launch-gcp,?(\\s+|$))" - - - name: test_pull_request_origin_extended_conformance_crio_rpm_310 - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_pull_request_origin_launch_gce_310 + rerun_command: /test launch-gcp + trigger: ((?m)^/test launch-gcp,?(\s+|$)) + - agent: jenkins + always_run: true branches: - release-3.10 - always_run: true - skip_report: true context: ci/openshift-jenkins/extended_conformance_crio_rpm - rerun_command: "/test crio" - trigger: "((?m)^/test crio,?(\\s+|$))" - - - name: test_pull_request_origin_service_catalog_39 - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_pull_request_origin_extended_conformance_crio_rpm_310 + rerun_command: /test crio + skip_report: true + trigger: ((?m)^/test crio,?(\s+|$)) + - agent: jenkins always_run: false branches: - release-3.9 - run_if_changed: '^(pkg/cmd/server/bootstrappolicy)|^(pkg/oc/bootstrap/docker/openshift)|^(cmd/service-catalog)|^(examples/service-catalog)' context: ci/openshift-jenkins/service-catalog - rerun_command: "/test service-catalog" - trigger: "((?m)^/test service-catalog,?(\\s+|$))" - - - name: test_pull_request_origin_service_catalog_310 - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_pull_request_origin_service_catalog_39 + rerun_command: /test service-catalog + run_if_changed: ^(pkg/cmd/server/bootstrappolicy)|^(pkg/oc/bootstrap/docker/openshift)|^(cmd/service-catalog)|^(examples/service-catalog) + trigger: ((?m)^/test service-catalog,?(\s+|$)) + - agent: jenkins always_run: false branches: - release-3.10 - run_if_changed: '^(pkg/cmd/server/bootstrappolicy)|^(pkg/oc/bootstrap/docker/openshift)|^(cmd/service-catalog)|^(examples/service-catalog)' context: ci/openshift-jenkins/service-catalog - rerun_command: "/test service-catalog" - trigger: "((?m)^/test service-catalog,?(\\s+|$))" - - - name: test_pull_request_origin_service_catalog - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_pull_request_origin_service_catalog_310 + rerun_command: /test service-catalog + run_if_changed: ^(pkg/cmd/server/bootstrappolicy)|^(pkg/oc/bootstrap/docker/openshift)|^(cmd/service-catalog)|^(examples/service-catalog) + trigger: ((?m)^/test service-catalog,?(\s+|$)) + - agent: jenkins always_run: false branches: - cli-pre-rebase - master - dockerless-build-temporary - run_if_changed: '^(pkg/cmd/server/bootstrappolicy)|^(pkg/oc/bootstrap/docker/openshift)|^(examples/service-catalog)|^(pkg/oc/bootstrap/clusteradd/components/service-catalog)' context: ci/openshift-jenkins/service-catalog - rerun_command: "/test service-catalog" - trigger: "((?m)^/test service-catalog,?(\\s+|$))" - - - name: test_pull_request_origin_extended_conformance_azure_310 - agent: jenkins labels: master: ci.openshift.redhat.com + name: test_pull_request_origin_service_catalog + rerun_command: /test service-catalog + run_if_changed: ^(pkg/cmd/server/bootstrappolicy)|^(pkg/oc/bootstrap/docker/openshift)|^(examples/service-catalog)|^(pkg/oc/bootstrap/clusteradd/components/service-catalog) + trigger: ((?m)^/test service-catalog,?(\s+|$)) + - agent: jenkins always_run: true - # TODO: Remove once the job is stable - skip_report: true branches: - release-3.10 context: ci/openshift-jenkins/azure - rerun_command: "/test azure" - trigger: "((?m)^/test( all| azure),?(\\s+|$))" - - - name: test_pull_request_origin_extended_conformance_azure - agent: jenkins labels: master: ci.openshift.redhat.com - always_run: true - # TODO: Remove once the job is stable + name: test_pull_request_origin_extended_conformance_azure_310 + rerun_command: /test azure skip_report: true + trigger: ((?m)^/test( all| azure),?(\s+|$)) + - agent: jenkins + always_run: true branches: - master - dockerless-build-temporary context: ci/openshift-jenkins/azure - rerun_command: "/test azure" - trigger: "((?m)^/test( all| azure),?(\\s+|$))" + labels: + master: ci.openshift.redhat.com + name: test_pull_request_origin_extended_conformance_azure + rerun_command: /test azure + skip_report: true + trigger: ((?m)^/test( all| azure),?(\s+|$)) diff --git a/ci-operator/jobs/openshift/os/openshift-os-presubmits.yaml b/ci-operator/jobs/openshift/os/openshift-os-presubmits.yaml index 9073fe64ef09e..1198bcbf66765 100644 --- a/ci-operator/jobs/openshift/os/openshift-os-presubmits.yaml +++ b/ci-operator/jobs/openshift/os/openshift-os-presubmits.yaml @@ -1,69 +1,48 @@ presubmits: openshift/os: - - name: pull-ci-os-container-check - agent: kubernetes - context: pull-ci-os-container-check + - agent: kubernetes + always_run: true branches: - master - dockerless-build-temporary - rerun_command: "/test check" - always_run: true - trigger: "((?m)^/test( all| check),?(\\s+|$))" + context: pull-ci-os-container-check decorate: true + name: pull-ci-os-container-check + rerun_command: /test check spec: - volumes: - - name: docker-socket - hostPath: - path: /var/run/docker.sock - serviceAccountName: privileged-builder containers: - - name: build + - command: + - ./.prow.sh image: registry.svc.ci.openshift.org/ci/origin-release:golang-1.9 - volumeMounts: - - name: docker-socket - mountPath: /var/run/docker.sock + name: build + resources: {} securityContext: - # TODO: the team has promised me they will be able to remove this soon privileged: true runAsUser: 0 - command: - - ./.prow.sh - - - name: pull-ci-os-container-build - agent: kubernetes - context: pull-ci-os-container-build + volumeMounts: + - mountPath: /var/run/docker.sock + name: docker-socket + serviceAccountName: privileged-builder + volumes: + - hostPath: + path: /var/run/docker.sock + name: docker-socket + trigger: ((?m)^/test( all| check),?(\s+|$)) + - agent: kubernetes + always_run: true branches: - master - dockerless-build-temporary - rerun_command: "/test build" - always_run: true - trigger: "((?m)^/test( all| build),?(\\s+|$))" + context: pull-ci-os-container-build decorate: true + name: pull-ci-os-container-build + rerun_command: /test build spec: - volumes: - - name: docker-socket - hostPath: - path: /var/run/docker.sock - - name: docker-binary - hostPath: - path: /usr/bin/docker - serviceAccountName: privileged-builder containers: - - name: build - image: registry.svc.ci.openshift.org/ci/origin-release:golang-1.9 - volumeMounts: - - name: docker-socket - mountPath: /var/run/docker.sock - - name: docker-binary - mountPath: /usr/bin/docker - securityContext: - # TODO: the team has promised me they will be able to remove this soon - privileged: true - runAsUser: 0 - command: + - command: - /bin/bash - -c - - | + - |- #!/bin/bash set -euo pipefail cat {atomic-centos-continuous,rhcos-continuous,ignition}.repo >/tmp/preserve @@ -71,4 +50,24 @@ presubmits: mv /tmp/preserve openshift.repo curl http://rpm-mirror.ci.svc >> openshift.repo 2>/dev/null echo "true" > generate-openshift-repo - imagebuilder -privileged . \ No newline at end of file + imagebuilder -privileged . + image: registry.svc.ci.openshift.org/ci/origin-release:golang-1.9 + name: build + resources: {} + securityContext: + privileged: true + runAsUser: 0 + volumeMounts: + - mountPath: /var/run/docker.sock + name: docker-socket + - mountPath: /usr/bin/docker + name: docker-binary + serviceAccountName: privileged-builder + volumes: + - hostPath: + path: /var/run/docker.sock + name: docker-socket + - hostPath: + path: /usr/bin/docker + name: docker-binary + trigger: ((?m)^/test( all| build),?(\s+|$)) diff --git a/ci-operator/jobs/openshift/ose/openshift-ose-periodics.yaml b/ci-operator/jobs/openshift/ose/openshift-ose-periodics.yaml index 282a5e61cbe50..5ea300aca862f 100644 --- a/ci-operator/jobs/openshift/ose/openshift-ose-periodics.yaml +++ b/ci-operator/jobs/openshift/ose/openshift-ose-periodics.yaml @@ -1,131 +1,151 @@ periodics: -- name: ami_build_ose_master - agent: jenkins - labels: - master: ci.dev.openshift.redhat.com +- agent: jenkins + cron: "" interval: 24h -- name: ami_build_ose_enterprise_39 - agent: jenkins labels: master: ci.dev.openshift.redhat.com + name: ami_build_ose_master +- agent: jenkins + cron: "" interval: 24h -- name: ami_build_ose_enterprise_38 - agent: jenkins labels: master: ci.dev.openshift.redhat.com + name: ami_build_ose_enterprise_39 +- agent: jenkins + cron: "" interval: 24h -- name: ami_build_ose_enterprise_37 - agent: jenkins labels: master: ci.dev.openshift.redhat.com + name: ami_build_ose_enterprise_38 +- agent: jenkins + cron: "" interval: 24h -- name: ami_build_ose_enterprise_36 - agent: jenkins labels: master: ci.dev.openshift.redhat.com + name: ami_build_ose_enterprise_37 +- agent: jenkins + cron: "" interval: 24h - -- name: test_branch_ose_check_and_verify_tasks - agent: jenkins labels: master: ci.dev.openshift.redhat.com + name: ami_build_ose_enterprise_36 +- agent: jenkins + cron: "" interval: 4h -- name: test_branch_ose_conformance - agent: jenkins labels: master: ci.dev.openshift.redhat.com + name: test_branch_ose_check_and_verify_tasks +- agent: jenkins + cron: "" interval: 4h -- name: test_branch_ose_integration_and_end_to_end - agent: jenkins labels: master: ci.dev.openshift.redhat.com + name: test_branch_ose_conformance +- agent: jenkins + cron: "" interval: 4h -- name: test_branch_ose_networking - agent: jenkins labels: master: ci.dev.openshift.redhat.com + name: test_branch_ose_integration_and_end_to_end +- agent: jenkins + cron: "" interval: 4h - -- name: test_branch_ose_check_and_verify_tasks_39 - agent: jenkins labels: master: ci.dev.openshift.redhat.com + name: test_branch_ose_networking +- agent: jenkins + cron: "" interval: 4h -- name: test_branch_ose_conformance_39 - agent: jenkins labels: master: ci.dev.openshift.redhat.com + name: test_branch_ose_check_and_verify_tasks_39 +- agent: jenkins + cron: "" interval: 4h -- name: test_branch_ose_integration_and_end_to_end_39 - agent: jenkins labels: master: ci.dev.openshift.redhat.com + name: test_branch_ose_conformance_39 +- agent: jenkins + cron: "" interval: 4h -- name: test_branch_ose_networking_39 - agent: jenkins labels: master: ci.dev.openshift.redhat.com + name: test_branch_ose_integration_and_end_to_end_39 +- agent: jenkins + cron: "" interval: 4h - -- name: test_branch_ose_check_and_verify_tasks_38 - agent: jenkins labels: master: ci.dev.openshift.redhat.com + name: test_branch_ose_networking_39 +- agent: jenkins + cron: "" interval: 4h -- name: test_branch_ose_conformance_38 - agent: jenkins labels: master: ci.dev.openshift.redhat.com + name: test_branch_ose_check_and_verify_tasks_38 +- agent: jenkins + cron: "" interval: 4h -- name: test_branch_ose_integration_and_end_to_end_38 - agent: jenkins labels: master: ci.dev.openshift.redhat.com + name: test_branch_ose_conformance_38 +- agent: jenkins + cron: "" interval: 4h -- name: test_branch_ose_networking_38 - agent: jenkins labels: master: ci.dev.openshift.redhat.com + name: test_branch_ose_integration_and_end_to_end_38 +- agent: jenkins + cron: "" interval: 4h - -- name: test_branch_ose_check_and_verify_tasks_37 - agent: jenkins labels: master: ci.dev.openshift.redhat.com + name: test_branch_ose_networking_38 +- agent: jenkins + cron: "" interval: 4h -- name: test_branch_ose_conformance_37 - agent: jenkins labels: master: ci.dev.openshift.redhat.com + name: test_branch_ose_check_and_verify_tasks_37 +- agent: jenkins + cron: "" interval: 4h -- name: test_branch_ose_integration_and_end_to_end_37 - agent: jenkins labels: master: ci.dev.openshift.redhat.com + name: test_branch_ose_conformance_37 +- agent: jenkins + cron: "" interval: 4h -- name: test_branch_ose_networking_37 - agent: jenkins labels: master: ci.dev.openshift.redhat.com + name: test_branch_ose_integration_and_end_to_end_37 +- agent: jenkins + cron: "" interval: 4h - -- name: test_branch_ose_check_and_verify_tasks_36 - agent: jenkins labels: master: ci.dev.openshift.redhat.com + name: test_branch_ose_networking_37 +- agent: jenkins + cron: "" interval: 4h -- name: test_branch_ose_conformance_36 - agent: jenkins labels: master: ci.dev.openshift.redhat.com + name: test_branch_ose_check_and_verify_tasks_36 +- agent: jenkins + cron: "" interval: 4h -- name: test_branch_ose_integration_and_end_to_end_36 - agent: jenkins labels: master: ci.dev.openshift.redhat.com + name: test_branch_ose_conformance_36 +- agent: jenkins + cron: "" interval: 4h -- name: test_branch_ose_networking_36 - agent: jenkins labels: master: ci.dev.openshift.redhat.com + name: test_branch_ose_integration_and_end_to_end_36 +- agent: jenkins + cron: "" interval: 4h + labels: + master: ci.dev.openshift.redhat.com + name: test_branch_ose_networking_36 diff --git a/ci-operator/jobs/openshift/ose/openshift-ose-presubmits.yaml b/ci-operator/jobs/openshift/ose/openshift-ose-presubmits.yaml index 3b843cdf7db8b..a5c27df6efd19 100644 --- a/ci-operator/jobs/openshift/ose/openshift-ose-presubmits.yaml +++ b/ci-operator/jobs/openshift/ose/openshift-ose-presubmits.yaml @@ -1,37 +1,34 @@ presubmits: openshift/ose: - - name: test_pull_request_ose_check_and_verify_tasks - agent: jenkins - labels: - master: ci.dev.openshift.redhat.com + - agent: jenkins always_run: false context: ci/openshift-jenkins/check - rerun_command: "/test check" - trigger: "((?m)^/test( all| check),?(\\s+|$))" - - - name: test_pull_request_ose_conformance - agent: jenkins labels: master: ci.dev.openshift.redhat.com + name: test_pull_request_ose_check_and_verify_tasks + rerun_command: /test check + trigger: ((?m)^/test( all| check),?(\s+|$)) + - agent: jenkins always_run: false context: ci/openshift-jenkins/conformance - rerun_command: "/test conformance" - trigger: "((?m)^/test( all| conformance),?(\\s+|$))" - - - name: test_pull_request_ose_integration_and_end_to_end - agent: jenkins labels: master: ci.dev.openshift.redhat.com + name: test_pull_request_ose_conformance + rerun_command: /test conformance + trigger: ((?m)^/test( all| conformance),?(\s+|$)) + - agent: jenkins always_run: false context: ci/openshift-jenkins/integration - rerun_command: "/test integration" - trigger: "((?m)^/test( all| integration),?(\\s+|$))" - - - name: test_pull_request_ose_networking - agent: jenkins labels: master: ci.dev.openshift.redhat.com + name: test_pull_request_ose_integration_and_end_to_end + rerun_command: /test integration + trigger: ((?m)^/test( all| integration),?(\s+|$)) + - agent: jenkins always_run: false context: ci/openshift-jenkins/networking - rerun_command: "/test networking" - trigger: "((?m)^/test( all| networking),?(\\s+|$))" \ No newline at end of file + labels: + master: ci.dev.openshift.redhat.com + name: test_pull_request_ose_networking + rerun_command: /test networking + trigger: ((?m)^/test( all| networking),?(\s+|$)) diff --git a/ci-operator/jobs/openshift/prometheus-operator/openshift-prometheus-operator-postsubmits.yaml b/ci-operator/jobs/openshift/prometheus-operator/openshift-prometheus-operator-postsubmits.yaml index d403a128e2ce4..94d7c10f03148 100644 --- a/ci-operator/jobs/openshift/prometheus-operator/openshift-prometheus-operator-postsubmits.yaml +++ b/ci-operator/jobs/openshift/prometheus-operator/openshift-prometheus-operator-postsubmits.yaml @@ -1,28 +1,32 @@ postsubmits: openshift/prometheus-operator: - - name: branch-ci-openshift-prometheus-operator-images - agent: kubernetes - labels: - artifacts: images + - agent: kubernetes branches: - openshift-master decorate: true + labels: + artifacts: images + name: branch-ci-openshift-prometheus-operator-images skip_cloning: true spec: - serviceAccountName: ci-operator containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + - args: + - --artifact-dir=$(ARTIFACTS) + - --target=[images] + - --promote + command: + - ci-operator env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-prometheus-operator key: master.json - command: - - ci-operator - args: - - --artifact-dir=$(ARTIFACTS) - - --target=[images] - - --promote + name: ci-operator-openshift-prometheus-operator + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + serviceAccountName: ci-operator diff --git a/ci-operator/jobs/openshift/release/openshift-release-presubmits.yaml b/ci-operator/jobs/openshift/release/openshift-release-presubmits.yaml index 19955ee0c16c7..29d254e8a87bf 100644 --- a/ci-operator/jobs/openshift/release/openshift-release-presubmits.yaml +++ b/ci-operator/jobs/openshift/release/openshift-release-presubmits.yaml @@ -1,63 +1,88 @@ presubmits: openshift/release: - - name: check_prometheus_rules - agent: kubernetes - run_if_changed: '^(projects/prometheus/prometheus.rules.yaml)$' + - agent: kubernetes + always_run: false context: ci/openshift/promrules - rerun_command: "/test promrules" - trigger: "((?m)^/test promrules,?(\\s+|$))" + name: check_prometheus_rules + rerun_command: /test promrules + run_if_changed: ^(projects/prometheus/prometheus.rules.yaml)$ spec: containers: - image: registry.svc.ci.openshift.org/ci/promrules:latest - - name: pull-ci-openshift-release-master-config - agent: kubernetes - context: ci/prow/config + name: "" + resources: {} + trigger: ((?m)^/test promrules,?(\s+|$)) + - agent: kubernetes + always_run: true branches: - master - rerun_command: "/test config" - trigger: ((?m)^/test( all| config),?(\\s+|$)) + context: ci/prow/config decorate: true - always_run: true + name: pull-ci-openshift-release-master-config + rerun_command: /test config spec: containers: - - image: checkconfig:latest - command: - - /checkconfig - args: + - args: - --config-path - ./cluster/ci/config/prow/config.yaml - --job-config-path - ./ci-operator/jobs/ - --plugin-config - ./cluster/ci/config/prow/plugins.yaml - - name: pull-ci-openshift-release-master-ci-operator-config - agent: kubernetes - context: ci/prow/ci-operator-config + command: + - /checkconfig + image: checkconfig:latest + name: "" + resources: {} + trigger: ((?m)^/test( all| config),?(\\s+|$)) + - agent: kubernetes + always_run: true branches: - master - rerun_command: "/test ci-operator-config" - trigger: ((?m)^/test( all| ci-operator-config),?(\\s+|$)) + context: ci/prow/ci-operator-config decorate: true - always_run: true + name: pull-ci-openshift-release-master-ci-operator-config + rerun_command: /test ci-operator-config spec: containers: - - image: ci-operator-checkconfig:latest - command: - - ci-operator-checkconfig - args: + - args: - --config-dir - ./ci-operator/config/ - - name: pull-ci-openshift-release-master-generated-config - agent: kubernetes - context: ci/prow/generated-config + command: + - ci-operator-checkconfig + image: ci-operator-checkconfig:latest + name: "" + resources: {} + trigger: ((?m)^/test( all| ci-operator-config),?(\\s+|$)) + - agent: kubernetes + always_run: false branches: - master - rerun_command: "/test generated-config" - trigger: ((?m)^/test generated-config,?(\\s+|$)) + context: ci/prow/generated-config decorate: true - always_run: false + name: pull-ci-openshift-release-master-generated-config + rerun_command: /test generated-config spec: containers: - - image: ci-operator-prowgen:latest - command: + - command: - hack/validate-generated-config.sh + image: ci-operator-prowgen:latest + name: "" + resources: {} + trigger: ((?m)^/test generated-config,?(\\s+|$)) + - agent: kubernetes + always_run: true + branches: + - master + context: ci/prow/ordered-prow-config + decorate: true + name: pull-ci-openshift-release-master-ordered-prow-config + rerun_command: /test ordered-prow-config + spec: + containers: + - command: + - hack/validate-prow-job-ordering.sh + image: determinize-prow-jobs:latest + name: "" + resources: {} + trigger: ((?m)^/test( all| ordered-prow-config),?(\\s+|$)) diff --git a/ci-operator/jobs/openshift/service-catalog/openshift-service-catalog-postsubmits.yaml b/ci-operator/jobs/openshift/service-catalog/openshift-service-catalog-postsubmits.yaml index 632d2edc4c161..3eae77cefa837 100644 --- a/ci-operator/jobs/openshift/service-catalog/openshift-service-catalog-postsubmits.yaml +++ b/ci-operator/jobs/openshift/service-catalog/openshift-service-catalog-postsubmits.yaml @@ -1,29 +1,33 @@ postsubmits: openshift/service-catalog: - - name: branch-ci-openshift-service-catalog-images - agent: kubernetes - labels: - artifacts: images + - agent: kubernetes branches: - master - release-3.10 decorate: true + labels: + artifacts: images + name: branch-ci-openshift-service-catalog-images skip_cloning: true spec: - serviceAccountName: ci-operator containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + - args: + - --artifact-dir=$(ARTIFACTS) + - --target=[images] + - --promote + command: + - ci-operator env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-service-catalog key: master.json - command: - - ci-operator - args: - - --artifact-dir=$(ARTIFACTS) - - --target=[images] - - --promote \ No newline at end of file + name: ci-operator-openshift-service-catalog + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + serviceAccountName: ci-operator diff --git a/ci-operator/jobs/openshift/service-catalog/openshift-service-catalog-presubmits.yaml b/ci-operator/jobs/openshift/service-catalog/openshift-service-catalog-presubmits.yaml index 16f84a30ab658..28b179f54651d 100644 --- a/ci-operator/jobs/openshift/service-catalog/openshift-service-catalog-presubmits.yaml +++ b/ci-operator/jobs/openshift/service-catalog/openshift-service-catalog-presubmits.yaml @@ -1,38 +1,42 @@ presubmits: openshift/service-catalog: - - name: test_pull_request_openshift_service_catalog - agent: jenkins + - agent: jenkins + always_run: true + context: ci/openshift-jenkins/service-catalog labels: master: ci.openshift.redhat.com + name: test_pull_request_openshift_service_catalog + rerun_command: /test service-catalog + trigger: ((?m)^/test service-catalog,?(\s+|$)) + - agent: kubernetes always_run: true - context: ci/openshift-jenkins/service-catalog - rerun_command: "/test service-catalog" - trigger: "((?m)^/test service-catalog,?(\\s+|$))" - - name: pull-ci-openshift-service-catalog-unit - agent: kubernetes - context: ci/prow/unit branches: - master - rerun_command: "/test unit" - always_run: true - trigger: "((?m)^/test( all| unit),?(\\s+|$))" + context: ci/prow/unit decorate: true + name: pull-ci-openshift-service-catalog-unit + rerun_command: /test unit skip_cloning: true spec: - serviceAccountName: ci-operator containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + - args: + - --artifact-dir=$(ARTIFACTS) + - --target=unit + - --target=[images] + command: + - ci-operator env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-service-catalog key: master.json - command: - - ci-operator - args: - - --artifact-dir=$(ARTIFACTS) - - --target=unit - - --target=[images] \ No newline at end of file + name: ci-operator-openshift-service-catalog + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + serviceAccountName: ci-operator + trigger: ((?m)^/test( all| unit),?(\s+|$)) diff --git a/ci-operator/jobs/openshift/service-serving-cert-signer/openshift-service-serving-cert-signer-postsubmits.yaml b/ci-operator/jobs/openshift/service-serving-cert-signer/openshift-service-serving-cert-signer-postsubmits.yaml index e1e4ec6826203..022273743715c 100644 --- a/ci-operator/jobs/openshift/service-serving-cert-signer/openshift-service-serving-cert-signer-postsubmits.yaml +++ b/ci-operator/jobs/openshift/service-serving-cert-signer/openshift-service-serving-cert-signer-postsubmits.yaml @@ -1,28 +1,32 @@ postsubmits: openshift/service-serving-cert-signer: - - name: branch-ci-openshift-service-serving-cert-signer-images - agent: kubernetes - labels: - artifacts: images + - agent: kubernetes branches: - master decorate: true + labels: + artifacts: images + name: branch-ci-openshift-service-serving-cert-signer-images skip_cloning: true spec: - serviceAccountName: ci-operator containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + - args: + - --artifact-dir=$(ARTIFACTS) + - --target=[images] + - --promote + command: + - ci-operator env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-service-serving-cert-signer key: master.json - command: - - ci-operator - args: - - --artifact-dir=$(ARTIFACTS) - - --target=[images] - - --promote \ No newline at end of file + name: ci-operator-openshift-service-serving-cert-signer + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + serviceAccountName: ci-operator diff --git a/ci-operator/jobs/openshift/service-serving-cert-signer/openshift-service-serving-cert-signer-presubmits.yaml b/ci-operator/jobs/openshift/service-serving-cert-signer/openshift-service-serving-cert-signer-presubmits.yaml index 581120facca22..85833140052cc 100644 --- a/ci-operator/jobs/openshift/service-serving-cert-signer/openshift-service-serving-cert-signer-presubmits.yaml +++ b/ci-operator/jobs/openshift/service-serving-cert-signer/openshift-service-serving-cert-signer-presubmits.yaml @@ -1,30 +1,34 @@ presubmits: openshift/service-serving-cert-signer: - - name: pull-ci-openshift-service-serving-cert-signer-unit - agent: kubernetes - context: ci/prow/unit + - agent: kubernetes + always_run: true branches: - master - rerun_command: "/test unit" - always_run: true - trigger: "((?m)^/test( all| unit),?(\\s+|$))" + context: ci/prow/unit decorate: true + name: pull-ci-openshift-service-serving-cert-signer-unit + rerun_command: /test unit skip_cloning: true spec: - serviceAccountName: ci-operator containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + - args: + - --artifact-dir=$(ARTIFACTS) + - --target=unit + - --target=[images] + command: + - ci-operator env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-service-serving-cert-signer key: master.json - command: - - ci-operator - args: - - --artifact-dir=$(ARTIFACTS) - - --target=unit - - --target=[images] \ No newline at end of file + name: ci-operator-openshift-service-serving-cert-signer + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + serviceAccountName: ci-operator + trigger: ((?m)^/test( all| unit),?(\s+|$)) diff --git a/ci-operator/jobs/openshift/telemeter/openshift-telemeter-postsubmits.yaml b/ci-operator/jobs/openshift/telemeter/openshift-telemeter-postsubmits.yaml index e082d7f03634d..c75c6f6f278d7 100644 --- a/ci-operator/jobs/openshift/telemeter/openshift-telemeter-postsubmits.yaml +++ b/ci-operator/jobs/openshift/telemeter/openshift-telemeter-postsubmits.yaml @@ -1,28 +1,32 @@ postsubmits: openshift/telemeter: - - name: branch-ci-openshift-telemeter-images - agent: kubernetes - labels: - artifacts: images + - agent: kubernetes branches: - master decorate: true + labels: + artifacts: images + name: branch-ci-openshift-telemeter-images skip_cloning: true spec: - serviceAccountName: ci-operator containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + - args: + - --artifact-dir=$(ARTIFACTS) + - --target=[images] + - --promote + command: + - ci-operator env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-telemeter key: master.json - command: - - ci-operator - args: - - --artifact-dir=$(ARTIFACTS) - - --target=[images] - - --promote \ No newline at end of file + name: ci-operator-openshift-telemeter + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + serviceAccountName: ci-operator diff --git a/ci-operator/jobs/openshift/telemeter/openshift-telemeter-presubmits.yaml b/ci-operator/jobs/openshift/telemeter/openshift-telemeter-presubmits.yaml index 24750bf4b9ecd..c4bbecc2896b2 100644 --- a/ci-operator/jobs/openshift/telemeter/openshift-telemeter-presubmits.yaml +++ b/ci-operator/jobs/openshift/telemeter/openshift-telemeter-presubmits.yaml @@ -1,28 +1,32 @@ presubmits: openshift/telemeter: - - name: pull-ci-openshift-telemeter-unit - agent: kubernetes - context: ci/prow/unit + - agent: kubernetes + always_run: true branches: - master - rerun_command: "/test unit" - always_run: true - trigger: "((?m)^/test( all| unit),?(\\s+|$))" + context: ci/prow/unit decorate: true + name: pull-ci-openshift-telemeter-unit + rerun_command: /test unit skip_cloning: true spec: - serviceAccountName: ci-operator containers: - - name: test - image: ci-operator:latest - resources: {"requests": {"cpu": "10m"},"limits":{"cpu":"500m"}} + - args: + - --artifact-dir=$(ARTIFACTS) + command: + - ci-operator env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - name: ci-operator-openshift-telemeter key: master.json - command: - - ci-operator - args: - - --artifact-dir=$(ARTIFACTS) \ No newline at end of file + name: ci-operator-openshift-telemeter + image: ci-operator:latest + name: test + resources: + limits: + cpu: 500m + requests: + cpu: 10m + serviceAccountName: ci-operator + trigger: ((?m)^/test( all| unit),?(\s+|$)) diff --git a/ci-operator/jobs/openvswitch/ovn-kubernetes/openvswitch-ovn-kubernetes-postsubmits.yaml b/ci-operator/jobs/openvswitch/ovn-kubernetes/openvswitch-ovn-kubernetes-postsubmits.yaml index f550d2a05c780..1c347e3bc4f66 100644 --- a/ci-operator/jobs/openvswitch/ovn-kubernetes/openvswitch-ovn-kubernetes-postsubmits.yaml +++ b/ci-operator/jobs/openvswitch/ovn-kubernetes/openvswitch-ovn-kubernetes-postsubmits.yaml @@ -1,8 +1,8 @@ postsubmits: openvswitch/ovn-kubernetes: - - name: test_branch_ovn_kubernetes_unit - agent: jenkins + - agent: jenkins + branches: + - master labels: master: ci.openshift.redhat.com - branches: - - master \ No newline at end of file + name: test_branch_ovn_kubernetes_unit diff --git a/ci-operator/jobs/openvswitch/ovn-kubernetes/openvswitch-ovn-kubernetes-presubmits.yaml b/ci-operator/jobs/openvswitch/ovn-kubernetes/openvswitch-ovn-kubernetes-presubmits.yaml index 08af823ebcdef..c8b4bb22a2aa3 100644 --- a/ci-operator/jobs/openvswitch/ovn-kubernetes/openvswitch-ovn-kubernetes-presubmits.yaml +++ b/ci-operator/jobs/openvswitch/ovn-kubernetes/openvswitch-ovn-kubernetes-presubmits.yaml @@ -1,10 +1,10 @@ presubmits: openvswitch/ovn-kubernetes: - - name: test_pull_request_ovn_kubernetes_rhel - agent: jenkins - labels: - master: ci.openshift.redhat.com + - agent: jenkins always_run: false context: ci/openshift-jenkins/integration_rhel - rerun_command: "/test integration" - trigger: "((?m)^/test( all| integration),?(\\s+|$))" \ No newline at end of file + labels: + master: ci.openshift.redhat.com + name: test_pull_request_ovn_kubernetes_rhel + rerun_command: /test integration + trigger: ((?m)^/test( all| integration),?(\s+|$)) diff --git a/hack/order-prow-job-config.sh b/hack/order-prow-job-config.sh new file mode 100755 index 0000000000000..0ec320338c6d2 --- /dev/null +++ b/hack/order-prow-job-config.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +# This script runs a read-and-write program on all Prow job configs to make +# them ordered in a deterministic way + +set -o errexit +set -o nounset +set -o pipefail + +ci_operator_dir="$( dirname "${BASH_SOURCE[0]}" )/../ci-operator" + +determinize-prow-jobs --prow-jobs-dir "${ci_operator_dir}/jobs" diff --git a/hack/validate-prow-job-ordering.sh b/hack/validate-prow-job-ordering.sh new file mode 100755 index 0000000000000..0659381a6749a --- /dev/null +++ b/hack/validate-prow-job-ordering.sh @@ -0,0 +1,21 @@ +#!/bin/bash + +# This script ensures that the Prow configuration checked into git has +# deterministic ordering so that bots who modify them submit reasonably +# readable diffs + +set -x +set -o errexit +set -o nounset +set -o pipefail + +workdir="$( mktemp -d )" +# trap 'rm -rf "${workdir}"' EXIT + +jobs_dir="$( dirname "${BASH_SOURCE[0]}" )/../ci-operator/jobs" + +cp -r "${jobs_dir}" "${workdir}" + +"$( dirname "${BASH_SOURCE[0]}" )/order-prow-job-config.sh" + +diff -Naupr "${jobs_dir}" "${workdir}/jobs"