diff options
| author |   Victor Laza <vlaza@cloudbasesolutions.com> | 2015-05-04 10:14:18 +0300 |
|---|---|---|
| committer | Victor Laza <vlaza@cloudbasesolutions.com> | 2015-05-04 10:17:34 +0300 |
| commit | 8b12756b2e200a830898b6e73e49969f4adca658 (patch) | |
| tree | 9c22b4c8da509abe063ec962b11a95d5941b36bf /jjb/functest | |
| parent | 1e2ad344685a6f07ecc29329ecee2e2aca4fd9c1 (diff) | |
Extend dynamic project variable in docu-build scripts
JIRA: DOCS-26 - Extend dynamic project variable in docu-build scripts
for functest, octopus, genesis & pharos
Change-Id: I2bb699e7060754527fae4d7abe5b8fbf46c0a7dd
Signed-off-by: Victor Laza <vlaza@cloudbasesolutions.com>
Diffstat (limited to 'jjb/functest')
| -rw-r--r-- | jjb/functest/docu-build.sh (renamed from jjb/functest/build-upload-docu.sh) | 7 | ||||
| -rw-r--r-- | jjb/functest/docu-verify.sh (renamed from jjb/functest/build-docu-verify.sh) | 2 | ||||
| -rw-r--r-- | jjb/functest/functest.yml | 8 |
3 files changed, 8 insertions, 9 deletions
diff --git a/jjb/functest/build-upload-docu.sh b/jjb/functest/docu-build.sh index ee45d68a3..499bdbe4b 100644 --- a/jjb/functest/build-upload-docu.sh +++ b/jjb/functest/docu-build.sh @@ -2,7 +2,7 @@ set -e set -o pipefail -project="functest" +project="$(git remote -v | head -n1 | awk '{{print $2}}' | sed -e 's,.*:\(.*/\)\?,,' -e 's/\.git$//')" export PATH=$PATH:/usr/local/bin/ git_sha1="$(git rev-parse HEAD)" @@ -50,8 +50,8 @@ done < <(find * -type f \( -iname \*.jpg -o -iname \*.png \) -print0) for img in "${{images[@]}}"; do - # uploading found images - echo "uploading $img" + # uploading found images + echo "uploading $img" cat "$img" | gsutil cp -L gsoutput.txt - \ gs://artifacts.opnfv.org/"$project"/"$img" gsutil setmeta -h "Content-Type:image/jpeg" \ @@ -61,4 +61,3 @@ for img in "${{images[@]}}"; do rm -f gsoutput.txt done - diff --git a/jjb/functest/build-docu-verify.sh b/jjb/functest/docu-verify.sh index c692226dd..f337a7fae 100644 --- a/jjb/functest/build-docu-verify.sh +++ b/jjb/functest/docu-verify.sh @@ -2,7 +2,7 @@ set -e set -o pipefail -project="functest" +project="$(git remote -v | head -n1 | awk '{{print $2}}' | sed -e 's,.*:\(.*/\)\?,,' -e 's/\.git$//')" export PATH=$PATH:/usr/local/bin/ git_sha1="$(git rev-parse HEAD)" diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml index a4466f8a5..211af0c42 100644 --- a/jjb/functest/functest.yml +++ b/jjb/functest/functest.yml @@ -148,7 +148,7 @@ builders: - shell: - !include-raw build-upload-docu.sh + !include-raw docu-build.sh postbuilders: - test-macro @@ -202,7 +202,7 @@ builders: - shell: - !include-raw build-docu-verify.sh + !include-raw docu-verify.sh - job-template: name: 'functest-merge' @@ -251,6 +251,6 @@ branch-pattern: '**/master' builders: - - shell: - !include-raw build-upload-docu.sh + - shell: + !include-raw docu-build.sh |