summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2015-03-04 22:02:05 +0100
committerFatih Degirmenci <fatih.degirmenci@ericsson.com>2015-03-05 09:41:24 +0100
commit31c8051f1a0d5ce2a5b8498fff8b9ebfe2ecc354 (patch)
tree26da8babc5c685f98f3c296fea433ab18d5e4a2b
parent156b38785c366beee5ef84c57e2fa1de404c3464 (diff)
Replace git-revision with predefined parameters
JJB does not support passing git-revision to triggered jobs. Replaced it with GIT_COMMIT. Change-Id: I2675a88c8bde19ccad2bc00ef43b315ca9cfd32b Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
-rw-r--r--jjb/genesis/.availability.yml.swpbin12288 -> 0 bytes
-rw-r--r--jjb/genesis/genesis.yml66
2 files changed, 41 insertions, 25 deletions
diff --git a/jjb/genesis/.availability.yml.swp b/jjb/genesis/.availability.yml.swp
deleted file mode 100644
index 7ca652091..000000000
--- a/jjb/genesis/.availability.yml.swp
+++ /dev/null
Binary files differ
diff --git a/jjb/genesis/genesis.yml b/jjb/genesis/genesis.yml
index 6efac1bdc..fba423197 100644
--- a/jjb/genesis/genesis.yml
+++ b/jjb/genesis/genesis.yml
@@ -4,9 +4,9 @@
- 'genesis-daily-master'
- 'genesis-merge'
- 'genesis-verify'
- - 'genesis-foreman-daily'
- - 'genesis-fuel-daily'
- - 'genesis-opensteak-daily'
+ - 'genesis-foreman-daily-master'
+ - 'genesis-fuel-daily-master'
+ - 'genesis-opensteak-daily-master'
- 'genesis-build'
- 'genesis-deploy'
- 'genesis-test'
@@ -190,7 +190,7 @@
make all
- job-template:
- name: genesis-foreman-daily
+ name: genesis-foreman-daily-master
project-type: freestyle
@@ -233,27 +233,27 @@
- trigger-builds:
- project: genesis-build
current-parameters: true
- git-revision: true
+ predefined-parameters: GERRIT_BRANCH=$GIT_COMMIT
same-node: true
block: true
- project: genesis-deploy
current-parameters: true
- git-revision: true
+ predefined-parameters: GERRIT_BRANCH=$GIT_COMMIT
same-node: true
block: true
- project: genesis-test
current-parameters: true
- git-revision: true
+ predefined-parameters: GERRIT_BRANCH=$GIT_COMMIT
same-node: true
block: true
- job-template:
- name: genesis-fuel-daily
+ name: genesis-fuel-daily-master
project-type: freestyle
- disabled: true
+ disabled: false
- node: foreman
+ node: fuel
parameters:
- string:
@@ -290,21 +290,21 @@
- trigger-builds:
- project: genesis-build
current-parameters: true
- git-revision: true
- same-node: true
+ predefined-parameters: GERRIT_BRANCH=$GIT_COMMIT
+ same-node: false
block: true
- project: genesis-deploy
current-parameters: true
- git-revision: true
- same-node: true
+ predefined-parameters: GERRIT_BRANCH=$GIT_COMMIT
+ same-node: false
block: true
- project: genesis-test
current-parameters: true
- git-revision: true
- same-node: true
+ predefined-parameters: GERRIT_BRANCH=$GIT_COMMIT
+ same-node: false
block: true
- job-template:
- name: genesis-opensteak-daily
+ name: genesis-opensteak-daily-master
project-type: freestyle
@@ -347,26 +347,28 @@
- trigger-builds:
- project: genesis-build
current-parameters: true
- git-revision: true
+ predefined-parameters: GERRIT_BRANCH=$GIT_COMMIT
same-node: true
block: true
- project: genesis-deploy
current-parameters: true
- git-revision: true
+ predefined-parameters: GERRIT_BRANCH=$GIT_COMMIT
same-node: true
block: true
- project: genesis-test
current-parameters: true
- git-revision: true
+ predefined-parameters: GERRIT_BRANCH=$GIT_COMMIT
same-node: true
block: true
- job-template:
name: genesis-build
+ node: ericsson-build
+
project-type: freestyle
- disabled: true
+ disabled: false
logrotate:
daysToKeep: 30
@@ -403,15 +405,27 @@
set -o nounset
set -o pipefail
- echo cd $WORKSPACE/$INSTALLER/ci
- echo ./build.sh
+ hostname
+ whoami
+ docker --version
+ cd $WORKSPACE/fuel-build/docker
+ pwd
+ echo foo
+ make clean || true
+ make
+ cd ..
+ echo foo
+ make clean || true
+ make all
- job-template:
name: genesis-deploy
+ node: ericsson-build
+
project-type: freestyle
- disabled: true
+ disabled: false
logrotate:
daysToKeep: 30
@@ -454,9 +468,11 @@
- job-template:
name: genesis-test
+ node: ericsson-build
+
project-type: freestyle
- disabled: true
+ disabled: false
logrotate:
daysToKeep: 30