Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix problem caused by unset GS_PATHNAME in fuel jjb
[releng.git]
/
jjb
/
genesis
/
genesis-fuel.yml
diff --git
a/jjb/genesis/genesis-fuel.yml
b/jjb/genesis/genesis-fuel.yml
index
3d659f7
..
b6c0823
100644
(file)
--- a/
jjb/genesis/genesis-fuel.yml
+++ b/
jjb/genesis/genesis-fuel.yml
@@
-10,23
+10,29
@@
installer: 'fuel'
jobs:
installer: 'fuel'
jobs:
- - 'genesis-fuel-verify'
+ - 'genesis-fuel-verify
-{stream}
'
- 'genesis-fuel-merge'
- 'genesis-fuel-daily-{stream}'
- 'genesis-fuel-merge'
- 'genesis-fuel-daily-{stream}'
- - 'genesis-fuel-build'
- - 'genesis-fuel-deploy'
+ - 'genesis-fuel-build
-{stream}
'
+ - 'genesis-fuel-deploy
-{stream}
'
- 'genesis-fuel-deploy-virtual'
- 'genesis-fuel-deploy-virtual'
+ # stream: branch with - in place of / (eg. stable-arno)
+ # branch: branch (eg. stable/arno)
stream:
- master:
branch: 'master'
stream:
- master:
branch: 'master'
+ gs-pathname: ''
+ - stable-arno:
+ branch: 'stable/arno'
+ gs-pathname: 'arno'
########################
# job templates
########################
- job-template:
########################
# job templates
########################
- job-template:
- name: 'genesis-fuel-verify'
+ name: 'genesis-fuel-verify
-{stream}
'
project-type: freestyle
project-type: freestyle
@@
-49,9
+55,10
@@
- project-parameter:
project: '{project}'
- gerrit-parameter:
- project-parameter:
project: '{project}'
- gerrit-parameter:
- branch: '
master
'
+ branch: '
{branch}
'
- fuel-parameter:
installer: '{installer}'
- fuel-parameter:
installer: '{installer}'
+ gs-pathname: '{gs-pathname}'
scm:
- gerrit-trigger-scm:
scm:
- gerrit-trigger-scm:
@@
-80,7
+87,7
@@
project-pattern: 'genesis'
branches:
- branch-compare-type: 'ANT'
project-pattern: 'genesis'
branches:
- branch-compare-type: 'ANT'
- branch-pattern: '**/
master
'
+ branch-pattern: '**/
{branch}
'
file-paths:
- compare-type: ANT
pattern: 'common/**'
file-paths:
- compare-type: ANT
pattern: 'common/**'
@@
-118,6
+125,7
@@
branch: 'master'
- fuel-parameter:
installer: '{installer}'
branch: 'master'
- fuel-parameter:
installer: '{installer}'
+ gs-pathname: ''
scm:
- gerrit-trigger-scm:
scm:
- gerrit-trigger-scm:
@@
-165,6
+173,7
@@
project: '{project}'
- fuel-parameter:
installer: '{installer}'
project: '{project}'
- fuel-parameter:
installer: '{installer}'
+ gs-pathname: '{gs-pathname}'
scm:
- git-scm:
scm:
- git-scm:
@@
-172,9
+181,6
@@
refspec: ''
branch: master
refspec: ''
branch: master
- triggers:
- - timed: '@midnight'
-
logrotate:
daysToKeep: 30
numToKeep: 10
logrotate:
daysToKeep: 30
numToKeep: 10
@@
-183,15
+189,11
@@
builders:
- trigger-builds:
builders:
- trigger-builds:
- - project: 'genesis-fuel-build'
+ - project: 'genesis-fuel-build
-{stream}
'
git-revision: true
block: true
- trigger-builds:
git-revision: true
block: true
- trigger-builds:
- - project: 'genesis-fuel-deploy-virtual'
- git-revision: true
- block: false
- - trigger-builds:
- - project: 'genesis-fuel-deploy'
+ - project: 'genesis-fuel-deploy-{stream}'
git-revision: true
block: true
- trigger-builds:
git-revision: true
block: true
- trigger-builds:
@@
-199,7
+201,7
@@
block: true
- job-template:
block: true
- job-template:
- name: 'genesis-fuel-build'
+ name: 'genesis-fuel-build
-{stream}
'
project-type: freestyle
project-type: freestyle
@@
-216,6
+218,7
@@
project: '{project}'
- fuel-parameter:
installer: '{installer}'
project: '{project}'
- fuel-parameter:
installer: '{installer}'
+ gs-pathname: '{gs-pathname}'
scm:
- git-scm:
scm:
- git-scm:
@@
-229,7
+232,7
@@
- 'fuel-workspace-cleanup'
- job-template:
- 'fuel-workspace-cleanup'
- job-template:
- name: 'genesis-fuel-deploy'
+ name: 'genesis-fuel-deploy
-{stream}
'
project-type: freestyle
project-type: freestyle
@@
-242,6
+245,7
@@
project: '{project}'
- fuel-parameter:
installer: '{installer}'
project: '{project}'
- fuel-parameter:
installer: '{installer}'
+ gs-pathname: '{gs-pathname}'
- string:
name: GIT_BASE
default: ssh://gerrit.opnfv.org:29418/$PROJECT
- string:
name: GIT_BASE
default: ssh://gerrit.opnfv.org:29418/$PROJECT
@@
-268,7
+272,7
@@
project-type: freestyle
project-type: freestyle
- disabled:
fals
e
+ disabled:
tru
e
node: ericsson-build
node: ericsson-build
@@
-277,6
+281,7
@@
project: '{project}'
- fuel-parameter:
installer: '{installer}'
project: '{project}'
- fuel-parameter:
installer: '{installer}'
+ gs-pathname: ''
scm:
- git-scm:
scm:
- git-scm:
@@
-315,9
+320,13
@@
name: GIT_BASE
default: https://gerrit.opnfv.org/gerrit/$PROJECT
description: "Used for overriding the GIT URL coming from Global Jenkins configuration in case if the stuff is done on none-LF HW."
name: GIT_BASE
default: https://gerrit.opnfv.org/gerrit/$PROJECT
description: "Used for overriding the GIT URL coming from Global Jenkins configuration in case if the stuff is done on none-LF HW."
+ - string:
+ name: GS_PATHNAME
+ default: '{gs-pathname}'
+ description: "Subdirectory to store artifacts for different branches."
- string:
name: GS_URL
- string:
name: GS_URL
- default: artifacts.opnfv.org/$PROJECT/$INSTALLER
+ default: artifacts.opnfv.org/$PROJECT/$INSTALLER
/$GS_PATHNAME
description: "URL to Google Storage."
########################
description: "URL to Google Storage."
########################
@@
-373,9
+382,6
@@
set -o nounset
set -o pipefail
set -o nounset
set -o pipefail
- # remove the fuel master ssh key from $HOME/.ssh/known_hosts
- ssh-keygen -R 172.30.200.206
-
# source the file so we get OPNFV vars
source latest.properties
# source the file so we get OPNFV vars
source latest.properties
@@
-400,8
+406,8
@@
# start the deployment
echo "Issuing command"
# start the deployment
echo "Issuing command"
- echo "sudo TMPDIR=${TMPDIR} ${TOPDIR}/deploy/deploy.sh ${WORKSPACE}/opnfv.iso ${TOPDIR}/configs/lf_pod1/dea.yaml ${TOPDIR}/configs/lf_pod1/dha.yaml"
- sudo TMPDIR=${TMPDIR} ${TOPDIR}/deploy/deploy.sh ${WORKSPACE}/opnfv.iso ${TOPDIR}/configs/lf_pod1/dea.yaml ${TOPDIR}/configs/lf_pod1/dha.yaml
+ echo "sudo TMPDIR=${TMPDIR} ${TOPDIR}/deploy/deploy.sh ${WORKSPACE}/opnfv.iso ${TOPDIR}/configs/lf_pod1/dea
_no-ha
.yaml ${TOPDIR}/configs/lf_pod1/dha.yaml"
+ sudo TMPDIR=${TMPDIR} ${TOPDIR}/deploy/deploy.sh ${WORKSPACE}/opnfv.iso ${TOPDIR}/configs/lf_pod1/dea
_no-ha
.yaml ${TOPDIR}/configs/lf_pod1/dha.yaml
echo
echo "--------------------------------------------------------"
echo
echo "--------------------------------------------------------"
@@
-433,7
+439,6
@@
- shell: |
#!/bin/bash
set -o errexit
- shell: |
#!/bin/bash
set -o errexit
- set -o nounset
set -o pipefail
# log info to console
set -o pipefail
# log info to console
@@
-459,14
+464,8
@@
- shell: |
#!/bin/bash
set -o errexit
- shell: |
#!/bin/bash
set -o errexit
- set -o nounset
set -o pipefail
set -o pipefail
- # log info to console
- echo "Downloading the $INSTALLER artifact. This could take some time..."
- echo "--------------------------------------------------------"
- echo
-
# get the latest.properties file in order to get info regarding latest artifact
curl -s -o $WORKSPACE/latest.properties http://$GS_URL/latest.properties
# get the latest.properties file in order to get info regarding latest artifact
curl -s -o $WORKSPACE/latest.properties http://$GS_URL/latest.properties
@@
-476,6
+475,12
@@
# source the file so we get OPNFV vars
source latest.properties
# source the file so we get OPNFV vars
source latest.properties
+ # log info to console
+ echo "Downloading the $INSTALLER artifact using URL http://$OPNFV_ARTIFACT_URL"
+ echo "This could take some time..."
+ echo "--------------------------------------------------------"
+ echo
+
# download the file
curl -s -o $WORKSPACE/opnfv.iso http://$OPNFV_ARTIFACT_URL > gsutil.iso.log 2>&1
# download the file
curl -s -o $WORKSPACE/opnfv.iso http://$OPNFV_ARTIFACT_URL > gsutil.iso.log 2>&1