diff options
| author |   Fatih Degirmenci <fatih.degirmenci@ericsson.com> | 2015-03-26 22:38:52 +0100 |
|---|---|---|
| committer | Fatih Degirmenci <fatih.degirmenci@ericsson.com> | 2015-03-26 22:41:05 +0100 |
| commit | 0cbd554e24d18a54e8867c3614614f83631fe2c6 (patch) | |
| tree | b1af842a908afefead4c3afd2eacc4918af7b378 | |
| parent | 65df29ce15dca349afc9289fb5b726d1b3515e82 (diff) | |
Fix GIT_BASE for genesis and move vswitchperf to fuel node
JIRA: OCTO-11
Change-Id: I96ab8259966a42be41c7192e768b88fbec8f90ba
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
| -rw-r--r-- | jjb/genesis/genesis.yml | 13 | ||||
| -rw-r--r-- | jjb/vswitchperf/vswitchperf.yml | 2 |
2 files changed, 11 insertions, 4 deletions
diff --git a/jjb/genesis/genesis.yml b/jjb/genesis/genesis.yml index df826a09d..843d4b32d 100644 --- a/jjb/genesis/genesis.yml +++ b/jjb/genesis/genesis.yml @@ -40,6 +40,9 @@ - string: name: BUILD_DIRECTORY default: $WORKSPACE/build_output + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/genesis - project-parameter: project: '{project}' - gerrit-parameter: @@ -48,7 +51,6 @@ scm: - gerrit-trigger-scm: credentials-id: '{ssh-credentials}' - url: https://gerrit.opnfv.org/gerrit/genesis refspec: '$GERRIT_REFSPEC' choosing-strategy: 'gerrit' @@ -105,6 +107,9 @@ - string: name: BUILD_DIRECTORY default: $WORKSPACE/build_output + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/genesis - project-parameter: project: '{project}' - gerrit-parameter: @@ -113,7 +118,6 @@ scm: - gerrit-trigger-scm: credentials-id: '{ssh-credentials}' - url: https://gerrit.opnfv.org/gerrit/genesis refspec: '' choosing-strategy: 'default' @@ -160,6 +164,9 @@ default: '{installer}' description: "Installer to use." - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/genesis + - string: name: GERRIT_BRANCH default: origin/master description: "Branch to build, deploy and test." @@ -171,7 +178,7 @@ scm: - git: skip-tag: true - url: https://gerrit.opnfv.org/gerrit/genesis + url: $GIT_BASE branches: - $GERRIT_BRANCH refspec: $GERRIT_REFSPEC diff --git a/jjb/vswitchperf/vswitchperf.yml b/jjb/vswitchperf/vswitchperf.yml index 0293038bb..16d164736 100644 --- a/jjb/vswitchperf/vswitchperf.yml +++ b/jjb/vswitchperf/vswitchperf.yml @@ -84,7 +84,7 @@ name: 'vswitchperf-verify' project-type: freestyle - node: ericsson-build + node: fuel logrotate: daysToKeep: 30 |