diff --git a/ci-operator/config/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-master.yaml b/ci-operator/config/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-master.yaml index fc2212e00087b..43e47fcf494a4 100644 --- a/ci-operator/config/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-master.yaml +++ b/ci-operator/config/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-master.yaml @@ -39,7 +39,7 @@ tests: upgrade: false - artifact_dir: /tmp/artifacts as: e2e-aws-operator - commands: ARTIFACT_DIR=/tmp/artifacts JUNIT_REPORT=1 make test-e2e + commands: JUNIT_REPORT=1 make test-e2e openshift_installer_src: cluster_profile: aws - as: e2e-aws-image-registry diff --git a/ci-operator/config/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-release-4.0.yaml b/ci-operator/config/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-release-4.0.yaml index cdeca3de5e2d7..965c5511c0a81 100644 --- a/ci-operator/config/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-release-4.0.yaml +++ b/ci-operator/config/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-release-4.0.yaml @@ -39,7 +39,7 @@ tests: upgrade: false - artifact_dir: /tmp/artifacts as: e2e-aws-operator - commands: ARTIFACT_DIR=/tmp/artifacts JUNIT_REPORT=1 make test-e2e + commands: JUNIT_REPORT=1 make test-e2e openshift_installer_src: cluster_profile: aws - as: e2e-aws-image-registry diff --git a/ci-operator/config/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-release-4.1.yaml b/ci-operator/config/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-release-4.1.yaml index 067b7177b2535..7b87ba3650158 100644 --- a/ci-operator/config/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-release-4.1.yaml +++ b/ci-operator/config/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-release-4.1.yaml @@ -40,7 +40,7 @@ tests: upgrade: false - artifact_dir: /tmp/artifacts as: e2e-aws-operator - commands: ARTIFACT_DIR=/tmp/artifacts JUNIT_REPORT=1 make test-e2e + commands: JUNIT_REPORT=1 make test-e2e openshift_installer_src: cluster_profile: aws - as: e2e-aws-image-registry diff --git a/ci-operator/jobs/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-master-presubmits.yaml b/ci-operator/jobs/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-master-presubmits.yaml index 593f3917bbfae..0610f10d8f979 100644 --- a/ci-operator/jobs/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-master-presubmits.yaml @@ -147,7 +147,7 @@ presubmits: - name: JOB_NAME_SAFE value: e2e-aws-operator - name: TEST_COMMAND - value: ARTIFACT_DIR=/tmp/artifacts JUNIT_REPORT=1 make test-e2e + value: JUNIT_REPORT=1 make test-e2e image: ci-operator:latest imagePullPolicy: Always name: "" diff --git a/ci-operator/jobs/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-release-4.0-presubmits.yaml b/ci-operator/jobs/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-release-4.0-presubmits.yaml index a306a2d63040d..4066c649a69d6 100644 --- a/ci-operator/jobs/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-release-4.0-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-release-4.0-presubmits.yaml @@ -147,7 +147,7 @@ presubmits: - name: JOB_NAME_SAFE value: e2e-aws-operator - name: TEST_COMMAND - value: ARTIFACT_DIR=/tmp/artifacts JUNIT_REPORT=1 make test-e2e + value: JUNIT_REPORT=1 make test-e2e image: ci-operator:latest imagePullPolicy: Always name: "" diff --git a/ci-operator/jobs/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-release-4.1-presubmits.yaml b/ci-operator/jobs/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-release-4.1-presubmits.yaml index a96d231c51c7b..aa3a1600bdc3c 100644 --- a/ci-operator/jobs/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-release-4.1-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-release-4.1-presubmits.yaml @@ -147,7 +147,7 @@ presubmits: - name: JOB_NAME_SAFE value: e2e-aws-operator - name: TEST_COMMAND - value: ARTIFACT_DIR=/tmp/artifacts JUNIT_REPORT=1 make test-e2e + value: JUNIT_REPORT=1 make test-e2e image: ci-operator:latest imagePullPolicy: Always name: "" diff --git a/ci-operator/templates/openshift/openshift-ansible/cluster-launch-src.yaml b/ci-operator/templates/openshift/openshift-ansible/cluster-launch-src.yaml index 020055c755082..13a2babbcedde 100644 --- a/ci-operator/templates/openshift/openshift-ansible/cluster-launch-src.yaml +++ b/ci-operator/templates/openshift/openshift-ansible/cluster-launch-src.yaml @@ -127,7 +127,6 @@ objects: # don't let clients impact the global kubeconfig cp /tmp/shared/admin.kubeconfig /tmp/admin.kubeconfig - export ARTIFACT_DIR=/tmp/artifacts # set up cloud-provider-specific env vars if [[ "${CLUSTER_TYPE}" == "gcp" ]]; then