Skip to content

Commit ece4d5a

Browse files
committed
ci-operator: Remove uneccessary ARTIFACT_DIR touches
This got pulled up into the 'env' block for cluster-launch-installer-e2e.yaml and cluster-launch-installer-src.yaml in 43dde9e (Set KUBE_SSH_BASTION and KUBE_SSH_KEY_PATH in installer tests, 2018-12-23, openshift#2469). That obsoleted the previous export in the src template's test script. I'm also removing a number of existing e2e consumers that set this to the default value, since there's no need to do that.
1 parent b4fe336 commit ece4d5a

7 files changed

+6
-7
lines changed

ci-operator/config/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-master.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ tests:
3939
upgrade: false
4040
- artifact_dir: /tmp/artifacts
4141
as: e2e-aws-operator
42-
commands: ARTIFACT_DIR=/tmp/artifacts JUNIT_REPORT=1 make test-e2e
42+
commands: JUNIT_REPORT=1 make test-e2e
4343
openshift_installer_src:
4444
cluster_profile: aws
4545
- as: e2e-aws-image-registry

ci-operator/config/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-release-4.0.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ tests:
3939
upgrade: false
4040
- artifact_dir: /tmp/artifacts
4141
as: e2e-aws-operator
42-
commands: ARTIFACT_DIR=/tmp/artifacts JUNIT_REPORT=1 make test-e2e
42+
commands: JUNIT_REPORT=1 make test-e2e
4343
openshift_installer_src:
4444
cluster_profile: aws
4545
- as: e2e-aws-image-registry

ci-operator/config/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-release-4.1.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ tests:
4040
upgrade: false
4141
- artifact_dir: /tmp/artifacts
4242
as: e2e-aws-operator
43-
commands: ARTIFACT_DIR=/tmp/artifacts JUNIT_REPORT=1 make test-e2e
43+
commands: JUNIT_REPORT=1 make test-e2e
4444
openshift_installer_src:
4545
cluster_profile: aws
4646
- as: e2e-aws-image-registry

ci-operator/jobs/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-master-presubmits.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ presubmits:
147147
- name: JOB_NAME_SAFE
148148
value: e2e-aws-operator
149149
- name: TEST_COMMAND
150-
value: ARTIFACT_DIR=/tmp/artifacts JUNIT_REPORT=1 make test-e2e
150+
value: JUNIT_REPORT=1 make test-e2e
151151
image: ci-operator:latest
152152
imagePullPolicy: Always
153153
name: ""

ci-operator/jobs/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-release-4.0-presubmits.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ presubmits:
147147
- name: JOB_NAME_SAFE
148148
value: e2e-aws-operator
149149
- name: TEST_COMMAND
150-
value: ARTIFACT_DIR=/tmp/artifacts JUNIT_REPORT=1 make test-e2e
150+
value: JUNIT_REPORT=1 make test-e2e
151151
image: ci-operator:latest
152152
imagePullPolicy: Always
153153
name: ""

ci-operator/jobs/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-release-4.1-presubmits.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ presubmits:
147147
- name: JOB_NAME_SAFE
148148
value: e2e-aws-operator
149149
- name: TEST_COMMAND
150-
value: ARTIFACT_DIR=/tmp/artifacts JUNIT_REPORT=1 make test-e2e
150+
value: JUNIT_REPORT=1 make test-e2e
151151
image: ci-operator:latest
152152
imagePullPolicy: Always
153153
name: ""

ci-operator/templates/openshift/openshift-ansible/cluster-launch-src.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,6 @@ objects:
127127
128128
# don't let clients impact the global kubeconfig
129129
cp /tmp/shared/admin.kubeconfig /tmp/admin.kubeconfig
130-
export ARTIFACT_DIR=/tmp/artifacts
131130
132131
# set up cloud-provider-specific env vars
133132
if [[ "${CLUSTER_TYPE}" == "gcp" ]]; then

0 commit comments

Comments
 (0)