summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--jjb/functest/docu-build.sh (renamed from jjb/octopus/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.yml8
-rw-r--r--jjb/genesis/docu-build.sh (renamed from jjb/genesis/build-upload-docu.sh)2
-rw-r--r--jjb/genesis/docu-verify.sh (renamed from jjb/genesis/build-docu-verify.sh)2
-rw-r--r--jjb/genesis/genesis-docs.yml4
-rw-r--r--jjb/octopus/docu-build.sh (renamed from jjb/functest/build-upload-docu.sh)7
-rw-r--r--jjb/octopus/docu-verify.sh (renamed from jjb/octopus/build-docu-verify.sh)2
-rw-r--r--jjb/octopus/octopus.yml6
-rw-r--r--jjb/pharos/docu-build.sh (renamed from jjb/pharos/build-upload-docu.sh)7
-rw-r--r--jjb/pharos/docu-verify.sh (renamed from jjb/pharos/build-docu-verify.sh)2
-rw-r--r--jjb/pharos/pharos.yml6
12 files changed, 26 insertions, 29 deletions
diff --git a/jjb/octopus/build-upload-docu.sh b/jjb/functest/docu-build.sh
index fdd1463d7..499bdbe4b 100644
--- a/jjb/octopus/build-upload-docu.sh
+++ b/jjb/functest/docu-build.sh
@@ -2,7 +2,7 @@
set -e
set -o pipefail
-project="octopus"
+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
diff --git a/jjb/genesis/build-upload-docu.sh b/jjb/genesis/docu-build.sh
index 2a6bbf725..bf69c0c75 100644
--- a/jjb/genesis/build-upload-docu.sh
+++ b/jjb/genesis/docu-build.sh
@@ -2,7 +2,7 @@
set -e
set -o pipefail
-project="genesis"
+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/genesis/build-docu-verify.sh b/jjb/genesis/docu-verify.sh
index 06b374e16..1f0c39564 100644
--- a/jjb/genesis/build-docu-verify.sh
+++ b/jjb/genesis/docu-verify.sh
@@ -2,7 +2,7 @@
set -e
set -o pipefail
-project="genesis"
+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/genesis/genesis-docs.yml b/jjb/genesis/genesis-docs.yml
index 21c16f7ad..0b6379831 100644
--- a/jjb/genesis/genesis-docs.yml
+++ b/jjb/genesis/genesis-docs.yml
@@ -62,7 +62,7 @@
builders:
- shell:
- !include-raw build-upload-docu.sh
+ !include-raw docu-build.sh
- job-template:
name: 'genesis-verify-docs'
@@ -115,5 +115,5 @@
builders:
- shell:
- !include-raw build-docu-verify.sh
+ !include-raw docu-verify.sh
diff --git a/jjb/functest/build-upload-docu.sh b/jjb/octopus/docu-build.sh
index ee45d68a3..499bdbe4b 100644
--- a/jjb/functest/build-upload-docu.sh
+++ b/jjb/octopus/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/octopus/build-docu-verify.sh b/jjb/octopus/docu-verify.sh
index 9c288fa12..f337a7fae 100644
--- a/jjb/octopus/build-docu-verify.sh
+++ b/jjb/octopus/docu-verify.sh
@@ -2,7 +2,7 @@
set -e
set -o pipefail
-project="octopus"
+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/octopus/octopus.yml b/jjb/octopus/octopus.yml
index c72292c8f..459ba7a01 100644
--- a/jjb/octopus/octopus.yml
+++ b/jjb/octopus/octopus.yml
@@ -74,7 +74,7 @@
builders:
- shell:
- !include-raw build-upload-docu.sh
+ !include-raw docu-build.sh
postbuilders:
- test-macro
@@ -128,7 +128,7 @@
builders:
- shell:
- !include-raw build-docu-verify.sh
+ !include-raw docu-verify.sh
- job-template:
name: 'octopus-merge'
@@ -176,5 +176,5 @@
builders:
- shell:
- !include-raw build-upload-docu.sh
+ !include-raw docu-build.sh
diff --git a/jjb/pharos/build-upload-docu.sh b/jjb/pharos/docu-build.sh
index 50191e517..499bdbe4b 100644
--- a/jjb/pharos/build-upload-docu.sh
+++ b/jjb/pharos/docu-build.sh
@@ -2,7 +2,7 @@
set -e
set -o pipefail
-project="pharos"
+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/pharos/build-docu-verify.sh b/jjb/pharos/docu-verify.sh
index 50d387079..f337a7fae 100644
--- a/jjb/pharos/build-docu-verify.sh
+++ b/jjb/pharos/docu-verify.sh
@@ -2,7 +2,7 @@
set -e
set -o pipefail
-project="pharos"
+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/pharos/pharos.yml b/jjb/pharos/pharos.yml
index 8b5a01251..89f6a392a 100644
--- a/jjb/pharos/pharos.yml
+++ b/jjb/pharos/pharos.yml
@@ -72,7 +72,7 @@
builders:
- shell:
- !include-raw build-upload-docu.sh
+ !include-raw docu-build.sh
postbuilders:
- test-macro
@@ -126,7 +126,7 @@
builders:
- shell:
- !include-raw build-docu-verify.sh
+ !include-raw docu-verify.sh
- job-template:
name: 'pharos-merge'
@@ -176,5 +176,5 @@
builders:
- shell:
- !include-raw build-upload-docu.sh
+ !include-raw docu-build.sh