Revert tests to simple, direct curl

Author: rigoford

ci/pipeline.yml

@@ -216,8 +216,8 @@ jobs:
           - warden-stemcell/stemcell.tgz
           vars:
             deployment_name: *jenkins-deployment-name
-      - task: test-jenkins-run-job
-        file: devtools-boshrelease-ci/ci/tasks/test-jenkins-run-job.yml
+      - task: test-jenkins-curl
+        file: devtools-boshrelease-ci/ci/tasks/test-jenkins-curl.yml
         params:
           BOSH_DEPLOYMENT: *jenkins-deployment-name
       - put: bosh-deployment # Destroy Jenkins instance

ci/tasks/test-gerrit-curl.yml

@@ -10,7 +10,16 @@ run:
   args:
   - -c
   - | 
-    cd bbl-state/bbl-state
-    source <(bbl print-env)
-    sleep 10 # Sleeping because this curl lacks the --retry-connrefused
-    bosh -d $BOSH_DEPLOYMENT ssh gerrit/0 -c "curl -S --retry-max-time 300 --retry-delay 1 --retry 300 http://localhost:8080"
+    pushd bbl-state/bbl-state
+      source <(bbl print-env)
+      JUMPBOX_USER="jumpbox"; export JUMPBOX_USER
+      JUMPBOX_HOST=$(bosh int <(bbl outputs) --path /jumpbox_url | cut -d: -f1); export JUMPBOX_HOST
+      # set up jumpbox ssh tunnel
+      instance_info=$(bosh --json instances -i); export instance_info
+      ip=$(jq -r .Tables[0].Rows[0].ips <<< "$instance_info")
+      # shellcheck disable=SC2029
+      ssh -o StrictHostKeyChecking=no -fNnL "8080:$ip:8080" -i "$JUMPBOX_PRIVATE_KEY" "$JUMPBOX_USER@$JUMPBOX_HOST"
+      trap "pkill ssh" EXIT
+      sleep 10
+      curl -S --retry-max-time 300  --retry-delay 1 --retry 300 http://localhost:8080/
+    popd

ci/tasks/test-jenkins-curl.yml

@@ -0,0 +1,26 @@
+platform: linux
+image_resource:
+  type: docker-image
+  source:
+    repository: engineerbetter/pcf-ops
+inputs:
+- name: bbl-state
+- name: devtools-boshrelease-ci
+run:
+  path: /bin/bash
+  args:
+  - -c
+  - | 
+    pushd bbl-state/bbl-state
+      source <(bbl print-env)
+      JUMPBOX_USER="jumpbox"; export JUMPBOX_USER
+      JUMPBOX_HOST=$(bosh int <(bbl outputs) --path /jumpbox_url | cut -d: -f1); export JUMPBOX_HOST
+      # set up jumpbox ssh tunnel
+      instance_info=$(bosh --json instances -i); export instance_info
+      ip=$(jq -r .Tables[0].Rows[0].ips <<< "$instance_info")
+      # shellcheck disable=SC2029
+      ssh -o StrictHostKeyChecking=no -fNnL "8080:$ip:8080" -i "$JUMPBOX_PRIVATE_KEY" "$JUMPBOX_USER@$JUMPBOX_HOST"
+      trap "pkill ssh" EXIT
+      sleep 10
+      curl -S --retry-max-time 300 --retry-delay 1 --retry 300 http://localhost:8080/login
+    popd

ci/tasks/test-jenkins-run-job.sh

@@ -10,7 +10,17 @@ run:
   args:
   - -c
   - | 
-    cd bbl-state/bbl-state
-    source <(bbl print-env)
-    sleep 10 # Sleeping because this curl lacks the --retry-connrefused
-    bosh -d $BOSH_DEPLOYMENT ssh nexus/0 -c "curl -S --retry-max-time 300 --   retry-delay 1 --retry 300 http://localhost:8081/"
+    pushd bbl-state/bbl-state
+      source <(bbl print-env)
+      JUMPBOX_USER="jumpbox"; export JUMPBOX_USER
+      JUMPBOX_HOST=$(bosh int <(bbl outputs) --path /jumpbox_url | cut -d: -f1); export JUMPBOX_HOST
+      # set up jumpbox ssh tunnel
+      instance_info=$(bosh --json instances -i); export instance_info
+      ip=$(jq -r .Tables[0].Rows[0].ips <<< "$instance_info")
+      # shellcheck disable=SC2029
+      ssh -o StrictHostKeyChecking=no -fNnL "8081:$ip:8081" -i "$JUMPBOX_PRIVATE_KEY" "$JUMPBOX_USER@$JUMPBOX_HOST"
+      trap "pkill ssh" EXIT
+      sleep 10
+curl -S --retry-max-time 300  --retry-delay 1 --retry 300 http://localhost:8081/
+    popd
+

ci/tasks/test-jenkins-run-job.xml

@@ -10,7 +10,16 @@ run:
   args:
   - -c
   - | 
-    cd bbl-state/bbl-state
-    source <(bbl print-env)
-    sleep 10 # Sleeping because this curl lacks the --retry-connrefused
-    bosh -d $BOSH_DEPLOYMENT ssh sonarqube/0 -c "curl -S --retry-max-time 300 --retry-delay 1 --retry 300 http://localhost:9000"
+    pushd bbl-state/bbl-state
+      source <(bbl print-env)
+      JUMPBOX_USER="jumpbox"; export JUMPBOX_USER
+      JUMPBOX_HOST=$(bosh int <(bbl outputs) --path /jumpbox_url | cut -d: -f1); export JUMPBOX_HOST
+      # set up jumpbox ssh tunnel
+      instance_info=$(bosh --json instances -i); export instance_info
+      ip=$(jq -r .Tables[0].Rows[0].ips <<< "$instance_info")
+      # shellcheck disable=SC2029
+      ssh -o StrictHostKeyChecking=no -fNnL "9000:$ip:9000" -i "$JUMPBOX_PRIVATE_KEY" "$JUMPBOX_USER@$JUMPBOX_HOST"
+      trap "pkill ssh" EXIT
+      sleep 10
+      curl -S --retry-max-time 300  --retry-delay 1 --retry 300 http://localhost:9000/
+    popd