From 677b590f48dbea2788f5c090ed52fd3f7d1ee957 Mon Sep 17 00:00:00 2001 From: Fatih Degirmenci Date: Mon, 30 Nov 2015 16:00:06 +0100 Subject: Update ovsnfv jobs and execute build script Change-Id: I86aadc3fe727d510f07fbe5c136a3587493453ba Signed-off-by: Fatih Degirmenci --- jjb/ovsnfv/ovsnfv.yml | 61 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 36 insertions(+), 25 deletions(-) (limited to 'jjb') diff --git a/jjb/ovsnfv/ovsnfv.yml b/jjb/ovsnfv/ovsnfv.yml index 5cc4d6afd..1c5810a03 100644 --- a/jjb/ovsnfv/ovsnfv.yml +++ b/jjb/ovsnfv/ovsnfv.yml @@ -1,12 +1,10 @@ - project: name: ovsnfv jobs: - - 'ovsnfv-verify' - - 'ovsnfv-merge' + - 'ovsnfv-verify-{stream}' + - 'ovsnfv-merge-{stream}' - 'ovsnfv-daily-{stream}' - # stream: branch with - in place of / (eg. stable-arno) - # branch: branch (eg. stable/arno) stream: - master: branch: 'master' @@ -14,9 +12,9 @@ project: 'ovsnfv' - job-template: - name: 'ovsnfv-verify' + name: 'ovsnfv-verify-{stream}' - node: ericsson-build + node: opnfv-build project-type: freestyle @@ -62,17 +60,19 @@ branch-pattern: '**/master' builders: - - shell: - echo "Hello World" + - shell: | + #!/bin/bash + set -o errexit + set -o nounset + set -o pipefail -- job-template: - name: 'ovsnfv-merge' + cd $WORKSPACE/ci + ./build.sh - # builder-merge job to run JJB update - # - # This job's purpose is to update all the JJB +- job-template: + name: 'ovsnfv-merge-{stream}' - node: master + node: opnfv-build project-type: freestyle @@ -112,19 +112,20 @@ branch-pattern: '**/master' builders: - - shell: - echo "Hello World" + - shell: | + #!/bin/bash + set -o errexit + set -o nounset + set -o pipefail + + cd $WORKSPACE/ci + ./build.sh - job-template: name: 'ovsnfv-daily-{stream}' - # Job template for daily builders - # - # Required Variables: - # stream: branch with - in place of / (eg. stable) - # branch: branch (eg. stable) - node: master + node: opnfv-build disabled: true @@ -139,6 +140,10 @@ parameters: - project-parameter: project: '{project}' + - string: + 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." scm: - git-scm: @@ -147,8 +152,14 @@ branch: '{branch}' triggers: - - timed: 'H H * * *' + - timed: '@midnight' builders: - - shell: - echo "Hello World" + - shell: | + #!/bin/bash + set -o errexit + set -o nounset + set -o pipefail + + cd $WORKSPACE/ci + ./build.sh -- cgit 1.2.3-korg