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 WORKSPACE typo
[releng.git]
/
jjb
/
genesis
/
genesis-fuel.yml
diff --git
a/jjb/genesis/genesis-fuel.yml
b/jjb/genesis/genesis-fuel.yml
index
d482ee7
..
9f00e5d
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-deploy-virtual'
+ - 'genesis-fuel-build
-{stream}
'
+ - 'genesis-fuel-deploy
-{stream}
'
+ - 'genesis-fuel-deploy-virtual
-master
'
+ # 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/**'
@@
-89,7
+96,6
@@
builders:
- 'fuel-build'
builders:
- 'fuel-build'
- - 'fuel-workspace-cleanup'
- job-template:
name: 'genesis-fuel-merge'
- job-template:
name: 'genesis-fuel-merge'
@@
-118,6
+124,7
@@
branch: 'master'
- fuel-parameter:
installer: '{installer}'
branch: 'master'
- fuel-parameter:
installer: '{installer}'
+ gs-pathname: ''
scm:
- gerrit-trigger-scm:
scm:
- gerrit-trigger-scm:
@@
-149,7
+156,6
@@
builders:
- 'fuel-build'
builders:
- 'fuel-build'
- - 'fuel-workspace-cleanup'
- job-template:
name: 'genesis-fuel-daily-{stream}'
- job-template:
name: 'genesis-fuel-daily-{stream}'
@@
-160,20
+166,21
@@
disabled: false
disabled: false
+ triggers:
+ - 'fuel-{stream}'
+
parameters:
- project-parameter:
project: '{project}'
- fuel-parameter:
installer: '{installer}'
parameters:
- project-parameter:
project: '{project}'
- fuel-parameter:
installer: '{installer}'
+ gs-pathname: '{gs-pathname}'
scm:
- git-scm:
credentials-id: '{ssh-credentials}'
refspec: ''
scm:
- git-scm:
credentials-id: '{ssh-credentials}'
refspec: ''
- branch: master
-
- triggers:
- - timed: 'H */6 * * *'
+ branch: '{branch}'
logrotate:
daysToKeep: 30
logrotate:
daysToKeep: 30
@@
-183,23
+190,22
@@
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:
- project: 'functest-opnfv-jump-1'
block: true
git-revision: true
block: true
- trigger-builds:
- project: 'functest-opnfv-jump-1'
block: true
+ - trigger-builds:
+ - project: 'yardstick-opnfv-jump-1'
+ block: true
- job-template:
- job-template:
- name: 'genesis-fuel-build'
+ name: 'genesis-fuel-build
-{stream}
'
project-type: freestyle
project-type: freestyle
@@
-216,20
+222,20
@@
project: '{project}'
- fuel-parameter:
installer: '{installer}'
project: '{project}'
- fuel-parameter:
installer: '{installer}'
+ gs-pathname: '{gs-pathname}'
scm:
- git-scm:
credentials-id: '{ssh-credentials}'
refspec: ''
scm:
- git-scm:
credentials-id: '{ssh-credentials}'
refspec: ''
- branch:
master
+ branch:
'{branch}'
builders:
- 'fuel-build'
- 'fuel-upload-artifact'
builders:
- 'fuel-build'
- 'fuel-upload-artifact'
- - 'fuel-workspace-cleanup'
- job-template:
- job-template:
- name: 'genesis-fuel-deploy'
+ name: 'genesis-fuel-deploy
-{stream}
'
project-type: freestyle
project-type: freestyle
@@
-242,6
+248,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
@@
-251,7
+258,7
@@
- git-scm:
credentials-id: '{ssh-credentials}'
refspec: ''
- git-scm:
credentials-id: '{ssh-credentials}'
refspec: ''
- branch:
master
+ branch:
'{branch}'
logrotate:
daysToKeep: 30
logrotate:
daysToKeep: 30
@@
-264,7
+271,7
@@
- 'fuel-deploy'
- job-template:
- 'fuel-deploy'
- job-template:
- name: 'genesis-fuel-deploy-virtual'
+ name: 'genesis-fuel-deploy-virtual
-master
'
project-type: freestyle
project-type: freestyle
@@
-277,6
+284,7
@@
project: '{project}'
- fuel-parameter:
installer: '{installer}'
project: '{project}'
- fuel-parameter:
installer: '{installer}'
+ gs-pathname: ''
scm:
- git-scm:
scm:
- git-scm:
@@
-317,7
+325,7
@@
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_URL
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_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."
########################
@@
-449,6
+457,7
@@
echo
echo "--------------------------------------------------------"
echo "Done!"
echo
echo "--------------------------------------------------------"
echo "Done!"
+ echo "Artifact is available as http://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.iso"
- builder:
name: 'fuel-download-artifact'
- builder:
name: 'fuel-download-artifact'
@@
-459,11
+468,6
@@
set -o nounset
set -o pipefail
set -o nounset
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
@@
-473,6
+477,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
@@
-494,3
+504,16
@@
# delete everything that is in $WORKSPACE
/bin/rm -rf $WORKSPACE
# delete everything that is in $WORKSPACE
/bin/rm -rf $WORKSPACE
+
+########################
+# trigger macros
+########################
+- trigger:
+ name: 'fuel-master'
+ triggers:
+ - pollscm: '0 21 * * *'
+
+- trigger:
+ name: 'fuel-stable-arno'
+ triggers:
+ - pollscm: '0 3 * * *'