Browse Source

Merge "[pegleg] - Used the latest pegleg verion."

changes/33/631133/2
Zuul 2 months ago
parent
commit
919b447886

+ 1
- 1
tools/multi_nodes_gate/airship_gate/lib/config.sh View File

@@ -7,7 +7,7 @@ export BUILD_WORK_DIR=${BUILD_WORK_DIR:-/work}
7 7
 export BASE_IMAGE_SIZE=${BASE_IMAGE_SIZE:-68719476736}
8 8
 export BASE_IMAGE_URL=${BASE_IMAGE_URL:-https://cloud-images.ubuntu.com/releases/xenial/release/ubuntu-16.04-server-cloudimg-amd64-disk1.img}
9 9
 export IMAGE_PROMENADE_CLI=${IMAGE_PROMENADE_CLI:-quay.io/airshipit/promenade:cfb8aa498c294c2adbc369ba5aaee19b49550d22}
10
-export IMAGE_PEGLEG_CLI=${IMAGE_PEGLEG_CLI:-quay.io/airshipit/pegleg:ac6297eae6c51ab2f13a96978abaaa10cb46e3d6}
10
+export IMAGE_PEGLEG_CLI=${IMAGE_PEGLEG_CLI:-quay.io/airshipit/pegleg:50ce7a02e08a0a5277c2fbda96ece6eb5782407a}
11 11
 export IMAGE_SHIPYARD_CLI=${IMAGE_SHIPYARD_CLI:-quay.io/airshipit/shipyard:4dd6b484d11e86ad51da733841b9ef137421d461}
12 12
 export IMAGE_COREDNS=${IMAGE_COREDNS:-docker.io/coredns/coredns:1.2.2}
13 13
 export IMAGE_DRYDOCK_CLI=${IMAGE_DRYDOCK_CLI:-quay.io/airshipit/drydock:d93d6d5a0a370ced536180612d1ade708e29cd47}

+ 19
- 3
tools/multi_nodes_gate/airship_gate/stages/pegleg-collect.sh View File

@@ -23,11 +23,27 @@ chmod 777 "${DEFINITION_DEPOT}"
23 23
 render_pegleg_cli() {
24 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 36
     primary_repo=$(config_pegleg_primary_repo)
27 37
 
28 38
     if [[ -d "${REPO_ROOT}/${primary_repo}" ]]
29 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 47
     else
32 48
       log "${primary_repo} not a valid primary repository"
33 49
       return 1
@@ -39,7 +55,7 @@ render_pegleg_cli() {
39 55
     then
40 56
         for r in ${aux_repos[*]}
41 57
         do
42
-          cli_string="${cli_string} -a /workspace/${r}"
58
+          cli_string="${cli_string} -e ${r}=/workspace/${r}"
43 59
         done
44 60
     fi
45 61
 
@@ -53,7 +69,7 @@ render_pegleg_cli() {
53 69
 collect_design_docs() {
54 70
   docker run \
55 71
     --rm -t \
56
-    --network none \
72
+    --network host \
57 73
     -v "${REPO_ROOT}":/workspace \
58 74
     -v "${DEFINITION_DEPOT}":/collect \
59 75
     "${IMAGE_PEGLEG_CLI}" \

Loading…
Cancel
Save