Code Review / releng.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 1ef6811)
Include dynamic project variable in build-docu scripts 44/444/5
authorVictor Laza <vlaza@cloudbasesolutions.com>
Thu, 30 Apr 2015 08:52:28 +0000 (11:52 +0300)
committerVictor Laza <vlaza@cloudbasesolutions.com>
Thu, 30 Apr 2015 09:05:02 +0000 (12:05 +0300)
JIRA: DOCS-24 - Include dynamic project variable in build-docu scripts
as oposite to hard-coded value how it's now set; shortened script
names for better visibility

Change-Id: Ib55d3c985f1cd27fd834d728659b9273b46773e4
Signed-off-by: Victor Laza <vlaza@cloudbasesolutions.com>
jjb/opnfvdocs/docu-build.sh [moved from jjb/opnfvdocs/build-upload-docu.sh with 94% similarity] patch | blob | history
jjb/opnfvdocs/docu-verify.sh [moved from jjb/opnfvdocs/build-docu-verify.sh with 84% similarity] patch | blob | history
jjb/opnfvdocs/opnfvdocs.yml patch | blob | history

diff --git a/jjb/opnfvdocs/build-upload-docu.sh b/jjb/opnfvdocs/docu-build.sh
similarity index 94%
rename from jjb/opnfvdocs/build-upload-docu.sh
rename to jjb/opnfvdocs/docu-build.sh
index 7b4321a..499bdbe 100644 (file)
--- a/jjb/opnfvdocs/build-upload-docu.sh
+++ b/jjb/opnfvdocs/docu-build.sh
@@ -2,7 +2,7 @@
 set -e
 set -o pipefail
 
-project="opnfvdocs"
+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/opnfvdocs/build-docu-verify.sh b/jjb/opnfvdocs/docu-verify.sh
similarity index 84%
rename from jjb/opnfvdocs/build-docu-verify.sh
rename to jjb/opnfvdocs/docu-verify.sh
index a6a1596..f337a7f 100644 (file)
--- a/jjb/opnfvdocs/build-docu-verify.sh
+++ b/jjb/opnfvdocs/docu-verify.sh
@@ -2,7 +2,7 @@
 set -e
 set -o pipefail
 
-project="opnfvdocs"
+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/opnfvdocs/opnfvdocs.yml b/jjb/opnfvdocs/opnfvdocs.yml
index 37310a7..39e33eb 100644 (file)
--- a/jjb/opnfvdocs/opnfvdocs.yml
+++ b/jjb/opnfvdocs/opnfvdocs.yml
@@ -51,7 +51,7 @@
 
     builders:
         - shell:
-            !include-raw build-upload-docu.sh
+            !include-raw docu-build.sh
 
 - job-template:
     name: 'opnfvdocs-verify'
@@ -102,7 +102,7 @@
 
     builders:
         - shell:
-            !include-raw build-docu-verify.sh
+            !include-raw docu-verify.sh
 
 - job-template:
     name: 'opnfvdocs-merge'
@@ -152,5 +152,5 @@
 
     builders:
         - shell:
-            !include-raw build-upload-docu.sh
+            !include-raw docu-build.sh