summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Laza <vlaza@cloudbasesolutions.com>2015-04-30 11:52:28 +0300
committerVictor Laza <vlaza@cloudbasesolutions.com>2015-04-30 12:05:02 +0300
commit7af46b37f938661ae1fcd7222b68dc5d199d0a13 (patch)
tree9e58f8be1795e7a5445f46aacd933faa9ebe4c41
parent1ef68114ccca7ff08b888772601c0d877565f152 (diff)
Include dynamic project variable in build-docu scripts
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>
-rw-r--r--jjb/opnfvdocs/docu-build.sh (renamed from jjb/opnfvdocs/build-upload-docu.sh)2
-rw-r--r--jjb/opnfvdocs/docu-verify.sh (renamed from jjb/opnfvdocs/build-docu-verify.sh)2
-rw-r--r--jjb/opnfvdocs/opnfvdocs.yml6
3 files changed, 5 insertions, 5 deletions
diff --git a/jjb/opnfvdocs/build-upload-docu.sh b/jjb/opnfvdocs/docu-build.sh
index 7b4321a04..499bdbe4b 100644
--- 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
index a6a1596f8..f337a7fae 100644
--- 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 37310a79c..39e33eb54 100644
--- 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