[fix gate] Unblock failing integration job
This PS fixes the integration job failing on the following: Unable to match $.[0].data.`split(:, 0, 1)` + "://" + $.[0].data.`split(/, 2, 3)` + "/v1" as http://barbican.openstack.svc.cluster.local:80/, got http://barbican.openstack.svc.cluster.local:80/v1 This change corrects this issue. Change-Id: Iccc172efa37fe06df3af59a569bbc6f135c773fe
This commit is contained in:
parent
2ae61e1633
commit
444e4d9dcc
|
@ -36,7 +36,7 @@ tests:
|
||||||
$.`len`: 1
|
$.`len`: 1
|
||||||
# NOTE(fmontei): jsonpath-rw-ext uses a 1 character separator (rather than allowing a string)
|
# NOTE(fmontei): jsonpath-rw-ext uses a 1 character separator (rather than allowing a string)
|
||||||
# leading to this nastiness:
|
# leading to this nastiness:
|
||||||
$.[0].data.`split(:, 0, 1)` + "://" + $.[0].data.`split(/, 2, 3)` + "/v1": $ENVIRON['TEST_BARBICAN_URL']
|
$.[0].data.`split(:, 0, 1)` + "://" + $.[0].data.`split(/, 2, 3)`: $ENVIRON['TEST_BARBICAN_URL']
|
||||||
|
|
||||||
- name: verify_revision_documents_returns_secret_ref
|
- name: verify_revision_documents_returns_secret_ref
|
||||||
desc: Verify that the documents for the created revision returns the secret ref.
|
desc: Verify that the documents for the created revision returns the secret ref.
|
||||||
|
@ -46,4 +46,4 @@ tests:
|
||||||
$.`len`: 1
|
$.`len`: 1
|
||||||
# NOTE(fmontei): jsonpath-rw-ext uses a 1 character separator (rather than allowing a string)
|
# NOTE(fmontei): jsonpath-rw-ext uses a 1 character separator (rather than allowing a string)
|
||||||
# leading to this nastiness:
|
# leading to this nastiness:
|
||||||
$.[0].data.`split(:, 0, 1)` + "://" + $.[0].data.`split(/, 2, 3)` + "/v1": $ENVIRON['TEST_BARBICAN_URL']
|
$.[0].data.`split(:, 0, 1)` + "://" + $.[0].data.`split(/, 2, 3)`: $ENVIRON['TEST_BARBICAN_URL']
|
||||||
|
|
|
@ -168,13 +168,13 @@ tests:
|
||||||
$.`len`: 7
|
$.`len`: 7
|
||||||
# NOTE(fmontei): jsonpath-rw-ext uses a 1 character separator (rather than allowing a string)
|
# NOTE(fmontei): jsonpath-rw-ext uses a 1 character separator (rather than allowing a string)
|
||||||
# leading to this nastiness:
|
# leading to this nastiness:
|
||||||
$.[0].data.`split(:, 0, 1)` + "://" + $.[0].data.`split(/, 2, 3)` + "/v1": $ENVIRON['TEST_BARBICAN_URL']
|
$.[0].data.`split(:, 0, 1)` + "://" + $.[0].data.`split(/, 2, 3)`: $ENVIRON['TEST_BARBICAN_URL']
|
||||||
$.[1].data.`split(:, 0, 1)` + "://" + $.[1].data.`split(/, 2, 3)` + "/v1": $ENVIRON['TEST_BARBICAN_URL']
|
$.[1].data.`split(:, 0, 1)` + "://" + $.[1].data.`split(/, 2, 3)`: $ENVIRON['TEST_BARBICAN_URL']
|
||||||
$.[2].data.`split(:, 0, 1)` + "://" + $.[2].data.`split(/, 2, 3)` + "/v1": $ENVIRON['TEST_BARBICAN_URL']
|
$.[2].data.`split(:, 0, 1)` + "://" + $.[2].data.`split(/, 2, 3)`: $ENVIRON['TEST_BARBICAN_URL']
|
||||||
$.[3].data.`split(:, 0, 1)` + "://" + $.[3].data.`split(/, 2, 3)` + "/v1": $ENVIRON['TEST_BARBICAN_URL']
|
$.[3].data.`split(:, 0, 1)` + "://" + $.[3].data.`split(/, 2, 3)`: $ENVIRON['TEST_BARBICAN_URL']
|
||||||
$.[4].data.`split(:, 0, 1)` + "://" + $.[4].data.`split(/, 2, 3)` + "/v1": $ENVIRON['TEST_BARBICAN_URL']
|
$.[4].data.`split(:, 0, 1)` + "://" + $.[4].data.`split(/, 2, 3)`: $ENVIRON['TEST_BARBICAN_URL']
|
||||||
$.[5].data.`split(:, 0, 1)` + "://" + $.[5].data.`split(/, 2, 3)` + "/v1": $ENVIRON['TEST_BARBICAN_URL']
|
$.[5].data.`split(:, 0, 1)` + "://" + $.[5].data.`split(/, 2, 3)`: $ENVIRON['TEST_BARBICAN_URL']
|
||||||
$.[6].data.`split(:, 0, 1)` + "://" + $.[6].data.`split(/, 2, 3)` + "/v1": $ENVIRON['TEST_BARBICAN_URL']
|
$.[6].data.`split(:, 0, 1)` + "://" + $.[6].data.`split(/, 2, 3)`: $ENVIRON['TEST_BARBICAN_URL']
|
||||||
|
|
||||||
- name: verify_secret_payload_in_destination_document
|
- name: verify_secret_payload_in_destination_document
|
||||||
desc: |
|
desc: |
|
||||||
|
|
|
@ -147,7 +147,13 @@ function deploy_deckhand {
|
||||||
# NOTE(fmontei): Generate an admin token instead of hacking a policy
|
# NOTE(fmontei): Generate an admin token instead of hacking a policy
|
||||||
# file with no permissions to test authN as well as authZ.
|
# file with no permissions to test authN as well as authZ.
|
||||||
export TEST_AUTH_TOKEN=$( openstack token issue --format value -c id )
|
export TEST_AUTH_TOKEN=$( openstack token issue --format value -c id )
|
||||||
export TEST_BARBICAN_URL=$( openstack endpoint list --format value | grep barbican | grep public | awk '{print $7}' )
|
local test_barbican_url=$( openstack endpoint list --format value | grep barbican | grep public | awk '{print $7}' )
|
||||||
|
|
||||||
|
if [[ $test_barbican_url == */ ]]; then
|
||||||
|
test_barbican_url=$( echo $test_barbican_url | sed 's/.$//' )
|
||||||
|
fi
|
||||||
|
|
||||||
|
export TEST_BARBICAN_URL=$test_barbican_url
|
||||||
|
|
||||||
log_section "Running Deckhand via Docker"
|
log_section "Running Deckhand via Docker"
|
||||||
sudo docker run \
|
sudo docker run \
|
||||||
|
|
Loading…
Reference in New Issue