Merge pull request #3761 from vrutkovs/scaleup-crio-4.1

openshift-merge-robot · web-flow · commit 3ffd09af68f2 · 2019-05-24T19:21:19.000+02:00
scaleup: use RPM_REPO_CRIO_DIR to setup version-specific dir on crio-tested
diff --git a/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml b/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml
@@ -197,6 +197,8 @@ presubmits:
               name: ci-operator-master-configs
         - name: JOB_NAME_SAFE
           value: e2e-aws-scaleup-rhel7
+        - name: RPM_REPO_CRIO_DIR
+          value: 4.2-rhel-7
         - name: RPM_REPO_OPENSHIFT_ORIGIN
           value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.2/
         - name: TEST_COMMAND
diff --git a/ci-operator/jobs/openshift/installer/openshift-installer-release-4.1-presubmits.yaml b/ci-operator/jobs/openshift/installer/openshift-installer-release-4.1-presubmits.yaml
@@ -99,6 +99,8 @@ presubmits:
               name: ci-operator-4.1-configs
         - name: JOB_NAME_SAFE
           value: e2e-aws-scaleup-rhel7
+        - name: RPM_REPO_CRIO_DIR
+          value: 4.1-rhel-7
         - name: RPM_REPO_OPENSHIFT_ORIGIN
           value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.1/
         - name: TEST_COMMAND
diff --git a/ci-operator/jobs/openshift/installer/openshift-installer-release-4.2-presubmits.yaml b/ci-operator/jobs/openshift/installer/openshift-installer-release-4.2-presubmits.yaml
@@ -99,6 +99,8 @@ presubmits:
               name: ci-operator-4.2-configs
         - name: JOB_NAME_SAFE
           value: e2e-aws-scaleup-rhel7
+        - name: RPM_REPO_CRIO_DIR
+          value: 4.2-rhel-7
         - name: RPM_REPO_OPENSHIFT_ORIGIN
           value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.2/
         - name: TEST_COMMAND
diff --git a/ci-operator/jobs/openshift/installer/openshift-installer-release-4.3-presubmits.yaml b/ci-operator/jobs/openshift/installer/openshift-installer-release-4.3-presubmits.yaml
@@ -99,6 +99,8 @@ presubmits:
               name: ci-operator-4.3-configs
         - name: JOB_NAME_SAFE
           value: e2e-aws-scaleup-rhel7
+        - name: RPM_REPO_CRIO_DIR
+          value: 4.3-rhel-7
         - name: RPM_REPO_OPENSHIFT_ORIGIN
           value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.3/
         - name: TEST_COMMAND
diff --git a/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-master-presubmits.yaml b/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-master-presubmits.yaml
@@ -265,6 +265,8 @@ presubmits:
               name: ci-operator-master-configs
         - name: JOB_NAME_SAFE
           value: e2e-rhel-scaleup
+        - name: RPM_REPO_CRIO_DIR
+          value: 4.2-rhel-7
         - name: RPM_REPO_OPENSHIFT_ORIGIN
           value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.2/
         - name: TEST_COMMAND
diff --git a/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-4.1-presubmits.yaml b/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-4.1-presubmits.yaml
@@ -257,6 +257,8 @@ presubmits:
               name: ci-operator-4.1-configs
         - name: JOB_NAME_SAFE
           value: e2e-rhel-scaleup
+        - name: RPM_REPO_CRIO_DIR
+          value: 4.1-rhel-7
         - name: RPM_REPO_OPENSHIFT_ORIGIN
           value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.1/
         - name: TEST_COMMAND
diff --git a/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-4.2-presubmits.yaml b/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-4.2-presubmits.yaml
@@ -257,6 +257,8 @@ presubmits:
               name: ci-operator-4.2-configs
         - name: JOB_NAME_SAFE
           value: e2e-rhel-scaleup
+        - name: RPM_REPO_CRIO_DIR
+          value: 4.2-rhel-7
         - name: RPM_REPO_OPENSHIFT_ORIGIN
           value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.2/
         - name: TEST_COMMAND
diff --git a/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-4.3-presubmits.yaml b/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-4.3-presubmits.yaml
@@ -257,6 +257,8 @@ presubmits:
               name: ci-operator-4.3-configs
         - name: JOB_NAME_SAFE
           value: e2e-rhel-scaleup
+        - name: RPM_REPO_CRIO_DIR
+          value: 4.3-rhel-7
         - name: RPM_REPO_OPENSHIFT_ORIGIN
           value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.3/
         - name: TEST_COMMAND
diff --git a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-master-presubmits.yaml b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-master-presubmits.yaml
@@ -282,6 +282,8 @@ presubmits:
               name: ci-operator-master-configs
         - name: JOB_NAME_SAFE
           value: e2e-rhel-scaleup
+        - name: RPM_REPO_CRIO_DIR
+          value: 4.2-rhel-7
         - name: RPM_REPO_OPENSHIFT_ORIGIN
           value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.2/
         - name: TEST_COMMAND
diff --git a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.1-presubmits.yaml b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.1-presubmits.yaml
@@ -282,6 +282,8 @@ presubmits:
               name: ci-operator-4.1-configs
         - name: JOB_NAME_SAFE
           value: e2e-rhel-scaleup
+        - name: RPM_REPO_CRIO_DIR
+          value: 4.1-rhel-7
         - name: RPM_REPO_OPENSHIFT_ORIGIN
           value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.1/
         - name: TEST_COMMAND
diff --git a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.2-presubmits.yaml b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.2-presubmits.yaml
@@ -282,6 +282,8 @@ presubmits:
               name: ci-operator-4.2-configs
         - name: JOB_NAME_SAFE
           value: e2e-rhel-scaleup
+        - name: RPM_REPO_CRIO_DIR
+          value: 4.2-rhel-7
         - name: RPM_REPO_OPENSHIFT_ORIGIN
           value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.2/
         - name: TEST_COMMAND
diff --git a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.3-presubmits.yaml b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.3-presubmits.yaml
@@ -282,6 +282,8 @@ presubmits:
               name: ci-operator-4.3-configs
         - name: JOB_NAME_SAFE
           value: e2e-rhel-scaleup
+        - name: RPM_REPO_CRIO_DIR
+          value: 4.3-rhel-7
         - name: RPM_REPO_OPENSHIFT_ORIGIN
           value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.3/
         - name: TEST_COMMAND
diff --git a/ci-operator/jobs/openshift/openshift-ansible/openshift-openshift-ansible-master-presubmits.yaml b/ci-operator/jobs/openshift/openshift-ansible/openshift-openshift-ansible-master-presubmits.yaml
@@ -33,6 +33,8 @@ presubmits:
               name: ci-operator-master-configs
         - name: JOB_NAME_SAFE
           value: e2e-aws-scaleup-rhel7
+        - name: RPM_REPO_CRIO_DIR
+          value: 4.2-rhel-7
         - name: RPM_REPO_OPENSHIFT_ORIGIN
           value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.2/
         - name: TEST_COMMAND
diff --git a/ci-operator/jobs/openshift/openshift-ansible/openshift-openshift-ansible-release-4.1-presubmits.yaml b/ci-operator/jobs/openshift/openshift-ansible/openshift-openshift-ansible-release-4.1-presubmits.yaml
@@ -33,6 +33,8 @@ presubmits:
               name: ci-operator-4.1-configs
         - name: JOB_NAME_SAFE
           value: e2e-aws-scaleup-rhel7
+        - name: RPM_REPO_CRIO_DIR
+          value: 4.1-rhel-7
         - name: RPM_REPO_OPENSHIFT_ORIGIN
           value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.1/
         - name: TEST_COMMAND
diff --git a/ci-operator/jobs/openshift/openshift-ansible/openshift-openshift-ansible-release-4.2-presubmits.yaml b/ci-operator/jobs/openshift/openshift-ansible/openshift-openshift-ansible-release-4.2-presubmits.yaml
@@ -33,6 +33,8 @@ presubmits:
               name: ci-operator-4.2-configs
         - name: JOB_NAME_SAFE
           value: e2e-aws-scaleup-rhel7
+        - name: RPM_REPO_CRIO_DIR
+          value: 4.2-rhel-7
         - name: RPM_REPO_OPENSHIFT_ORIGIN
           value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.2/
         - name: TEST_COMMAND
diff --git a/ci-operator/jobs/openshift/openshift-ansible/openshift-openshift-ansible-release-4.3-presubmits.yaml b/ci-operator/jobs/openshift/openshift-ansible/openshift-openshift-ansible-release-4.3-presubmits.yaml
@@ -33,6 +33,8 @@ presubmits:
               name: ci-operator-4.3-configs
         - name: JOB_NAME_SAFE
           value: e2e-aws-scaleup-rhel7
+        - name: RPM_REPO_CRIO_DIR
+          value: 4.3-rhel-7
         - name: RPM_REPO_OPENSHIFT_ORIGIN
           value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.3/
         - name: TEST_COMMAND
