Skip to content
This repository was archived by the owner on Jul 17, 2018. It is now read-only.

Commit c6fdfff

Browse files
author
Dan Rees
committed
Add devtools-boshrelease input for tests
1 parent 2842e01 commit c6fdfff

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

ci/tasks/test-jenkins.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ image_resource:
55
repository: engineerbetter/pcf-ops
66
inputs:
77
- name: bbl-state
8+
- name: devtools-boshrelease
89
- name: devtools-tests
910
run:
1011
path: /bin/bash
@@ -17,13 +18,13 @@ run:
1718
JUMPBOX_HOST=$(bosh int <(bbl outputs) --path /jumpbox_url | cut -d: -f1); export JUMPBOX_HOST
1819
# set up jumpbox ssh tunnel
1920
instance_info=$(bosh --json instances -i); export instance_info
20-
ip=$(jq -r .Tables[0].Rows[0].ips <<< "$instance_info")
21+
ip=$(jq --raw-output .Tables[0].Rows[0].ips <<< "$instance_info")
2122
# shellcheck disable=SC2029
2223
ssh -o StrictHostKeyChecking=no -fNnL "8080:$ip:8080" -i "$JUMPBOX_PRIVATE_KEY" "$JUMPBOX_USER@$JUMPBOX_HOST"
2324
trap "pkill ssh" EXIT
2425
credhub api --server=${CREDHUB_SERVER}
2526
credhub login --username=${CREDHUB_USERNAME} --password=${CREDHUB_PASSWORD}
26-
export JENKINS_PASSWORD=$(credhub get --name=/bosh-devtools-boshrelease/jenkins/jenkins_admin_password --output-json | jq -r ".value" | tr -d ' ')
27+
export JENKINS_PASSWORD=$(credhub get --name=/bosh-devtools-boshrelease/jenkins/jenkins_admin_password --output-json | jq --raw-output ".value" | tr --delete ' ')
2728
export JENKINS_HOST="http://localhost:8080"
2829
export NEXUS_HOST="http://localhost:8081" # TODO Refactor tests to remove dependency on Nexus in Jenkins unit tests.
2930
popd

0 commit comments

Comments
 (0)