From 0cbd554e24d18a54e8867c3614614f83631fe2c6 Mon Sep 17 00:00:00 2001 From: Fatih Degirmenci Date: Thu, 26 Mar 2015 22:38:52 +0100 Subject: [PATCH] Fix GIT_BASE for genesis and move vswitchperf to fuel node JIRA: OCTO-11 Change-Id: I96ab8259966a42be41c7192e768b88fbec8f90ba Signed-off-by: Fatih Degirmenci --- jjb/genesis/genesis.yml | 13 ++++++++++--- 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' @@ -159,6 +163,9 @@ name: INSTALLER default: '{installer}' description: "Installer to use." + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/genesis - string: name: GERRIT_BRANCH default: origin/master @@ -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 -- 2.16.6