summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2019-03-12 20:08:26 +0000
committerGerrit Code Review <review@openstack.org>2019-03-12 20:08:26 +0000
commit919b44788663a29ec402a793a7a779e0d1866e06 (patch)
treeb70bcc7a169fb42af883fd3a4a3b6ed1854434df
parentd70e49656b92a67e4f2b9562ad35405e60ad689d (diff)
parent9e74248aeecbac7d0469412312ce9f501d33369e (diff)
Merge "[pegleg] - Used the latest pegleg verion."
-rw-r--r--tools/multi_nodes_gate/airship_gate/lib/config.sh2
-rwxr-xr-xtools/multi_nodes_gate/airship_gate/stages/pegleg-collect.sh22
2 files changed, 20 insertions, 4 deletions
diff --git a/tools/multi_nodes_gate/airship_gate/lib/config.sh b/tools/multi_nodes_gate/airship_gate/lib/config.sh
index ae7296a..b9da6c4 100644
--- a/tools/multi_nodes_gate/airship_gate/lib/config.sh
+++ b/tools/multi_nodes_gate/airship_gate/lib/config.sh
@@ -7,7 +7,7 @@ export BUILD_WORK_DIR=${BUILD_WORK_DIR:-/work}
7export BASE_IMAGE_SIZE=${BASE_IMAGE_SIZE:-68719476736} 7export BASE_IMAGE_SIZE=${BASE_IMAGE_SIZE:-68719476736}
8export BASE_IMAGE_URL=${BASE_IMAGE_URL:-https://cloud-images.ubuntu.com/releases/xenial/release/ubuntu-16.04-server-cloudimg-amd64-disk1.img} 8export BASE_IMAGE_URL=${BASE_IMAGE_URL:-https://cloud-images.ubuntu.com/releases/xenial/release/ubuntu-16.04-server-cloudimg-amd64-disk1.img}
9export IMAGE_PROMENADE_CLI=${IMAGE_PROMENADE_CLI:-quay.io/airshipit/promenade:cfb8aa498c294c2adbc369ba5aaee19b49550d22} 9export IMAGE_PROMENADE_CLI=${IMAGE_PROMENADE_CLI:-quay.io/airshipit/promenade:cfb8aa498c294c2adbc369ba5aaee19b49550d22}
10export IMAGE_PEGLEG_CLI=${IMAGE_PEGLEG_CLI:-quay.io/airshipit/pegleg:ac6297eae6c51ab2f13a96978abaaa10cb46e3d6} 10export IMAGE_PEGLEG_CLI=${IMAGE_PEGLEG_CLI:-quay.io/airshipit/pegleg:50ce7a02e08a0a5277c2fbda96ece6eb5782407a}
11export IMAGE_SHIPYARD_CLI=${IMAGE_SHIPYARD_CLI:-quay.io/airshipit/shipyard:4dd6b484d11e86ad51da733841b9ef137421d461} 11export IMAGE_SHIPYARD_CLI=${IMAGE_SHIPYARD_CLI:-quay.io/airshipit/shipyard:4dd6b484d11e86ad51da733841b9ef137421d461}
12export IMAGE_COREDNS=${IMAGE_COREDNS:-docker.io/coredns/coredns:1.2.2} 12export IMAGE_COREDNS=${IMAGE_COREDNS:-docker.io/coredns/coredns:1.2.2}
13export IMAGE_DRYDOCK_CLI=${IMAGE_DRYDOCK_CLI:-quay.io/airshipit/drydock:d93d6d5a0a370ced536180612d1ade708e29cd47} 13export IMAGE_DRYDOCK_CLI=${IMAGE_DRYDOCK_CLI:-quay.io/airshipit/drydock:d93d6d5a0a370ced536180612d1ade708e29cd47}
diff --git a/tools/multi_nodes_gate/airship_gate/stages/pegleg-collect.sh b/tools/multi_nodes_gate/airship_gate/stages/pegleg-collect.sh
index c2358f4..cf49056 100755
--- a/tools/multi_nodes_gate/airship_gate/stages/pegleg-collect.sh
+++ b/tools/multi_nodes_gate/airship_gate/stages/pegleg-collect.sh
@@ -23,11 +23,27 @@ chmod 777 "${DEFINITION_DEPOT}"
23render_pegleg_cli() { 23render_pegleg_cli() {
24 cli_string="pegleg -v site" 24 cli_string="pegleg -v site"
25 25
26 if [[ "${GERRIT_SSH_USER}" ]]
27 then
28 cli_string+=" -u ${GERRIT_SSH_USER}"
29 fi
30
31 if [[ "${GERRIT_SSH_KEY}" ]]
32 then
33 cli_string+=" -k /workspace/${GERRIT_SSH_KEY}"
34 fi
35
26 primary_repo=$(config_pegleg_primary_repo) 36 primary_repo=$(config_pegleg_primary_repo)
27 37
28 if [[ -d "${REPO_ROOT}/${primary_repo}" ]] 38 if [[ -d "${REPO_ROOT}/${primary_repo}" ]]
29 then 39 then
30 cli_string="${cli_string} -p /workspace/${primary_repo}" 40 # NOTE: to get latest pegleg colllect to work
41 # airship-in-bottle repo has versions (v1.0demo, v1.0dev) within global
42 # and that is preventing pegleg to collect documents.
43 # It complains with duplicate data
44 $(find ${REPO_ROOT}/${primary_repo} -name "v1.0dev" -type d \
45 -exec rm -r {} +)
46 cli_string="${cli_string} -r /workspace/${primary_repo}"
31 else 47 else
32 log "${primary_repo} not a valid primary repository" 48 log "${primary_repo} not a valid primary repository"
33 return 1 49 return 1
@@ -39,7 +55,7 @@ render_pegleg_cli() {
39 then 55 then
40 for r in ${aux_repos[*]} 56 for r in ${aux_repos[*]}
41 do 57 do
42 cli_string="${cli_string} -a /workspace/${r}" 58 cli_string="${cli_string} -e ${r}=/workspace/${r}"
43 done 59 done
44 fi 60 fi
45 61
@@ -53,7 +69,7 @@ render_pegleg_cli() {
53collect_design_docs() { 69collect_design_docs() {
54 docker run \ 70 docker run \
55 --rm -t \ 71 --rm -t \
56 --network none \ 72 --network host \
57 -v "${REPO_ROOT}":/workspace \ 73 -v "${REPO_ROOT}":/workspace \
58 -v "${DEFINITION_DEPOT}":/collect \ 74 -v "${DEFINITION_DEPOT}":/collect \
59 "${IMAGE_PEGLEG_CLI}" \ 75 "${IMAGE_PEGLEG_CLI}" \