Skip to content

Commit f981c57

Browse files
committed
step-registry: access shared directory
1 parent 98e1cdf commit f981c57

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

ci-operator/step-registry/ipi/deprovision/artifacts/bootstrap/ipi-deprovision-artifacts-bootstrap-commands.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,12 @@ set -o nounset
44
set -o errexit
55
set -o pipefail
66

7-
export PATH=$PATH:/tmp/shared
8-
97
echo "Gathering installer artifacts ..."
108
# we don't have jq, so the python equivalent of
119
# jq '.modules[].resources."aws_instance.bootstrap".primary.attributes."public_ip" | select(.)'
1210
bootstrap_ip=$(python -c \
1311
'import sys, json; d=reduce(lambda x,y: dict(x.items() + y.items()), map(lambda x: x["resources"], json.load(sys.stdin)["modules"])); k="aws_instance.bootstrap"; print d[k]["primary"]["attributes"]["public_ip"] if k in d else ""' \
14-
< ${ARTIFACT_DIR}/installer/terraform.tfstate
12+
< "${SHARED_DIR}/terraform.tfstate"
1513
)
1614

1715
if [ -n "${bootstrap_ip}" ]

ci-operator/step-registry/ipi/deprovision/deprovision/ipi-deprovision-deprovision-commands.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@ set -o errexit
55
set -o pipefail
66

77
echo "Deprovisioning cluster ..."
8-
openshift-install --dir ${ARTIFACT_DIR}/installer destroy cluster
8+
cp -ar "${SHARED_DIR}" /tmp/installer
9+
openshift-install --dir /tmp/installer destroy cluster

0 commit comments

Comments
 (0)