diff --git a/ci-operator/README.md b/ci-operator/README.md index 13e1b514d2e46..f25fccb5826e6 100644 --- a/ci-operator/README.md +++ b/ci-operator/README.md @@ -10,7 +10,7 @@ Conventions Under this directory, we have three main directories: -* `config/$org/$repo/$branch.json` +* `config/$org/$repo/$branch.yaml` Contains your ci-operator definition which describes how the images and tests in your repo works. These files are copied into config maps on the CI cluster and referenced by Prow jobs. If you are building branches within a fork of a @@ -176,7 +176,7 @@ complexity and duplication, which should be cleared in the future. valueFrom: configMapKeyRef: name: ci-operator-openshift-descheduler - key: release-3.10.json + key: release-3.10.yaml # the actual test command (the variable name and format is specific to # the template being used (cluster-launch-src.yaml, in this case), see # the definition for more details) diff --git a/ci-operator/config/kubernetes/autoscaler/master.json b/ci-operator/config/kubernetes/autoscaler/master.yaml similarity index 100% rename from ci-operator/config/kubernetes/autoscaler/master.json rename to ci-operator/config/kubernetes/autoscaler/master.yaml diff --git a/ci-operator/config/kubernetes/autoscaler/release-3.10.json b/ci-operator/config/kubernetes/autoscaler/release-3.10.yaml similarity index 100% rename from ci-operator/config/kubernetes/autoscaler/release-3.10.json rename to ci-operator/config/kubernetes/autoscaler/release-3.10.yaml diff --git a/ci-operator/config/kubernetes/autoscaler/release-3.11.json b/ci-operator/config/kubernetes/autoscaler/release-3.11.yaml similarity index 100% rename from ci-operator/config/kubernetes/autoscaler/release-3.11.json rename to ci-operator/config/kubernetes/autoscaler/release-3.11.yaml diff --git a/ci-operator/config/kubernetes/cluster-capacity/master.json b/ci-operator/config/kubernetes/cluster-capacity/master.yaml similarity index 100% rename from ci-operator/config/kubernetes/cluster-capacity/master.json rename to ci-operator/config/kubernetes/cluster-capacity/master.yaml diff --git a/ci-operator/config/kubernetes/cluster-capacity/release-3.10.json b/ci-operator/config/kubernetes/cluster-capacity/release-3.10.yaml similarity index 100% rename from ci-operator/config/kubernetes/cluster-capacity/release-3.10.json rename to ci-operator/config/kubernetes/cluster-capacity/release-3.10.yaml diff --git a/ci-operator/config/kubernetes/cluster-capacity/release-3.11.json b/ci-operator/config/kubernetes/cluster-capacity/release-3.11.yaml similarity index 100% rename from ci-operator/config/kubernetes/cluster-capacity/release-3.11.json rename to ci-operator/config/kubernetes/cluster-capacity/release-3.11.yaml diff --git a/ci-operator/config/kubernetes/coredns/master.json b/ci-operator/config/kubernetes/coredns/master.yaml similarity index 100% rename from ci-operator/config/kubernetes/coredns/master.json rename to ci-operator/config/kubernetes/coredns/master.yaml diff --git a/ci-operator/config/kubernetes/coredns/release-3.10.json b/ci-operator/config/kubernetes/coredns/release-3.10.yaml similarity index 100% rename from ci-operator/config/kubernetes/coredns/release-3.10.json rename to ci-operator/config/kubernetes/coredns/release-3.10.yaml diff --git a/ci-operator/config/kubernetes/coredns/release-3.11.json b/ci-operator/config/kubernetes/coredns/release-3.11.yaml similarity index 100% rename from ci-operator/config/kubernetes/coredns/release-3.11.json rename to ci-operator/config/kubernetes/coredns/release-3.11.yaml diff --git a/ci-operator/config/kubernetes/descheduler/master.json b/ci-operator/config/kubernetes/descheduler/master.yaml similarity index 100% rename from ci-operator/config/kubernetes/descheduler/master.json rename to ci-operator/config/kubernetes/descheduler/master.yaml diff --git a/ci-operator/config/kubernetes/descheduler/release-3.10.json b/ci-operator/config/kubernetes/descheduler/release-3.10.yaml similarity index 100% rename from ci-operator/config/kubernetes/descheduler/release-3.10.json rename to ci-operator/config/kubernetes/descheduler/release-3.10.yaml diff --git a/ci-operator/config/kubernetes/descheduler/release-3.11.json b/ci-operator/config/kubernetes/descheduler/release-3.11.yaml similarity index 100% rename from ci-operator/config/kubernetes/descheduler/release-3.11.json rename to ci-operator/config/kubernetes/descheduler/release-3.11.yaml diff --git a/ci-operator/config/kubernetes/metrics-server/master.json b/ci-operator/config/kubernetes/metrics-server/master.yaml similarity index 100% rename from ci-operator/config/kubernetes/metrics-server/master.json rename to ci-operator/config/kubernetes/metrics-server/master.yaml diff --git a/ci-operator/config/kubernetes/metrics-server/release-3.10.json b/ci-operator/config/kubernetes/metrics-server/release-3.10.yaml similarity index 100% rename from ci-operator/config/kubernetes/metrics-server/release-3.10.json rename to ci-operator/config/kubernetes/metrics-server/release-3.10.yaml diff --git a/ci-operator/config/kubernetes/metrics-server/release-3.11.json b/ci-operator/config/kubernetes/metrics-server/release-3.11.yaml similarity index 100% rename from ci-operator/config/kubernetes/metrics-server/release-3.11.json rename to ci-operator/config/kubernetes/metrics-server/release-3.11.yaml diff --git a/ci-operator/config/openshift/api/master.json b/ci-operator/config/openshift/api/master.yaml similarity index 100% rename from ci-operator/config/openshift/api/master.json rename to ci-operator/config/openshift/api/master.yaml diff --git a/ci-operator/config/openshift/api/release-3.11.json b/ci-operator/config/openshift/api/release-3.11.yaml similarity index 100% rename from ci-operator/config/openshift/api/release-3.11.json rename to ci-operator/config/openshift/api/release-3.11.yaml diff --git a/ci-operator/config/openshift/azure-misc/master.json b/ci-operator/config/openshift/azure-misc/master.yaml similarity index 100% rename from ci-operator/config/openshift/azure-misc/master.json rename to ci-operator/config/openshift/azure-misc/master.yaml diff --git a/ci-operator/config/openshift/ci-operator-prowgen/master.json b/ci-operator/config/openshift/ci-operator-prowgen/master.yaml similarity index 100% rename from ci-operator/config/openshift/ci-operator-prowgen/master.json rename to ci-operator/config/openshift/ci-operator-prowgen/master.yaml diff --git a/ci-operator/config/openshift/ci-operator/master.json b/ci-operator/config/openshift/ci-operator/master.yaml similarity index 100% rename from ci-operator/config/openshift/ci-operator/master.json rename to ci-operator/config/openshift/ci-operator/master.yaml diff --git a/ci-operator/config/openshift/cluster-api-provider-aws/master.json b/ci-operator/config/openshift/cluster-api-provider-aws/master.yaml similarity index 100% rename from ci-operator/config/openshift/cluster-api-provider-aws/master.json rename to ci-operator/config/openshift/cluster-api-provider-aws/master.yaml diff --git a/ci-operator/config/openshift/cluster-api-provider-aws/release-3.11.json b/ci-operator/config/openshift/cluster-api-provider-aws/release-3.11.yaml similarity index 100% rename from ci-operator/config/openshift/cluster-api-provider-aws/release-3.11.json rename to ci-operator/config/openshift/cluster-api-provider-aws/release-3.11.yaml diff --git a/ci-operator/config/openshift/cluster-api-provider-libvirt/master.json b/ci-operator/config/openshift/cluster-api-provider-libvirt/master.yaml similarity index 100% rename from ci-operator/config/openshift/cluster-api-provider-libvirt/master.json rename to ci-operator/config/openshift/cluster-api-provider-libvirt/master.yaml diff --git a/ci-operator/config/openshift/cluster-api-provider-libvirt/release-3.11.json b/ci-operator/config/openshift/cluster-api-provider-libvirt/release-3.11.yaml similarity index 100% rename from ci-operator/config/openshift/cluster-api-provider-libvirt/release-3.11.json rename to ci-operator/config/openshift/cluster-api-provider-libvirt/release-3.11.yaml diff --git a/ci-operator/config/openshift/cluster-dns-operator/master.json b/ci-operator/config/openshift/cluster-dns-operator/master.yaml similarity index 100% rename from ci-operator/config/openshift/cluster-dns-operator/master.json rename to ci-operator/config/openshift/cluster-dns-operator/master.yaml diff --git a/ci-operator/config/openshift/cluster-ingress-operator/master.json b/ci-operator/config/openshift/cluster-ingress-operator/master.yaml similarity index 100% rename from ci-operator/config/openshift/cluster-ingress-operator/master.json rename to ci-operator/config/openshift/cluster-ingress-operator/master.yaml diff --git a/ci-operator/config/openshift/cluster-monitoring-operator/master.json b/ci-operator/config/openshift/cluster-monitoring-operator/master.yaml similarity index 100% rename from ci-operator/config/openshift/cluster-monitoring-operator/master.json rename to ci-operator/config/openshift/cluster-monitoring-operator/master.yaml diff --git a/ci-operator/config/openshift/cluster-monitoring-operator/release-3.11.json b/ci-operator/config/openshift/cluster-monitoring-operator/release-3.11.yaml similarity index 100% rename from ci-operator/config/openshift/cluster-monitoring-operator/release-3.11.json rename to ci-operator/config/openshift/cluster-monitoring-operator/release-3.11.yaml diff --git a/ci-operator/config/openshift/cluster-operator/master.json b/ci-operator/config/openshift/cluster-operator/master.yaml similarity index 100% rename from ci-operator/config/openshift/cluster-operator/master.json rename to ci-operator/config/openshift/cluster-operator/master.yaml diff --git a/ci-operator/config/openshift/cluster-operator/tools.json b/ci-operator/config/openshift/cluster-operator/tools.yaml similarity index 100% rename from ci-operator/config/openshift/cluster-operator/tools.json rename to ci-operator/config/openshift/cluster-operator/tools.yaml diff --git a/ci-operator/config/openshift/cluster-samples-operator/master.json b/ci-operator/config/openshift/cluster-samples-operator/master.yaml similarity index 100% rename from ci-operator/config/openshift/cluster-samples-operator/master.json rename to ci-operator/config/openshift/cluster-samples-operator/master.yaml diff --git a/ci-operator/config/openshift/cluster-version-operator/master.json b/ci-operator/config/openshift/cluster-version-operator/master.yaml similarity index 100% rename from ci-operator/config/openshift/cluster-version-operator/master.json rename to ci-operator/config/openshift/cluster-version-operator/master.yaml diff --git a/ci-operator/config/openshift/cluster-version-operator/release-3.11.json b/ci-operator/config/openshift/cluster-version-operator/release-3.11.yaml similarity index 100% rename from ci-operator/config/openshift/cluster-version-operator/release-3.11.json rename to ci-operator/config/openshift/cluster-version-operator/release-3.11.yaml diff --git a/ci-operator/config/openshift/configmap-reload/master.json b/ci-operator/config/openshift/configmap-reload/master.yaml similarity index 100% rename from ci-operator/config/openshift/configmap-reload/master.json rename to ci-operator/config/openshift/configmap-reload/master.yaml diff --git a/ci-operator/config/openshift/configmap-reload/release-3.11.json b/ci-operator/config/openshift/configmap-reload/release-3.11.yaml similarity index 100% rename from ci-operator/config/openshift/configmap-reload/release-3.11.json rename to ci-operator/config/openshift/configmap-reload/release-3.11.yaml diff --git a/ci-operator/config/openshift/console/master.json b/ci-operator/config/openshift/console/master.yaml similarity index 100% rename from ci-operator/config/openshift/console/master.json rename to ci-operator/config/openshift/console/master.yaml diff --git a/ci-operator/config/openshift/console/release-3.10.json b/ci-operator/config/openshift/console/release-3.10.yaml similarity index 100% rename from ci-operator/config/openshift/console/release-3.10.json rename to ci-operator/config/openshift/console/release-3.10.yaml diff --git a/ci-operator/config/openshift/console/release-3.11.json b/ci-operator/config/openshift/console/release-3.11.yaml similarity index 100% rename from ci-operator/config/openshift/console/release-3.11.json rename to ci-operator/config/openshift/console/release-3.11.yaml diff --git a/ci-operator/config/openshift/image-registry/master.json b/ci-operator/config/openshift/image-registry/master.yaml similarity index 100% rename from ci-operator/config/openshift/image-registry/master.json rename to ci-operator/config/openshift/image-registry/master.yaml diff --git a/ci-operator/config/openshift/image-registry/release-3.10.json b/ci-operator/config/openshift/image-registry/release-3.10.yaml similarity index 100% rename from ci-operator/config/openshift/image-registry/release-3.10.json rename to ci-operator/config/openshift/image-registry/release-3.10.yaml diff --git a/ci-operator/config/openshift/image-registry/release-3.11.json b/ci-operator/config/openshift/image-registry/release-3.11.yaml similarity index 100% rename from ci-operator/config/openshift/image-registry/release-3.11.json rename to ci-operator/config/openshift/image-registry/release-3.11.yaml diff --git a/ci-operator/config/openshift/imagebuilder/master.json b/ci-operator/config/openshift/imagebuilder/master.yaml similarity index 100% rename from ci-operator/config/openshift/imagebuilder/master.json rename to ci-operator/config/openshift/imagebuilder/master.yaml diff --git a/ci-operator/config/openshift/installer/master.json b/ci-operator/config/openshift/installer/master.yaml similarity index 100% rename from ci-operator/config/openshift/installer/master.json rename to ci-operator/config/openshift/installer/master.yaml diff --git a/ci-operator/config/openshift/installer/release-3.11.json b/ci-operator/config/openshift/installer/release-3.11.yaml similarity index 100% rename from ci-operator/config/openshift/installer/release-3.11.json rename to ci-operator/config/openshift/installer/release-3.11.yaml diff --git a/ci-operator/config/openshift/jenkins/master.json b/ci-operator/config/openshift/jenkins/master.yaml similarity index 100% rename from ci-operator/config/openshift/jenkins/master.json rename to ci-operator/config/openshift/jenkins/master.yaml diff --git a/ci-operator/config/openshift/jenkins/openshift-3.10.json b/ci-operator/config/openshift/jenkins/openshift-3.10.yaml similarity index 100% rename from ci-operator/config/openshift/jenkins/openshift-3.10.json rename to ci-operator/config/openshift/jenkins/openshift-3.10.yaml diff --git a/ci-operator/config/openshift/kube-rbac-proxy/master.json b/ci-operator/config/openshift/kube-rbac-proxy/master.yaml similarity index 100% rename from ci-operator/config/openshift/kube-rbac-proxy/master.json rename to ci-operator/config/openshift/kube-rbac-proxy/master.yaml diff --git a/ci-operator/config/openshift/kube-rbac-proxy/release-3.11.json b/ci-operator/config/openshift/kube-rbac-proxy/release-3.11.yaml similarity index 100% rename from ci-operator/config/openshift/kube-rbac-proxy/release-3.11.json rename to ci-operator/config/openshift/kube-rbac-proxy/release-3.11.yaml diff --git a/ci-operator/config/openshift/kube-state-metrics/master.json b/ci-operator/config/openshift/kube-state-metrics/master.yaml similarity index 100% rename from ci-operator/config/openshift/kube-state-metrics/master.json rename to ci-operator/config/openshift/kube-state-metrics/master.yaml diff --git a/ci-operator/config/openshift/kube-state-metrics/release-3.11.json b/ci-operator/config/openshift/kube-state-metrics/release-3.11.yaml similarity index 100% rename from ci-operator/config/openshift/kube-state-metrics/release-3.11.json rename to ci-operator/config/openshift/kube-state-metrics/release-3.11.yaml diff --git a/ci-operator/config/openshift/machine-api-operator/master.json b/ci-operator/config/openshift/machine-api-operator/master.yaml similarity index 100% rename from ci-operator/config/openshift/machine-api-operator/master.json rename to ci-operator/config/openshift/machine-api-operator/master.yaml diff --git a/ci-operator/config/openshift/machine-api-operator/release-3.11.json b/ci-operator/config/openshift/machine-api-operator/release-3.11.yaml similarity index 100% rename from ci-operator/config/openshift/machine-api-operator/release-3.11.json rename to ci-operator/config/openshift/machine-api-operator/release-3.11.yaml diff --git a/ci-operator/config/openshift/machine-config-operator/master.json b/ci-operator/config/openshift/machine-config-operator/master.yaml similarity index 100% rename from ci-operator/config/openshift/machine-config-operator/master.json rename to ci-operator/config/openshift/machine-config-operator/master.yaml diff --git a/ci-operator/config/openshift/machine-config-operator/release-3.11.json b/ci-operator/config/openshift/machine-config-operator/release-3.11.yaml similarity index 100% rename from ci-operator/config/openshift/machine-config-operator/release-3.11.json rename to ci-operator/config/openshift/machine-config-operator/release-3.11.yaml diff --git a/ci-operator/config/openshift/openshift-ansible/master.json b/ci-operator/config/openshift/openshift-ansible/master.yaml similarity index 100% rename from ci-operator/config/openshift/openshift-ansible/master.json rename to ci-operator/config/openshift/openshift-ansible/master.yaml diff --git a/ci-operator/config/openshift/openshift-ansible/release-3.10.json b/ci-operator/config/openshift/openshift-ansible/release-3.10.yaml similarity index 100% rename from ci-operator/config/openshift/openshift-ansible/release-3.10.json rename to ci-operator/config/openshift/openshift-ansible/release-3.10.yaml diff --git a/ci-operator/config/openshift/openshift-ansible/release-3.11.json b/ci-operator/config/openshift/openshift-ansible/release-3.11.yaml similarity index 100% rename from ci-operator/config/openshift/openshift-ansible/release-3.11.json rename to ci-operator/config/openshift/openshift-ansible/release-3.11.yaml diff --git a/ci-operator/config/openshift/openshift-azure/master.json b/ci-operator/config/openshift/openshift-azure/master.yaml similarity index 100% rename from ci-operator/config/openshift/openshift-azure/master.json rename to ci-operator/config/openshift/openshift-azure/master.yaml diff --git a/ci-operator/config/openshift/origin-aggregated-logging/master.json b/ci-operator/config/openshift/origin-aggregated-logging/master.yaml similarity index 100% rename from ci-operator/config/openshift/origin-aggregated-logging/master.json rename to ci-operator/config/openshift/origin-aggregated-logging/master.yaml diff --git a/ci-operator/config/openshift/origin-aggregated-logging/release-3.11.json b/ci-operator/config/openshift/origin-aggregated-logging/release-3.11.yaml similarity index 100% rename from ci-operator/config/openshift/origin-aggregated-logging/release-3.11.json rename to ci-operator/config/openshift/origin-aggregated-logging/release-3.11.yaml diff --git a/ci-operator/config/openshift/origin-metrics/master.json b/ci-operator/config/openshift/origin-metrics/master.yaml similarity index 100% rename from ci-operator/config/openshift/origin-metrics/master.json rename to ci-operator/config/openshift/origin-metrics/master.yaml diff --git a/ci-operator/config/openshift/origin-metrics/release-3.11.json b/ci-operator/config/openshift/origin-metrics/release-3.11.yaml similarity index 100% rename from ci-operator/config/openshift/origin-metrics/release-3.11.json rename to ci-operator/config/openshift/origin-metrics/release-3.11.yaml diff --git a/ci-operator/config/openshift/origin-web-console-server/master.json b/ci-operator/config/openshift/origin-web-console-server/master.yaml similarity index 100% rename from ci-operator/config/openshift/origin-web-console-server/master.json rename to ci-operator/config/openshift/origin-web-console-server/master.yaml diff --git a/ci-operator/config/openshift/origin-web-console-server/release-3.10.json b/ci-operator/config/openshift/origin-web-console-server/release-3.10.yaml similarity index 100% rename from ci-operator/config/openshift/origin-web-console-server/release-3.10.json rename to ci-operator/config/openshift/origin-web-console-server/release-3.10.yaml diff --git a/ci-operator/config/openshift/origin-web-console-server/release-3.11.json b/ci-operator/config/openshift/origin-web-console-server/release-3.11.yaml similarity index 100% rename from ci-operator/config/openshift/origin-web-console-server/release-3.11.json rename to ci-operator/config/openshift/origin-web-console-server/release-3.11.yaml diff --git a/ci-operator/config/openshift/origin-web-console/master.json b/ci-operator/config/openshift/origin-web-console/master.yaml similarity index 100% rename from ci-operator/config/openshift/origin-web-console/master.json rename to ci-operator/config/openshift/origin-web-console/master.yaml diff --git a/ci-operator/config/openshift/origin-web-console/release-3.10.json b/ci-operator/config/openshift/origin-web-console/release-3.10.yaml similarity index 100% rename from ci-operator/config/openshift/origin-web-console/release-3.10.json rename to ci-operator/config/openshift/origin-web-console/release-3.10.yaml diff --git a/ci-operator/config/openshift/origin/master.json b/ci-operator/config/openshift/origin/master.yaml similarity index 100% rename from ci-operator/config/openshift/origin/master.json rename to ci-operator/config/openshift/origin/master.yaml diff --git a/ci-operator/config/openshift/origin/release-3.10.json b/ci-operator/config/openshift/origin/release-3.10.yaml similarity index 100% rename from ci-operator/config/openshift/origin/release-3.10.json rename to ci-operator/config/openshift/origin/release-3.10.yaml diff --git a/ci-operator/config/openshift/origin/release-3.11.json b/ci-operator/config/openshift/origin/release-3.11.yaml similarity index 100% rename from ci-operator/config/openshift/origin/release-3.11.json rename to ci-operator/config/openshift/origin/release-3.11.yaml diff --git a/ci-operator/config/openshift/prometheus-operator/master.json b/ci-operator/config/openshift/prometheus-operator/master.yaml similarity index 100% rename from ci-operator/config/openshift/prometheus-operator/master.json rename to ci-operator/config/openshift/prometheus-operator/master.yaml diff --git a/ci-operator/config/openshift/prometheus-operator/release-3.11.json b/ci-operator/config/openshift/prometheus-operator/release-3.11.yaml similarity index 100% rename from ci-operator/config/openshift/prometheus-operator/release-3.11.json rename to ci-operator/config/openshift/prometheus-operator/release-3.11.yaml diff --git a/ci-operator/config/openshift/service-catalog/master.json b/ci-operator/config/openshift/service-catalog/master.yaml similarity index 100% rename from ci-operator/config/openshift/service-catalog/master.json rename to ci-operator/config/openshift/service-catalog/master.yaml diff --git a/ci-operator/config/openshift/service-catalog/release-3.11.json b/ci-operator/config/openshift/service-catalog/release-3.11.yaml similarity index 100% rename from ci-operator/config/openshift/service-catalog/release-3.11.json rename to ci-operator/config/openshift/service-catalog/release-3.11.yaml diff --git a/ci-operator/config/openshift/service-serving-cert-signer/master.json b/ci-operator/config/openshift/service-serving-cert-signer/master.yaml similarity index 100% rename from ci-operator/config/openshift/service-serving-cert-signer/master.json rename to ci-operator/config/openshift/service-serving-cert-signer/master.yaml diff --git a/ci-operator/config/openshift/service-serving-cert-signer/release-3.11.json b/ci-operator/config/openshift/service-serving-cert-signer/release-3.11.yaml similarity index 100% rename from ci-operator/config/openshift/service-serving-cert-signer/release-3.11.json rename to ci-operator/config/openshift/service-serving-cert-signer/release-3.11.yaml diff --git a/ci-operator/config/openshift/telemeter/master.json b/ci-operator/config/openshift/telemeter/master.yaml similarity index 100% rename from ci-operator/config/openshift/telemeter/master.json rename to ci-operator/config/openshift/telemeter/master.yaml diff --git a/ci-operator/config/openshift/telemeter/release-3.11.json b/ci-operator/config/openshift/telemeter/release-3.11.yaml similarity index 100% rename from ci-operator/config/openshift/telemeter/release-3.11.json rename to ci-operator/config/openshift/telemeter/release-3.11.yaml diff --git a/ci-operator/config/tnozicka/openshift-acme/master.json b/ci-operator/config/tnozicka/openshift-acme/master.yaml similarity index 100% rename from ci-operator/config/tnozicka/openshift-acme/master.json rename to ci-operator/config/tnozicka/openshift-acme/master.yaml diff --git a/ci-operator/jobs/openshift/api/openshift-api-presubmits.yaml b/ci-operator/jobs/openshift/api/openshift-api-presubmits.yaml index 3a63c3a1e762c..6964cff17dd4e 100644 --- a/ci-operator/jobs/openshift/api/openshift-api-presubmits.yaml +++ b/ci-operator/jobs/openshift/api/openshift-api-presubmits.yaml @@ -20,7 +20,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-api image: ci-operator:latest name: test diff --git a/ci-operator/jobs/openshift/azure-misc/openshift-azure-misc-postsubmits-release-3.11.yaml b/ci-operator/jobs/openshift/azure-misc/openshift-azure-misc-postsubmits-release-3.11.yaml index c58995fb1045e..dfd2f0337f3af 100644 --- a/ci-operator/jobs/openshift/azure-misc/openshift-azure-misc-postsubmits-release-3.11.yaml +++ b/ci-operator/jobs/openshift/azure-misc/openshift-azure-misc-postsubmits-release-3.11.yaml @@ -17,7 +17,7 @@ postsubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.11.json + key: release-3.11.yaml name: ci-operator-openshift-azure-misc image: ci-operator:latest name: test 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 f73c2f27cf6d3..364cf8a1a1d86 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 @@ -17,7 +17,7 @@ postsubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-azure-misc image: ci-operator:latest name: test diff --git a/ci-operator/jobs/openshift/azure-misc/openshift-azure-misc-presubmits-release-3.11.yaml b/ci-operator/jobs/openshift/azure-misc/openshift-azure-misc-presubmits-release-3.11.yaml index 93d9d02a6f023..7b51d21fa3d9a 100644 --- a/ci-operator/jobs/openshift/azure-misc/openshift-azure-misc-presubmits-release-3.11.yaml +++ b/ci-operator/jobs/openshift/azure-misc/openshift-azure-misc-presubmits-release-3.11.yaml @@ -22,7 +22,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.11.json + key: release-3.11.yaml name: ci-operator-openshift-azure-misc image: ci-operator:latest name: test 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 bf8b44c52770c..7c18625f4526a 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 @@ -22,7 +22,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-azure-misc image: ci-operator:latest name: test 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 e8b1ba1c2cade..47f8a25105394 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 @@ -18,7 +18,7 @@ postsubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-ci-operator-prowgen image: ci-operator:latest name: "" 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 cc7c3dd05a23d..4790200d8b0c5 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 @@ -20,7 +20,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-ci-operator-prowgen image: ci-operator:latest name: "" @@ -51,7 +51,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-ci-operator-prowgen image: ci-operator:latest name: "" @@ -82,7 +82,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-ci-operator-prowgen image: ci-operator:latest name: "" 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 0e3f499bc3844..d09c9fb3f7a77 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 @@ -18,7 +18,7 @@ postsubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-ci-operator image: ci-operator:latest name: "" 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 71140a4d11989..f486184c86e2f 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 @@ -20,7 +20,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-ci-operator image: ci-operator:latest name: "" @@ -51,7 +51,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-ci-operator image: ci-operator:latest name: "" @@ -82,7 +82,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-ci-operator image: ci-operator:latest name: "" diff --git a/ci-operator/jobs/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-postsubmits-release-3.11.yaml b/ci-operator/jobs/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-postsubmits-release-3.11.yaml index 10fa27ca64872..d57a8885d1230 100644 --- a/ci-operator/jobs/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-postsubmits-release-3.11.yaml +++ b/ci-operator/jobs/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-postsubmits-release-3.11.yaml @@ -20,7 +20,7 @@ postsubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.11.json + key: release-3.11.yaml name: ci-operator-openshift-cluster-api-provider-aws image: ci-operator:latest name: test 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 15d46fdd7e707..f1aa641ed678e 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 @@ -20,7 +20,7 @@ postsubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-cluster-api-provider-aws image: ci-operator:latest name: test diff --git a/ci-operator/jobs/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-presubmits-release-3.11.yaml b/ci-operator/jobs/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-presubmits-release-3.11.yaml index 6f5d0f68d01cd..99c73631eae08 100644 --- a/ci-operator/jobs/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-presubmits-release-3.11.yaml +++ b/ci-operator/jobs/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-presubmits-release-3.11.yaml @@ -20,7 +20,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.11.json + key: release-3.11.yaml name: ci-operator-openshift-cluster-api-provider-aws image: ci-operator:latest name: test @@ -51,7 +51,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.11.json + key: release-3.11.yaml name: ci-operator-openshift-cluster-api-provider-aws image: ci-operator:latest name: test 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 e94569b04e260..5243aebf283dd 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 @@ -20,7 +20,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-cluster-api-provider-aws image: ci-operator:latest name: test @@ -51,7 +51,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-cluster-api-provider-aws image: ci-operator:latest name: test diff --git a/ci-operator/jobs/openshift/cluster-api-provider-libvirt/openshift-cluster-api-provider-libvirt-presubmits-release-3.11.yaml b/ci-operator/jobs/openshift/cluster-api-provider-libvirt/openshift-cluster-api-provider-libvirt-presubmits-release-3.11.yaml index 2bdbea4588edb..046b9bb5cba60 100644 --- a/ci-operator/jobs/openshift/cluster-api-provider-libvirt/openshift-cluster-api-provider-libvirt-presubmits-release-3.11.yaml +++ b/ci-operator/jobs/openshift/cluster-api-provider-libvirt/openshift-cluster-api-provider-libvirt-presubmits-release-3.11.yaml @@ -20,7 +20,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.11.json + key: release-3.11.yaml name: ci-operator-openshift-cluster-api-provider-libvirt image: ci-operator:latest name: test diff --git a/ci-operator/jobs/openshift/cluster-api-provider-libvirt/openshift-cluster-api-provider-libvirt-presubmits.yaml b/ci-operator/jobs/openshift/cluster-api-provider-libvirt/openshift-cluster-api-provider-libvirt-presubmits.yaml index eff4ea4d93bfc..d562d351dd836 100644 --- a/ci-operator/jobs/openshift/cluster-api-provider-libvirt/openshift-cluster-api-provider-libvirt-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-api-provider-libvirt/openshift-cluster-api-provider-libvirt-presubmits.yaml @@ -20,7 +20,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-cluster-api-provider-libvirt image: ci-operator:latest name: test diff --git a/ci-operator/jobs/openshift/cluster-capacity/openshift-cluster-capacity-postsubmits-release-3.11.yaml b/ci-operator/jobs/openshift/cluster-capacity/openshift-cluster-capacity-postsubmits-release-3.11.yaml index e046428ef99ba..303fe5cdafb93 100644 --- a/ci-operator/jobs/openshift/cluster-capacity/openshift-cluster-capacity-postsubmits-release-3.11.yaml +++ b/ci-operator/jobs/openshift/cluster-capacity/openshift-cluster-capacity-postsubmits-release-3.11.yaml @@ -20,7 +20,7 @@ postsubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.11.json + key: release-3.11.yaml name: ci-operator-kubernetes-cluster-capacity image: ci-operator:latest name: test 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 ba0fb984c6c30..9139ad2ba1b3e 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 @@ -20,7 +20,7 @@ postsubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-kubernetes-cluster-capacity image: ci-operator:latest name: test @@ -50,7 +50,7 @@ postsubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.10.json + key: release-3.10.yaml name: ci-operator-kubernetes-cluster-capacity image: ci-operator:latest name: test diff --git a/ci-operator/jobs/openshift/cluster-capacity/openshift-cluster-capacity-presubmits-release-3.11.yaml b/ci-operator/jobs/openshift/cluster-capacity/openshift-cluster-capacity-presubmits-release-3.11.yaml index 53b655a89b7f9..051236571b7fc 100644 --- a/ci-operator/jobs/openshift/cluster-capacity/openshift-cluster-capacity-presubmits-release-3.11.yaml +++ b/ci-operator/jobs/openshift/cluster-capacity/openshift-cluster-capacity-presubmits-release-3.11.yaml @@ -21,7 +21,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.11.json + key: release-3.11.yaml name: ci-operator-kubernetes-cluster-capacity image: ci-operator:latest name: test 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 54de69ff01d7e..41d66d5478db8 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 @@ -21,7 +21,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-kubernetes-cluster-capacity image: ci-operator:latest name: test @@ -53,7 +53,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.10.json + key: release-3.10.yaml name: ci-operator-kubernetes-cluster-capacity image: ci-operator:latest name: test 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 dfd2e29c29089..057cb139298b7 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 @@ -17,7 +17,7 @@ postsubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-cluster-dns-operator image: ci-operator:latest name: "" @@ -47,7 +47,7 @@ postsubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-cluster-dns-operator image: ci-operator:latest name: "" 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 39bf436e83ca9..b3ca26cc6695d 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 @@ -20,7 +20,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-cluster-dns-operator image: ci-operator:latest name: "" @@ -51,7 +51,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-cluster-dns-operator image: ci-operator:latest name: "" 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 51cae08bb23e5..1bc82e7c7ce43 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 @@ -17,7 +17,7 @@ postsubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-cluster-ingress-operator image: ci-operator:latest name: "" @@ -47,7 +47,7 @@ postsubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-cluster-ingress-operator image: ci-operator:latest name: "" 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 71b1c56b7b47a..76dc9b9efbd5a 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 @@ -20,7 +20,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-cluster-ingress-operator image: ci-operator:latest name: "" @@ -52,7 +52,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-cluster-ingress-operator image: ci-operator:latest name: "" diff --git a/ci-operator/jobs/openshift/cluster-monitoring-operator/openshift-cluster-monitoring-operator-postsubmits-release-3.11.yaml b/ci-operator/jobs/openshift/cluster-monitoring-operator/openshift-cluster-monitoring-operator-postsubmits-release-3.11.yaml index 0b3c467b4353e..8c3ee95071381 100644 --- a/ci-operator/jobs/openshift/cluster-monitoring-operator/openshift-cluster-monitoring-operator-postsubmits-release-3.11.yaml +++ b/ci-operator/jobs/openshift/cluster-monitoring-operator/openshift-cluster-monitoring-operator-postsubmits-release-3.11.yaml @@ -20,7 +20,7 @@ postsubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.11.json + key: release-3.11.yaml name: ci-operator-openshift-cluster-monitoring-operator image: ci-operator:latest name: test 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 d28074bcfa95c..0ad3dc2a372bf 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 @@ -20,7 +20,7 @@ postsubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-cluster-monitoring-operator image: ci-operator:latest name: test 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 0b0c6803c55ee..82bac4489b9ac 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 @@ -17,7 +17,7 @@ postsubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-cluster-operator image: ci-operator:latest name: "" @@ -44,7 +44,7 @@ postsubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-cluster-operator image: ci-operator:latest name: "" @@ -74,7 +74,7 @@ postsubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-cluster-operator image: ci-operator:latest name: "" 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 b9a27c2694836..2d2bd514d01f5 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 @@ -20,7 +20,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-cluster-operator image: ci-operator:latest name: "" @@ -51,7 +51,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-cluster-operator image: ci-operator:latest name: "" @@ -82,7 +82,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-cluster-operator image: ci-operator:latest name: "" @@ -113,7 +113,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-cluster-operator image: ci-operator:latest name: "" 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 fd8e9ed3074d0..b3013a3c4b493 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 @@ -20,7 +20,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-cluster-samples-operator image: ci-operator:latest name: test diff --git a/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-postsubmits-release-3.11.yaml b/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-postsubmits-release-3.11.yaml index 7808465b48644..aff3ee3c31343 100644 --- a/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-postsubmits-release-3.11.yaml +++ b/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-postsubmits-release-3.11.yaml @@ -20,7 +20,7 @@ postsubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.11.json + key: release-3.11.yaml name: ci-operator-openshift-cluster-version-operator image: ci-operator:latest name: test 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 a6da231fd4750..f1bb7e00ef566 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 @@ -20,7 +20,7 @@ postsubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-cluster-version-operator image: ci-operator:latest name: test diff --git a/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-presubmits-release-3.11.yaml b/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-presubmits-release-3.11.yaml index 28868584059d0..69dd38621198d 100644 --- a/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-presubmits-release-3.11.yaml +++ b/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-presubmits-release-3.11.yaml @@ -21,7 +21,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.11.json + key: release-3.11.yaml name: ci-operator-openshift-cluster-version-operator image: ci-operator:latest name: test 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 dd6d974ba5e59..cdfe9195acadb 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 @@ -22,7 +22,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-cluster-version-operator image: ci-operator:latest name: test 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 1ebbdc4140c4a..62cbddffa619c 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 @@ -20,7 +20,7 @@ postsubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-configmap-reload image: ci-operator:latest name: test diff --git a/ci-operator/jobs/openshift/console/openshift-console-postsubmits-release-3.11.yaml b/ci-operator/jobs/openshift/console/openshift-console-postsubmits-release-3.11.yaml index 9be8fd48f47d4..178f8871d4412 100644 --- a/ci-operator/jobs/openshift/console/openshift-console-postsubmits-release-3.11.yaml +++ b/ci-operator/jobs/openshift/console/openshift-console-postsubmits-release-3.11.yaml @@ -20,7 +20,7 @@ postsubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.11.json + key: release-3.11.yaml name: ci-operator-openshift-console image: ci-operator:latest name: test diff --git a/ci-operator/jobs/openshift/console/openshift-console-postsubmits.yaml b/ci-operator/jobs/openshift/console/openshift-console-postsubmits.yaml index 40e28382d085f..6b9df421246d7 100644 --- a/ci-operator/jobs/openshift/console/openshift-console-postsubmits.yaml +++ b/ci-operator/jobs/openshift/console/openshift-console-postsubmits.yaml @@ -20,7 +20,7 @@ postsubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-console image: ci-operator:latest name: test diff --git a/ci-operator/jobs/openshift/console/openshift-console-presubmits-release-3.11.yaml b/ci-operator/jobs/openshift/console/openshift-console-presubmits-release-3.11.yaml index c221961258f37..8f15e50481994 100644 --- a/ci-operator/jobs/openshift/console/openshift-console-presubmits-release-3.11.yaml +++ b/ci-operator/jobs/openshift/console/openshift-console-presubmits-release-3.11.yaml @@ -20,7 +20,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.11.json + key: release-3.11.yaml name: ci-operator-openshift-console image: ci-operator:latest name: test @@ -50,7 +50,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.11.json + key: release-3.11.yaml name: ci-operator-openshift-console image: ci-operator:latest name: test diff --git a/ci-operator/jobs/openshift/console/openshift-console-presubmits.yaml b/ci-operator/jobs/openshift/console/openshift-console-presubmits.yaml index fcf3881a34c4d..427e64844c5bd 100644 --- a/ci-operator/jobs/openshift/console/openshift-console-presubmits.yaml +++ b/ci-operator/jobs/openshift/console/openshift-console-presubmits.yaml @@ -21,7 +21,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-console image: ci-operator:latest name: test @@ -52,7 +52,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-console image: ci-operator:latest name: test diff --git a/ci-operator/jobs/openshift/coredns/openshift-coredns-postsubmits-release-3.11.yaml b/ci-operator/jobs/openshift/coredns/openshift-coredns-postsubmits-release-3.11.yaml index 6f940910caeb4..509063f300a11 100644 --- a/ci-operator/jobs/openshift/coredns/openshift-coredns-postsubmits-release-3.11.yaml +++ b/ci-operator/jobs/openshift/coredns/openshift-coredns-postsubmits-release-3.11.yaml @@ -20,7 +20,7 @@ postsubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.11.json + key: release-3.11.yaml name: ci-operator-kubernetes-coredns image: ci-operator:latest name: test diff --git a/ci-operator/jobs/openshift/coredns/openshift-coredns-postsubmits.yaml b/ci-operator/jobs/openshift/coredns/openshift-coredns-postsubmits.yaml index 742960ff19cd0..86f801cb9d80e 100644 --- a/ci-operator/jobs/openshift/coredns/openshift-coredns-postsubmits.yaml +++ b/ci-operator/jobs/openshift/coredns/openshift-coredns-postsubmits.yaml @@ -20,7 +20,7 @@ postsubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-kubernetes-coredns image: ci-operator:latest name: test diff --git a/ci-operator/jobs/openshift/coredns/openshift-coredns-presubmits-release-3.11.yaml b/ci-operator/jobs/openshift/coredns/openshift-coredns-presubmits-release-3.11.yaml index ce6b379d55e3d..aa5e3474362c5 100644 --- a/ci-operator/jobs/openshift/coredns/openshift-coredns-presubmits-release-3.11.yaml +++ b/ci-operator/jobs/openshift/coredns/openshift-coredns-presubmits-release-3.11.yaml @@ -21,7 +21,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.11.json + key: release-3.11.yaml name: ci-operator-kubernetes-coredns image: ci-operator:latest name: test diff --git a/ci-operator/jobs/openshift/coredns/openshift-coredns-presubmits.yaml b/ci-operator/jobs/openshift/coredns/openshift-coredns-presubmits.yaml index 3d7a8c405ae30..5c73cb1f443bb 100644 --- a/ci-operator/jobs/openshift/coredns/openshift-coredns-presubmits.yaml +++ b/ci-operator/jobs/openshift/coredns/openshift-coredns-presubmits.yaml @@ -21,7 +21,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-kubernetes-coredns image: ci-operator:latest name: test diff --git a/ci-operator/jobs/openshift/descheduler/openshift-descheduler-postsubmits-release-3.11.yaml b/ci-operator/jobs/openshift/descheduler/openshift-descheduler-postsubmits-release-3.11.yaml index 5321334a58582..1f1bf02d29b85 100644 --- a/ci-operator/jobs/openshift/descheduler/openshift-descheduler-postsubmits-release-3.11.yaml +++ b/ci-operator/jobs/openshift/descheduler/openshift-descheduler-postsubmits-release-3.11.yaml @@ -20,7 +20,7 @@ postsubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.11.json + key: release-3.11.yaml name: ci-operator-kubernetes-descheduler image: ci-operator:latest name: test diff --git a/ci-operator/jobs/openshift/descheduler/openshift-descheduler-postsubmits.yaml b/ci-operator/jobs/openshift/descheduler/openshift-descheduler-postsubmits.yaml index cfd60906186b7..264faa8d1abf3 100644 --- a/ci-operator/jobs/openshift/descheduler/openshift-descheduler-postsubmits.yaml +++ b/ci-operator/jobs/openshift/descheduler/openshift-descheduler-postsubmits.yaml @@ -20,7 +20,7 @@ postsubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-kubernetes-descheduler image: ci-operator:latest name: test @@ -50,7 +50,7 @@ postsubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.10.json + key: release-3.10.yaml name: ci-operator-kubernetes-descheduler image: ci-operator:latest name: test diff --git a/ci-operator/jobs/openshift/descheduler/openshift-descheduler-presubmits-release-3.11.yaml b/ci-operator/jobs/openshift/descheduler/openshift-descheduler-presubmits-release-3.11.yaml index e4f073e3f129d..2e3e103875ac0 100644 --- a/ci-operator/jobs/openshift/descheduler/openshift-descheduler-presubmits-release-3.11.yaml +++ b/ci-operator/jobs/openshift/descheduler/openshift-descheduler-presubmits-release-3.11.yaml @@ -21,7 +21,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.11.json + key: release-3.11.yaml name: ci-operator-kubernetes-descheduler image: ci-operator:latest name: test diff --git a/ci-operator/jobs/openshift/descheduler/openshift-descheduler-presubmits.yaml b/ci-operator/jobs/openshift/descheduler/openshift-descheduler-presubmits.yaml index a27530be33c44..9d07293cfac2c 100644 --- a/ci-operator/jobs/openshift/descheduler/openshift-descheduler-presubmits.yaml +++ b/ci-operator/jobs/openshift/descheduler/openshift-descheduler-presubmits.yaml @@ -21,7 +21,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-kubernetes-descheduler image: ci-operator:latest name: test @@ -53,7 +53,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.10.json + key: release-3.10.yaml name: ci-operator-kubernetes-descheduler image: ci-operator:latest name: test @@ -95,7 +95,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.10.json + key: release-3.10.yaml name: ci-operator-kubernetes-descheduler - name: TEST_COMMAND value: cp /tmp/admin.kubeconfig /tmp/admin.conf && make test-e2e diff --git a/ci-operator/jobs/openshift/image-registry/openshift-image-registry-postsubmits-release-3.11.yaml b/ci-operator/jobs/openshift/image-registry/openshift-image-registry-postsubmits-release-3.11.yaml index 71e1e71f60584..44cd3f159e687 100644 --- a/ci-operator/jobs/openshift/image-registry/openshift-image-registry-postsubmits-release-3.11.yaml +++ b/ci-operator/jobs/openshift/image-registry/openshift-image-registry-postsubmits-release-3.11.yaml @@ -37,7 +37,7 @@ postsubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.11.json + key: release-3.11.yaml name: ci-operator-openshift-image-registry image: ci-operator:latest name: test 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 d6cbf4ab1581c..dc0e5a2da39eb 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 @@ -37,7 +37,7 @@ postsubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-image-registry image: ci-operator:latest name: test @@ -66,7 +66,7 @@ postsubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.10.json + key: release-3.10.yaml name: ci-operator-openshift-image-registry image: ci-operator:latest name: test diff --git a/ci-operator/jobs/openshift/image-registry/openshift-image-registry-presubmits-release-3.11.yaml b/ci-operator/jobs/openshift/image-registry/openshift-image-registry-presubmits-release-3.11.yaml index 1dc82b022d323..882f2ffa333bc 100644 --- a/ci-operator/jobs/openshift/image-registry/openshift-image-registry-presubmits-release-3.11.yaml +++ b/ci-operator/jobs/openshift/image-registry/openshift-image-registry-presubmits-release-3.11.yaml @@ -20,7 +20,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.11.json + key: release-3.11.yaml name: ci-operator-openshift-image-registry image: ci-operator:latest name: test @@ -55,7 +55,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.11.json + key: release-3.11.yaml name: ci-operator-openshift-image-registry image: ci-operator:latest name: test @@ -103,7 +103,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.11.json + key: release-3.11.yaml name: ci-operator-openshift-image-registry - name: RPM_REPO value: https://rpms.svc.ci.openshift.org/openshift-origin-v3.11/ 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 9e370aaf45fef..6e2d1b4c960f1 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 @@ -21,7 +21,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-image-registry image: ci-operator:latest name: test @@ -52,7 +52,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.10.json + key: release-3.10.yaml name: ci-operator-openshift-image-registry image: ci-operator:latest name: test @@ -88,7 +88,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-image-registry image: ci-operator:latest name: test @@ -131,7 +131,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.10.json + key: release-3.10.yaml name: ci-operator-openshift-image-registry image: ci-operator:latest name: test @@ -180,7 +180,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-image-registry - name: RPM_REPO value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.0/ @@ -244,7 +244,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.10.json + key: release-3.10.yaml 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 diff --git a/ci-operator/jobs/openshift/imagebuilder/openshift-imagebuilder-presubmits.yaml b/ci-operator/jobs/openshift/imagebuilder/openshift-imagebuilder-presubmits.yaml index e45f196a28e1f..341595e7a1e64 100644 --- a/ci-operator/jobs/openshift/imagebuilder/openshift-imagebuilder-presubmits.yaml +++ b/ci-operator/jobs/openshift/imagebuilder/openshift-imagebuilder-presubmits.yaml @@ -20,7 +20,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-imagebuilder image: ci-operator:latest name: test diff --git a/ci-operator/jobs/openshift/installer/openshift-installer-postsubmits-release-3.11.yaml b/ci-operator/jobs/openshift/installer/openshift-installer-postsubmits-release-3.11.yaml index e98aff7efc21a..913b9231a1b7c 100644 --- a/ci-operator/jobs/openshift/installer/openshift-installer-postsubmits-release-3.11.yaml +++ b/ci-operator/jobs/openshift/installer/openshift-installer-postsubmits-release-3.11.yaml @@ -20,7 +20,7 @@ postsubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.11.json + key: release-3.11.yaml name: ci-operator-openshift-installer image: ci-operator:latest name: test diff --git a/ci-operator/jobs/openshift/installer/openshift-installer-postsubmits.yaml b/ci-operator/jobs/openshift/installer/openshift-installer-postsubmits.yaml index 55cc0752e26c7..3f8cebd81e5ac 100644 --- a/ci-operator/jobs/openshift/installer/openshift-installer-postsubmits.yaml +++ b/ci-operator/jobs/openshift/installer/openshift-installer-postsubmits.yaml @@ -20,7 +20,7 @@ postsubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-installer image: ci-operator:latest name: test diff --git a/ci-operator/jobs/openshift/installer/openshift-installer-presubmits-release-3.11.yaml b/ci-operator/jobs/openshift/installer/openshift-installer-presubmits-release-3.11.yaml index d0bf2d8ea4b6c..f3260102749fd 100644 --- a/ci-operator/jobs/openshift/installer/openshift-installer-presubmits-release-3.11.yaml +++ b/ci-operator/jobs/openshift/installer/openshift-installer-presubmits-release-3.11.yaml @@ -20,7 +20,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.11.json + key: release-3.11.yaml name: ci-operator-openshift-installer image: ci-operator:latest name: test @@ -60,7 +60,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.11.json + key: release-3.11.yaml name: ci-operator-openshift-installer image: ci-operator:latest name: test @@ -117,7 +117,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.11.json + key: release-3.11.yaml name: ci-operator-openshift-installer image: ci-operator:latest name: test diff --git a/ci-operator/jobs/openshift/installer/openshift-installer-presubmits.yaml b/ci-operator/jobs/openshift/installer/openshift-installer-presubmits.yaml index ecaf4f0c567f8..127f3b459d440 100644 --- a/ci-operator/jobs/openshift/installer/openshift-installer-presubmits.yaml +++ b/ci-operator/jobs/openshift/installer/openshift-installer-presubmits.yaml @@ -20,7 +20,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-installer image: ci-operator:latest name: test @@ -62,7 +62,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-installer image: ci-operator:latest name: test @@ -119,7 +119,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-installer image: ci-operator:latest name: test diff --git a/ci-operator/jobs/openshift/jenkins/openshift-jenkins-presubmits.yaml b/ci-operator/jobs/openshift/jenkins/openshift-jenkins-presubmits.yaml index d2527b3847a6f..88558a9ee38d9 100644 --- a/ci-operator/jobs/openshift/jenkins/openshift-jenkins-presubmits.yaml +++ b/ci-operator/jobs/openshift/jenkins/openshift-jenkins-presubmits.yaml @@ -39,7 +39,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-jenkins-canary - name: RPM_REPO value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.0/ @@ -106,7 +106,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: openshift-3.10.json + key: openshift-3.10.yaml name: ci-operator-openshift-jenkins-canary - name: RPM_REPO_BASEURL_REF value: https://storage.googleapis.com/origin-ci-test/releases/openshift/origin/release-3.10/.latest-rpms 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 6e638651208d7..2442ca5b8954b 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 @@ -20,7 +20,7 @@ postsubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-kube-rbac-proxy image: ci-operator:latest name: test 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 071aab000fdf2..37f7724976820 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 @@ -20,7 +20,7 @@ postsubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-kube-state-metrics image: ci-operator:latest name: test diff --git a/ci-operator/jobs/openshift/kubernetes-autoscaler/openshift-kubernetes-autoscaler-postsubmits-release-3.11.yaml b/ci-operator/jobs/openshift/kubernetes-autoscaler/openshift-kubernetes-autoscaler-postsubmits-release-3.11.yaml index 301524d6b29ea..9dfe7d6f59c4a 100644 --- a/ci-operator/jobs/openshift/kubernetes-autoscaler/openshift-kubernetes-autoscaler-postsubmits-release-3.11.yaml +++ b/ci-operator/jobs/openshift/kubernetes-autoscaler/openshift-kubernetes-autoscaler-postsubmits-release-3.11.yaml @@ -20,7 +20,7 @@ postsubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.11.json + key: release-3.11.yaml name: ci-operator-kubernetes-autoscaler image: ci-operator:latest name: test 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 1cf0d37ac4c56..d8b65dbf8b839 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 @@ -20,7 +20,7 @@ postsubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-kubernetes-autoscaler image: ci-operator:latest name: test @@ -50,7 +50,7 @@ postsubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.10.json + key: release-3.10.yaml name: ci-operator-kubernetes-autoscaler image: ci-operator:latest name: test diff --git a/ci-operator/jobs/openshift/kubernetes-autoscaler/openshift-kubernetes-autoscaler-presubmits-release-3.11.yaml b/ci-operator/jobs/openshift/kubernetes-autoscaler/openshift-kubernetes-autoscaler-presubmits-release-3.11.yaml index 0f22ccad35500..ad860e51a91b2 100644 --- a/ci-operator/jobs/openshift/kubernetes-autoscaler/openshift-kubernetes-autoscaler-presubmits-release-3.11.yaml +++ b/ci-operator/jobs/openshift/kubernetes-autoscaler/openshift-kubernetes-autoscaler-presubmits-release-3.11.yaml @@ -21,7 +21,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.11.json + key: release-3.11.yaml name: ci-operator-kubernetes-autoscaler image: ci-operator:latest name: test 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 eb52ca93641d8..5eb643ba8a4e7 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 @@ -21,7 +21,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-kubernetes-autoscaler image: ci-operator:latest name: test @@ -53,7 +53,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.10.json + key: release-3.10.yaml name: ci-operator-kubernetes-autoscaler image: ci-operator:latest name: test diff --git a/ci-operator/jobs/openshift/kubernetes-metrics-server/openshift-kubernetes-metrics-server-postsubmits-release-3.11.yaml b/ci-operator/jobs/openshift/kubernetes-metrics-server/openshift-kubernetes-metrics-server-postsubmits-release-3.11.yaml index 7b3be500baa96..8fc1cc1bd426b 100644 --- a/ci-operator/jobs/openshift/kubernetes-metrics-server/openshift-kubernetes-metrics-server-postsubmits-release-3.11.yaml +++ b/ci-operator/jobs/openshift/kubernetes-metrics-server/openshift-kubernetes-metrics-server-postsubmits-release-3.11.yaml @@ -20,7 +20,7 @@ postsubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.11.json + key: release-3.11.yaml name: ci-operator-kubernetes-metrics-server image: ci-operator:latest name: test 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 0e79a7a01ea54..b2d09fa9a4203 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 @@ -20,7 +20,7 @@ postsubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-kubernetes-metrics-server image: ci-operator:latest name: test @@ -50,7 +50,7 @@ postsubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.10.json + key: release-3.10.yaml name: ci-operator-kubernetes-metrics-server image: ci-operator:latest name: test diff --git a/ci-operator/jobs/openshift/kubernetes-metrics-server/openshift-kubernetes-metrics-server-presubmits-release-3.11.yaml b/ci-operator/jobs/openshift/kubernetes-metrics-server/openshift-kubernetes-metrics-server-presubmits-release-3.11.yaml index 2a3d384b58f12..cbfea2e5f5583 100644 --- a/ci-operator/jobs/openshift/kubernetes-metrics-server/openshift-kubernetes-metrics-server-presubmits-release-3.11.yaml +++ b/ci-operator/jobs/openshift/kubernetes-metrics-server/openshift-kubernetes-metrics-server-presubmits-release-3.11.yaml @@ -21,7 +21,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.11.json + key: release-3.11.yaml name: ci-operator-kubernetes-metrics-server image: ci-operator:latest name: test 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 12da2d2171b3c..cdffead62f70e 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 @@ -21,7 +21,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-kubernetes-metrics-server image: ci-operator:latest name: test @@ -53,7 +53,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.10.json + key: release-3.10.yaml name: ci-operator-kubernetes-metrics-server image: ci-operator:latest name: test diff --git a/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-postsubmits-release-3.11.yaml b/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-postsubmits-release-3.11.yaml index 8b490936391c4..dbab0be3f4eb2 100644 --- a/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-postsubmits-release-3.11.yaml +++ b/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-postsubmits-release-3.11.yaml @@ -20,7 +20,7 @@ postsubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.11.json + key: release-3.11.yaml name: ci-operator-openshift-machine-api-operator image: ci-operator:latest name: test 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 306f75ff12b5f..320c6d5098ab4 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 @@ -20,7 +20,7 @@ postsubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-machine-api-operator image: ci-operator:latest name: test diff --git a/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-presubmits-release-3.11.yaml b/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-presubmits-release-3.11.yaml index 29dc130d49663..5862806223878 100644 --- a/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-presubmits-release-3.11.yaml +++ b/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-presubmits-release-3.11.yaml @@ -20,7 +20,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.11.json + key: release-3.11.yaml name: ci-operator-openshift-machine-api-operator image: ci-operator:latest name: test @@ -51,7 +51,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.11.json + key: release-3.11.yaml name: ci-operator-openshift-machine-api-operator image: ci-operator:latest name: test 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 28eec270959f9..1e030e7f70845 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 @@ -20,7 +20,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-machine-api-operator image: ci-operator:latest name: test @@ -51,7 +51,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-machine-api-operator image: ci-operator:latest name: test diff --git a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-postsubmits-release-3.11.yaml b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-postsubmits-release-3.11.yaml index df2d72c69dce3..1680af57f40f6 100644 --- a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-postsubmits-release-3.11.yaml +++ b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-postsubmits-release-3.11.yaml @@ -20,7 +20,7 @@ postsubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.11.json + key: release-3.11.yaml name: ci-operator-openshift-machine-config-operator image: ci-operator:latest name: test 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 7381799ed4171..60f0b5955c607 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 @@ -20,7 +20,7 @@ postsubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-machine-config-operator image: ci-operator:latest name: test diff --git a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-presubmits-release-3.11.yaml b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-presubmits-release-3.11.yaml index 1c33aa6b5bf90..11d7ba7c22442 100644 --- a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-presubmits-release-3.11.yaml +++ b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-presubmits-release-3.11.yaml @@ -21,7 +21,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.11.json + key: release-3.11.yaml name: ci-operator-openshift-machine-config-operator image: ci-operator:latest name: test 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 c338fbc426283..368ab40cdd06a 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 @@ -21,7 +21,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-machine-config-operator image: ci-operator:latest name: test diff --git a/ci-operator/jobs/openshift/openshift-ansible/openshift-openshift-ansible-postsubmits-release-3.11.yaml b/ci-operator/jobs/openshift/openshift-ansible/openshift-openshift-ansible-postsubmits-release-3.11.yaml index 19184ee09c224..5fae6d80623c8 100644 --- a/ci-operator/jobs/openshift/openshift-ansible/openshift-openshift-ansible-postsubmits-release-3.11.yaml +++ b/ci-operator/jobs/openshift/openshift-ansible/openshift-openshift-ansible-postsubmits-release-3.11.yaml @@ -19,7 +19,7 @@ postsubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.11.json + key: release-3.11.yaml name: ci-operator-openshift-openshift-ansible image: ci-operator:latest name: test 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 0121cd470ad3f..f5070d759ef5c 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 @@ -19,7 +19,7 @@ postsubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-openshift-ansible image: ci-operator:latest name: test @@ -48,7 +48,7 @@ postsubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.10.json + key: release-3.10.yaml name: ci-operator-openshift-openshift-ansible image: ci-operator:latest name: test diff --git a/ci-operator/jobs/openshift/openshift-ansible/openshift-openshift-ansible-presubmits-release-3.11.yaml b/ci-operator/jobs/openshift/openshift-ansible/openshift-openshift-ansible-presubmits-release-3.11.yaml index 42c96649ebeb8..7046b7dff9340 100644 --- a/ci-operator/jobs/openshift/openshift-ansible/openshift-openshift-ansible-presubmits-release-3.11.yaml +++ b/ci-operator/jobs/openshift/openshift-ansible/openshift-openshift-ansible-presubmits-release-3.11.yaml @@ -21,7 +21,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.11.json + key: release-3.11.yaml name: ci-operator-openshift-openshift-ansible - name: HOME value: /tmp/home @@ -72,7 +72,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.11.json + key: release-3.11.yaml name: ci-operator-openshift-openshift-ansible - name: RPM_REPO value: https://rpms.svc.ci.openshift.org/openshift-origin-v3.11/ @@ -130,7 +130,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.11.json + key: release-3.11.yaml name: ci-operator-openshift-openshift-ansible - name: RPM_REPO value: https://rpms.svc.ci.openshift.org/openshift-origin-v3.11/ @@ -187,7 +187,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.11.json + key: release-3.11.yaml name: ci-operator-openshift-openshift-ansible - name: RPM_REPO value: https://rpms.svc.ci.openshift.org/openshift-origin-v3.11/ @@ -244,7 +244,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.11.json + key: release-3.11.yaml name: ci-operator-openshift-openshift-ansible - name: RPM_REPO value: https://rpms.svc.ci.openshift.org/openshift-origin-v3.11/ 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 b3bdeba9c66be..2eb60fd0e7df2 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 @@ -22,7 +22,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-openshift-ansible - name: HOME value: /tmp/home @@ -152,7 +152,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-openshift-ansible - name: RPM_REPO value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.0/ @@ -214,7 +214,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.10.json + key: release-3.10.yaml 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 @@ -273,7 +273,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-openshift-ansible - name: RPM_REPO value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.0/ @@ -339,7 +339,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.10.json + key: release-3.10.yaml 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 @@ -404,7 +404,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-openshift-ansible - name: RPM_REPO value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.0/ @@ -458,7 +458,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-openshift-ansible - name: PREVIOUS_RPM_REPO value: https://rpms.svc.ci.openshift.org/openshift-origin-v3.11/ @@ -522,7 +522,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-openshift-ansible - name: RPM_REPO value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.0/ @@ -580,7 +580,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-openshift-ansible - name: RPM_REPO value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.0/ @@ -639,7 +639,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-openshift-ansible - name: RPM_REPO value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.0/ 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 9ffa1ba2a77d6..d0292fcb980fa 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 @@ -19,7 +19,7 @@ postsubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-openshift-azure - name: JOB_NAME_SAFE value: e2e-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 5a61147ea1c2b..a8d47badb31ae 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 @@ -26,7 +26,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-openshift-azure - name: JOB_NAME_SAFE value: e2e-azure @@ -78,7 +78,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-openshift-azure image: ci-operator:latest name: test @@ -111,7 +111,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-openshift-azure image: ci-operator:latest name: test @@ -148,7 +148,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-openshift-azure - name: JOB_NAME_SAFE value: e2e-azure-upgrade diff --git a/ci-operator/jobs/openshift/origin-aggregated-logging/openshift-origin-aggregated-logging-postsubmits-release-3.11.yaml b/ci-operator/jobs/openshift/origin-aggregated-logging/openshift-origin-aggregated-logging-postsubmits-release-3.11.yaml index 03596c3d9a6eb..3ef02439be553 100644 --- a/ci-operator/jobs/openshift/origin-aggregated-logging/openshift-origin-aggregated-logging-postsubmits-release-3.11.yaml +++ b/ci-operator/jobs/openshift/origin-aggregated-logging/openshift-origin-aggregated-logging-postsubmits-release-3.11.yaml @@ -20,7 +20,7 @@ postsubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.11.json + key: release-3.11.yaml name: ci-operator-openshift-origin-aggregated-logging image: ci-operator:latest name: test 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 f2b0ad9139fce..21b97a7ea2f23 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 @@ -20,7 +20,7 @@ postsubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-origin-aggregated-logging image: ci-operator:latest name: test diff --git a/ci-operator/jobs/openshift/origin-aggregated-logging/openshift-origin-aggregated-logging-presubmits-release-3.11.yaml b/ci-operator/jobs/openshift/origin-aggregated-logging/openshift-origin-aggregated-logging-presubmits-release-3.11.yaml index f16d5964e8b06..063335a9a4160 100644 --- a/ci-operator/jobs/openshift/origin-aggregated-logging/openshift-origin-aggregated-logging-presubmits-release-3.11.yaml +++ b/ci-operator/jobs/openshift/origin-aggregated-logging/openshift-origin-aggregated-logging-presubmits-release-3.11.yaml @@ -40,7 +40,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.11.json + key: release-3.11.yaml name: ci-operator-openshift-origin-aggregated-logging image: ci-operator:latest name: test 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 eeed938059e2f..41bd3cd64aa16 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 @@ -124,7 +124,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-origin-aggregated-logging image: ci-operator:latest name: test diff --git a/ci-operator/jobs/openshift/origin-metrics/openshift-origin-metrics-postsubmits-release-3.11.yaml b/ci-operator/jobs/openshift/origin-metrics/openshift-origin-metrics-postsubmits-release-3.11.yaml index ba8a0d1101b8b..2f742e8a79d82 100644 --- a/ci-operator/jobs/openshift/origin-metrics/openshift-origin-metrics-postsubmits-release-3.11.yaml +++ b/ci-operator/jobs/openshift/origin-metrics/openshift-origin-metrics-postsubmits-release-3.11.yaml @@ -20,7 +20,7 @@ postsubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.11.json + key: release-3.11.yaml name: ci-operator-openshift-origin-metrics image: ci-operator:latest name: test 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 39ebd86944e79..b62774dc31448 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 @@ -20,7 +20,7 @@ postsubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-origin-metrics image: ci-operator:latest name: test diff --git a/ci-operator/jobs/openshift/origin-metrics/openshift-origin-metrics-presubmits-release-3.11.yaml b/ci-operator/jobs/openshift/origin-metrics/openshift-origin-metrics-presubmits-release-3.11.yaml index 008721c33a417..4ac97202013ea 100644 --- a/ci-operator/jobs/openshift/origin-metrics/openshift-origin-metrics-presubmits-release-3.11.yaml +++ b/ci-operator/jobs/openshift/origin-metrics/openshift-origin-metrics-presubmits-release-3.11.yaml @@ -20,7 +20,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.11.json + key: release-3.11.yaml name: ci-operator-openshift-origin-metrics image: ci-operator:latest name: test 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 a194e729a8de7..a522425bc9892 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 @@ -20,7 +20,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-origin-metrics image: ci-operator:latest name: test diff --git a/ci-operator/jobs/openshift/origin-web-console-server/openshift-origin-web-console-server-postsubmits-release-3.11.yaml b/ci-operator/jobs/openshift/origin-web-console-server/openshift-origin-web-console-server-postsubmits-release-3.11.yaml index 423e2a2c7d95c..9584d005d1c33 100644 --- a/ci-operator/jobs/openshift/origin-web-console-server/openshift-origin-web-console-server-postsubmits-release-3.11.yaml +++ b/ci-operator/jobs/openshift/origin-web-console-server/openshift-origin-web-console-server-postsubmits-release-3.11.yaml @@ -19,7 +19,7 @@ postsubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.11.json + key: release-3.11.yaml name: ci-operator-openshift-origin-web-console-server image: ci-operator:latest name: test 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 03b6c26838558..d353bc9877801 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 @@ -19,7 +19,7 @@ postsubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-origin-web-console-server image: ci-operator:latest name: test @@ -48,7 +48,7 @@ postsubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.10.json + key: release-3.10.yaml name: ci-operator-openshift-origin-web-console-server image: ci-operator:latest name: test diff --git a/ci-operator/jobs/openshift/origin-web-console-server/openshift-origin-web-console-server-presubmits-release-3.11.yaml b/ci-operator/jobs/openshift/origin-web-console-server/openshift-origin-web-console-server-presubmits-release-3.11.yaml index 1396758f783f3..17cf0c6d61407 100644 --- a/ci-operator/jobs/openshift/origin-web-console-server/openshift-origin-web-console-server-presubmits-release-3.11.yaml +++ b/ci-operator/jobs/openshift/origin-web-console-server/openshift-origin-web-console-server-presubmits-release-3.11.yaml @@ -20,7 +20,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.11.json + key: release-3.11.yaml name: ci-operator-openshift-origin-web-console-server image: ci-operator:latest name: test @@ -58,7 +58,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.11.json + key: release-3.11.yaml name: ci-operator-openshift-origin-web-console-server - name: RPM_REPO value: https://rpms.svc.ci.openshift.org/openshift-origin-v3.11/ 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 7b6d6f118f6b1..9854bba749106 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 @@ -21,7 +21,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-origin-web-console-server image: ci-operator:latest name: test @@ -52,7 +52,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.10.json + key: release-3.10.yaml name: ci-operator-openshift-origin-web-console-server image: ci-operator:latest name: test @@ -91,7 +91,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-origin-web-console-server - name: RPM_REPO value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.0/ @@ -153,7 +153,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.10.json + key: release-3.10.yaml 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 diff --git a/ci-operator/jobs/openshift/origin/openshift-origin-periodics.yaml b/ci-operator/jobs/openshift/origin/openshift-origin-periodics.yaml index dcbd9867acde8..349dd38b282f9 100644 --- a/ci-operator/jobs/openshift/origin/openshift-origin-periodics.yaml +++ b/ci-operator/jobs/openshift/origin/openshift-origin-periodics.yaml @@ -31,7 +31,7 @@ periodics: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-origin - name: OVERRIDE_SPEC value: '{"test_base_image": {"cluster": "", "namespace": "ci", "name": "src-cache-origin", diff --git a/ci-operator/jobs/openshift/origin/openshift-origin-postsubmits-release-3.11.yaml b/ci-operator/jobs/openshift/origin/openshift-origin-postsubmits-release-3.11.yaml index c2644dceee622..4fcc9492d95b3 100644 --- a/ci-operator/jobs/openshift/origin/openshift-origin-postsubmits-release-3.11.yaml +++ b/ci-operator/jobs/openshift/origin/openshift-origin-postsubmits-release-3.11.yaml @@ -21,7 +21,7 @@ postsubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.11.json + key: release-3.11.yaml name: ci-operator-openshift-origin - name: OVERRIDE_SPEC value: '{"promotion": {"cluster": "https://api.ci.openshift.org", "namespace": diff --git a/ci-operator/jobs/openshift/origin/openshift-origin-postsubmits.yaml b/ci-operator/jobs/openshift/origin/openshift-origin-postsubmits.yaml index 1ef71cfe74ea2..124bd98848f3a 100644 --- a/ci-operator/jobs/openshift/origin/openshift-origin-postsubmits.yaml +++ b/ci-operator/jobs/openshift/origin/openshift-origin-postsubmits.yaml @@ -21,7 +21,7 @@ postsubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-origin - name: OVERRIDE_SPEC value: '{"promotion": {"cluster": "https://api.ci.openshift.org", "namespace": diff --git a/ci-operator/jobs/openshift/origin/openshift-origin-presubmits-release-3.11.yaml b/ci-operator/jobs/openshift/origin/openshift-origin-presubmits-release-3.11.yaml index 3c6ffce4299e5..2df41c5ca8d96 100644 --- a/ci-operator/jobs/openshift/origin/openshift-origin-presubmits-release-3.11.yaml +++ b/ci-operator/jobs/openshift/origin/openshift-origin-presubmits-release-3.11.yaml @@ -20,7 +20,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.11.json + key: release-3.11.yaml name: ci-operator-openshift-origin - name: OVERRIDE_SPEC value: '{"test_base_image": {"cluster": "", "namespace": "ci", "name": "src-cache-origin", @@ -54,7 +54,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.11.json + key: release-3.11.yaml name: ci-operator-openshift-origin - name: OVERRIDE_SPEC value: '{"test_base_image": {"cluster": "", "namespace": "ci", "name": "src-cache-origin", @@ -88,7 +88,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.11.json + key: release-3.11.yaml name: ci-operator-openshift-origin - name: OVERRIDE_SPEC value: '{"test_base_image": {"cluster": "", "namespace": "ci", "name": "src-cache-origin", @@ -132,7 +132,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.11.json + key: release-3.11.yaml name: ci-operator-openshift-origin - name: OVERRIDE_SPEC value: '{"test_base_image": {"cluster": "", "namespace": "ci", "name": "src-cache-origin", @@ -194,7 +194,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.11.json + key: release-3.11.yaml name: ci-operator-openshift-origin - name: OVERRIDE_SPEC value: '{"test_base_image": {"cluster": "", "namespace": "ci", "name": "src-cache-origin", @@ -255,7 +255,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.11.json + key: release-3.11.yaml name: ci-operator-openshift-origin - name: OVERRIDE_SPEC value: '{"test_base_image": {"cluster": "", "namespace": "ci", "name": "src-cache-origin", @@ -324,7 +324,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.11.json + key: release-3.11.yaml name: ci-operator-openshift-origin - name: OVERRIDE_SPEC value: '{"test_base_image": {"cluster": "", "namespace": "ci", "name": "src-cache-origin", @@ -449,7 +449,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.11.json + key: release-3.11.yaml name: ci-operator-openshift-origin - name: OVERRIDE_SPEC value: '{"test_base_image": {"cluster": "", "namespace": "ci", "name": "src-cache-origin", diff --git a/ci-operator/jobs/openshift/origin/openshift-origin-presubmits.yaml b/ci-operator/jobs/openshift/origin/openshift-origin-presubmits.yaml index e8d3d7afa7948..c23f998bf2e94 100644 --- a/ci-operator/jobs/openshift/origin/openshift-origin-presubmits.yaml +++ b/ci-operator/jobs/openshift/origin/openshift-origin-presubmits.yaml @@ -39,7 +39,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-origin - name: OVERRIDE_SPEC value: '{"test_base_image": {"cluster": "", "namespace": "ci", "name": "src-cache-origin", @@ -73,7 +73,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.10.json + key: release-3.10.yaml name: ci-operator-openshift-origin image: ci-operator:latest name: test @@ -128,7 +128,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-origin - name: OVERRIDE_SPEC value: '{"test_base_image": {"cluster": "", "namespace": "ci", "name": "src-cache-origin", @@ -163,7 +163,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-origin - name: OVERRIDE_SPEC value: '{"test_base_image": {"cluster": "", "namespace": "ci", "name": "src-cache-origin", @@ -209,7 +209,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-origin - name: OVERRIDE_SPEC value: '{"test_base_image": {"cluster": "", "namespace": "ci", "name": "src-cache-origin", @@ -272,7 +272,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-origin - name: OVERRIDE_SPEC value: '{"test_base_image": {"cluster": "", "namespace": "ci", "name": "src-cache-origin", @@ -334,7 +334,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-origin - name: OVERRIDE_SPEC value: '{"test_base_image": {"cluster": "", "namespace": "ci", "name": "src-cache-origin", @@ -526,7 +526,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-origin - name: OVERRIDE_SPEC value: '{"test_base_image": {"cluster": "", "namespace": "ci", "name": "src-cache-origin", @@ -585,7 +585,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-origin - name: OVERRIDE_SPEC value: '{"test_base_image": {"cluster": "", "namespace": "ci", "name": "src-cache-origin", @@ -790,7 +790,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-origin - name: OVERRIDE_SPEC value: '{"test_base_image": {"cluster": "", "namespace": "ci", "name": "src-cache-origin", 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 94d7c10f03148..00b3b55cd1931 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 @@ -20,7 +20,7 @@ postsubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-prometheus-operator image: ci-operator:latest name: test diff --git a/ci-operator/jobs/openshift/service-catalog/openshift-service-catalog-postsubmits-release-3.11.yaml b/ci-operator/jobs/openshift/service-catalog/openshift-service-catalog-postsubmits-release-3.11.yaml index aa6b17911b401..9092a93031f04 100644 --- a/ci-operator/jobs/openshift/service-catalog/openshift-service-catalog-postsubmits-release-3.11.yaml +++ b/ci-operator/jobs/openshift/service-catalog/openshift-service-catalog-postsubmits-release-3.11.yaml @@ -20,7 +20,7 @@ postsubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.11.json + key: release-3.11.yaml name: ci-operator-openshift-service-catalog image: ci-operator:latest name: test 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 3eae77cefa837..a36ca2574c33c 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 @@ -21,7 +21,7 @@ postsubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-service-catalog image: ci-operator:latest name: test diff --git a/ci-operator/jobs/openshift/service-catalog/openshift-service-catalog-presubmits-release-3.11.yaml b/ci-operator/jobs/openshift/service-catalog/openshift-service-catalog-presubmits-release-3.11.yaml index 527f3c4d68b1f..399132456e253 100644 --- a/ci-operator/jobs/openshift/service-catalog/openshift-service-catalog-presubmits-release-3.11.yaml +++ b/ci-operator/jobs/openshift/service-catalog/openshift-service-catalog-presubmits-release-3.11.yaml @@ -21,7 +21,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.11.json + key: release-3.11.yaml name: ci-operator-openshift-service-catalog image: ci-operator:latest name: test 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 28b179f54651d..7be01b3ae88fc 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 @@ -29,7 +29,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-service-catalog image: ci-operator:latest name: test diff --git a/ci-operator/jobs/openshift/service-serving-cert-signer/openshift-service-serving-cert-signer-postsubmits-release-3.11.yaml b/ci-operator/jobs/openshift/service-serving-cert-signer/openshift-service-serving-cert-signer-postsubmits-release-3.11.yaml index 7f8530825f082..ad340b47184d0 100644 --- a/ci-operator/jobs/openshift/service-serving-cert-signer/openshift-service-serving-cert-signer-postsubmits-release-3.11.yaml +++ b/ci-operator/jobs/openshift/service-serving-cert-signer/openshift-service-serving-cert-signer-postsubmits-release-3.11.yaml @@ -20,7 +20,7 @@ postsubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.11.json + key: release-3.11.yaml name: ci-operator-openshift-service-serving-cert-signer image: ci-operator:latest name: test 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 022273743715c..8bbe32cfe9ae2 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 @@ -20,7 +20,7 @@ postsubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-service-serving-cert-signer image: ci-operator:latest name: test diff --git a/ci-operator/jobs/openshift/service-serving-cert-signer/openshift-service-serving-cert-signer-presubmits-release-3.11.yaml b/ci-operator/jobs/openshift/service-serving-cert-signer/openshift-service-serving-cert-signer-presubmits-release-3.11.yaml index 62d87ee027783..61e21ca3d134f 100644 --- a/ci-operator/jobs/openshift/service-serving-cert-signer/openshift-service-serving-cert-signer-presubmits-release-3.11.yaml +++ b/ci-operator/jobs/openshift/service-serving-cert-signer/openshift-service-serving-cert-signer-presubmits-release-3.11.yaml @@ -21,7 +21,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.11.json + key: release-3.11.yaml name: ci-operator-openshift-service-serving-cert-signer image: ci-operator:latest name: test 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 85833140052cc..912295639aa7a 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 @@ -21,7 +21,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-service-serving-cert-signer image: ci-operator:latest name: test diff --git a/ci-operator/jobs/openshift/telemeter/openshift-telemeter-postsubmits-release-3.11.yaml b/ci-operator/jobs/openshift/telemeter/openshift-telemeter-postsubmits-release-3.11.yaml index 6a7b9819c40ea..1ba4e8f60ccd3 100644 --- a/ci-operator/jobs/openshift/telemeter/openshift-telemeter-postsubmits-release-3.11.yaml +++ b/ci-operator/jobs/openshift/telemeter/openshift-telemeter-postsubmits-release-3.11.yaml @@ -20,7 +20,7 @@ postsubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.11.json + key: release-3.11.yaml name: ci-operator-openshift-telemeter image: ci-operator:latest name: test diff --git a/ci-operator/jobs/openshift/telemeter/openshift-telemeter-postsubmits.yaml b/ci-operator/jobs/openshift/telemeter/openshift-telemeter-postsubmits.yaml index c75c6f6f278d7..9a97d07c8bcfe 100644 --- a/ci-operator/jobs/openshift/telemeter/openshift-telemeter-postsubmits.yaml +++ b/ci-operator/jobs/openshift/telemeter/openshift-telemeter-postsubmits.yaml @@ -20,7 +20,7 @@ postsubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-telemeter image: ci-operator:latest name: test diff --git a/ci-operator/jobs/openshift/telemeter/openshift-telemeter-presubmits-release-3.11.yaml b/ci-operator/jobs/openshift/telemeter/openshift-telemeter-presubmits-release-3.11.yaml index 514b1f1eb0cef..0e29b0c415813 100644 --- a/ci-operator/jobs/openshift/telemeter/openshift-telemeter-presubmits-release-3.11.yaml +++ b/ci-operator/jobs/openshift/telemeter/openshift-telemeter-presubmits-release-3.11.yaml @@ -19,7 +19,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: release-3.11.json + key: release-3.11.yaml name: ci-operator-openshift-telemeter image: ci-operator:latest name: test diff --git a/ci-operator/jobs/openshift/telemeter/openshift-telemeter-presubmits.yaml b/ci-operator/jobs/openshift/telemeter/openshift-telemeter-presubmits.yaml index c4bbecc2896b2..8b8fc165b7eb5 100644 --- a/ci-operator/jobs/openshift/telemeter/openshift-telemeter-presubmits.yaml +++ b/ci-operator/jobs/openshift/telemeter/openshift-telemeter-presubmits.yaml @@ -19,7 +19,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-openshift-telemeter image: ci-operator:latest name: test diff --git a/ci-operator/jobs/tnozicka/openshift-acme/manual-presubmits.yaml b/ci-operator/jobs/tnozicka/openshift-acme/manual-presubmits.yaml index be90132ff64a7..868bdeceaeee0 100644 --- a/ci-operator/jobs/tnozicka/openshift-acme/manual-presubmits.yaml +++ b/ci-operator/jobs/tnozicka/openshift-acme/manual-presubmits.yaml @@ -25,7 +25,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-tnozicka-openshift-acme - name: TEST_COMMAND value: hack/ci-run-e2e.sh diff --git a/ci-operator/jobs/tnozicka/openshift-acme/tnozicka-openshift-acme-postsubmits.yaml b/ci-operator/jobs/tnozicka/openshift-acme/tnozicka-openshift-acme-postsubmits.yaml index 3cc4a47083537..f8c8344f098a8 100644 --- a/ci-operator/jobs/tnozicka/openshift-acme/tnozicka-openshift-acme-postsubmits.yaml +++ b/ci-operator/jobs/tnozicka/openshift-acme/tnozicka-openshift-acme-postsubmits.yaml @@ -16,7 +16,7 @@ postsubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-tnozicka-openshift-acme image: ci-operator:latest name: "" diff --git a/ci-operator/jobs/tnozicka/openshift-acme/tnozicka-openshift-acme-presubmits.yaml b/ci-operator/jobs/tnozicka/openshift-acme/tnozicka-openshift-acme-presubmits.yaml index 28a5d000fb94d..cd39edeeeb2a8 100644 --- a/ci-operator/jobs/tnozicka/openshift-acme/tnozicka-openshift-acme-presubmits.yaml +++ b/ci-operator/jobs/tnozicka/openshift-acme/tnozicka-openshift-acme-presubmits.yaml @@ -20,7 +20,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-tnozicka-openshift-acme image: ci-operator:latest name: "" @@ -47,7 +47,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-tnozicka-openshift-acme image: ci-operator:latest name: "" @@ -74,7 +74,7 @@ presubmits: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: master.json + key: master.yaml name: ci-operator-tnozicka-openshift-acme image: ci-operator:latest name: "" diff --git a/ci-operator/populate-configmaps.sh b/ci-operator/populate-configmaps.sh index 0f9416fd8069c..c65293a87ddd7 100755 --- a/ci-operator/populate-configmaps.sh +++ b/ci-operator/populate-configmaps.sh @@ -15,7 +15,7 @@ for org_dir in $( find "${config}" -mindepth 1 -maxdepth 1 -type d ); do for repo_dir in $( find "${config}/${org}" -mindepth 1 -maxdepth 1 -type d ); do repo="$( basename "${repo_dir}" )" files=() - for config_file in $( find "${config}/${org}/${repo}" -mindepth 1 -maxdepth 1 -type f -name "*.json" ); do + for config_file in $( find "${config}/${org}/${repo}" -mindepth 1 -maxdepth 1 -type f -name "*.yaml" ); do files+=( "--from-file=$( basename "${config_file}" )=${config_file}" ) done oc create configmap "ci-operator-${org}-${repo}" "${files[@]}" -o yaml --dry-run | oc apply -f - diff --git a/cluster/ci/config/prow/plugins.yaml b/cluster/ci/config/prow/plugins.yaml index 99a0eddaf860e..4f1b498388628 100644 --- a/cluster/ci/config/prow/plugins.yaml +++ b/cluster/ci/config/prow/plugins.yaml @@ -56,81 +56,81 @@ config_updater: cluster/test-deploy/gcp-ha-static/*.yaml: name: cluster-profile-gcp-ha-static - ci-operator/config/kubernetes/descheduler/*.json: + ci-operator/config/kubernetes/descheduler/*.yaml: name: ci-operator-kubernetes-descheduler - ci-operator/config/kubernetes/metrics-server/*.json: + ci-operator/config/kubernetes/metrics-server/*.yaml: name: ci-operator-kubernetes-metrics-server - ci-operator/config/kubernetes/coredns/*.json: + ci-operator/config/kubernetes/coredns/*.yaml: name: ci-operator-kubernetes-coredns - ci-operator/config/kubernetes/autoscaler/*.json: + ci-operator/config/kubernetes/autoscaler/*.yaml: name: ci-operator-kubernetes-autoscaler - ci-operator/config/kubernetes/cluster-capacity/*.json: + ci-operator/config/kubernetes/cluster-capacity/*.yaml: name: ci-operator-kubernetes-cluster-capacity - ci-operator/config/openshift/api/*.json: + ci-operator/config/openshift/api/*.yaml: name: ci-operator-openshift-api - ci-operator/config/openshift/origin/*.json: + ci-operator/config/openshift/origin/*.yaml: name: ci-operator-openshift-origin - ci-operator/config/openshift/installer/*.json: + ci-operator/config/openshift/installer/*.yaml: name: ci-operator-openshift-installer - ci-operator/config/openshift/cluster-version-operator/*.json: + ci-operator/config/openshift/cluster-version-operator/*.yaml: name: ci-operator-openshift-cluster-version-operator - ci-operator/config/openshift/origin-web-console-server/*.json: + ci-operator/config/openshift/origin-web-console-server/*.yaml: name: ci-operator-openshift-origin-web-console-server - ci-operator/config/openshift/console/*.json: + ci-operator/config/openshift/console/*.yaml: name: ci-operator-openshift-console - ci-operator/config/openshift/imagebuilder/*.json: + ci-operator/config/openshift/imagebuilder/*.yaml: name: ci-operator-openshift-imagebuilder - ci-operator/config/openshift/image-registry/*.json: + ci-operator/config/openshift/image-registry/*.yaml: name: ci-operator-openshift-image-registry - ci-operator/config/openshift/origin-web-console/*.json: + ci-operator/config/openshift/origin-web-console/*.yaml: name: ci-operator-openshift-origin-web-console - ci-operator/config/openshift/service-catalog/*.json: + ci-operator/config/openshift/service-catalog/*.yaml: name: ci-operator-openshift-service-catalog - ci-operator/config/openshift/openshift-ansible/*.json: + ci-operator/config/openshift/openshift-ansible/*.yaml: name: ci-operator-openshift-openshift-ansible - ci-operator/config/openshift/telemeter/*.json: + ci-operator/config/openshift/telemeter/*.yaml: name: ci-operator-openshift-telemeter - ci-operator/config/openshift/service-serving-cert-signer/*.json: + ci-operator/config/openshift/service-serving-cert-signer/*.yaml: name: ci-operator-openshift-service-serving-cert-signer - ci-operator/config/openshift/cluster-samples-operator/*.json: + ci-operator/config/openshift/cluster-samples-operator/*.yaml: name: ci-operator-openshift-cluster-samples-operator - ci-operator/config/openshift/jenkins/*.json: + ci-operator/config/openshift/jenkins/*.yaml: name: ci-operator-openshift-jenkins-canary - ci-operator/config/openshift/origin-aggregated-logging/*.json: + ci-operator/config/openshift/origin-aggregated-logging/*.yaml: name: ci-operator-openshift-origin-aggregated-logging - ci-operator/config/openshift/origin-metrics/*.json: + ci-operator/config/openshift/origin-metrics/*.yaml: name: ci-operator-openshift-origin-metrics - ci-operator/config/openshift/cluster-monitoring-operator/*.json: + ci-operator/config/openshift/cluster-monitoring-operator/*.yaml: name: ci-operator-openshift-cluster-monitoring-operator - ci-operator/config/openshift/configmap-reload/*.json: + ci-operator/config/openshift/configmap-reload/*.yaml: name: ci-operator-openshift-configmap-reload - ci-operator/config/openshift/kube-rbac-proxy/*.json: + ci-operator/config/openshift/kube-rbac-proxy/*.yaml: name: ci-operator-openshift-kube-rbac-proxy - ci-operator/config/openshift/kube-state-metrics/*.json: + ci-operator/config/openshift/kube-state-metrics/*.yaml: name: ci-operator-openshift-kube-state-metrics - ci-operator/config/openshift/prometheus-operator/*.json: + ci-operator/config/openshift/prometheus-operator/*.yaml: name: ci-operator-openshift-prometheus-operator - ci-operator/config/openshift/openshift-azure/*.json: + ci-operator/config/openshift/openshift-azure/*.yaml: name: ci-operator-openshift-openshift-azure - ci-operator/config/openshift/azure-misc/*.json: + ci-operator/config/openshift/azure-misc/*.yaml: name: ci-operator-openshift-azure-misc - ci-operator/config/openshift/machine-api-operator/*.json: + ci-operator/config/openshift/machine-api-operator/*.yaml: name: ci-operator-openshift-machine-api-operator - ci-operator/config/openshift/machine-config-operator/*.json: + ci-operator/config/openshift/machine-config-operator/*.yaml: name: ci-operator-openshift-machine-config-operator - ci-operator/config/openshift/ci-operator/*.json: + ci-operator/config/openshift/ci-operator/*.yaml: name: ci-operator-openshift-ci-operator - ci-operator/config/openshift/ci-operator-prowgen/*.json: + ci-operator/config/openshift/ci-operator-prowgen/*.yaml: name: ci-operator-openshift-ci-operator-prowgen - ci-operator/config/openshift/cluster-operator/*.json: + ci-operator/config/openshift/cluster-operator/*.yaml: name: ci-operator-openshift-cluster-operator - ci-operator/config/openshift/cluster-ingress-operator/*.json: + ci-operator/config/openshift/cluster-ingress-operator/*.yaml: name: ci-operator-openshift-cluster-ingress-operator - ci-operator/config/openshift/cluster-dns-operator/*.json: + ci-operator/config/openshift/cluster-dns-operator/*.yaml: name: ci-operator-openshift-cluster-dns-operator - ci-operator/config/openshift/cluster-api-provider-aws/*.json: + ci-operator/config/openshift/cluster-api-provider-aws/*.yaml: name: ci-operator-openshift-cluster-api-provider-aws - ci-operator/config/openshift/cluster-api-provider-libvirt/*.json: + ci-operator/config/openshift/cluster-api-provider-libvirt/*.yaml: name: ci-operator-openshift-cluster-api-provider-libvirt ci-operator/templates/openshift-azure/cluster-launch-e2e-azure.yaml: name: prow-job-cluster-launch-e2e-azure diff --git a/hack/branch-jobs b/hack/branch-jobs index aa0274545a09f..4528159a6d7df 100755 --- a/hack/branch-jobs +++ b/hack/branch-jobs @@ -32,10 +32,10 @@ for repo in `managed_repos "${BRANCH}"`; do fi # branch the master ci-operator config - if [[ -f "${base}/../ci-operator/config/${repo}/${BRANCH}.json" ]]; then - if [[ ! -f "${base}/../ci-operator/config/${repo}/${TO_BRANCH}.json" ]]; then - echo "${TO_BRANCH} | ${repo} | Creating ci-operator/config/${repo}/${TO_BRANCH}.json" - cp "${base}/../ci-operator/config/${repo}/${BRANCH}.json" "${base}/../ci-operator/config/${repo}/${TO_BRANCH}.json" + if [[ -f "${base}/../ci-operator/config/${repo}/${BRANCH}.yaml" ]]; then + if [[ ! -f "${base}/../ci-operator/config/${repo}/${TO_BRANCH}.yaml" ]]; then + echo "${TO_BRANCH} | ${repo} | Creating ci-operator/config/${repo}/${TO_BRANCH}.yaml" + cp "${base}/../ci-operator/config/${repo}/${BRANCH}.yaml" "${base}/../ci-operator/config/${repo}/${TO_BRANCH}.yaml" fi fi diff --git a/hack/lib/clone_jobs.py b/hack/lib/clone_jobs.py index 08a13f4165581..6a76aadb9edf9 100644 --- a/hack/lib/clone_jobs.py +++ b/hack/lib/clone_jobs.py @@ -32,5 +32,5 @@ def duplicate_job(job, from_branch, to_branch): y[t][repo] = newjobs if count > 0: out = yaml.dump(y, default_flow_style=False, Dumper=yaml.RoundTripDumper) - out = out.replace(from_branch+'.json', to_branch+'.json') - print out \ No newline at end of file + out = out.replace(from_branch+'.yaml', to_branch+'.yaml') + print out diff --git a/projects/azure/README.md b/projects/azure/README.md index ec961aaa3618f..36ddf4c597883 100644 --- a/projects/azure/README.md +++ b/projects/azure/README.md @@ -20,7 +20,7 @@ If you are running this job not in CI cluster development namespace, but on othe Run job: ``` -ci-operator --config ci-operator/config/openshift/openshift-azure/master.json --namespace=namespace-name --git-ref=openshift/openshift-azure@master --template ci-operator/templates/cluster-launch-e2e-azure.yaml --secret-dir $(pwd)/cluster/test-deploy/azure/ +ci-operator --config ci-operator/config/openshift/openshift-azure/master.yaml --namespace=namespace-name --git-ref=openshift/openshift-azure@master --template ci-operator/templates/cluster-launch-e2e-azure.yaml --secret-dir $(pwd)/cluster/test-deploy/azure/ ``` # Secret rotation