summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
Diffstat (limited to 'jjb')
-rw-r--r--jjb/ci-management/ci-management-jobs.yaml2
-rw-r--r--jjb/global-defaults.yaml2
-rw-r--r--jjb/global-macros.yaml13
-rw-r--r--jjb/honeycomb/honeycomb.yaml7
-rw-r--r--jjb/nsh_sfc/include-raw-nsh_sfc-pkg-push.sh10
-rw-r--r--jjb/nsh_sfc/nsh_sfc.yaml95
-rw-r--r--jjb/scripts/create_maven_env.sh3
7 files changed, 124 insertions, 8 deletions
diff --git a/jjb/ci-management/ci-management-jobs.yaml b/jjb/ci-management/ci-management-jobs.yaml
index 30990e802..585d60893 100644
--- a/jjb/ci-management/ci-management-jobs.yaml
+++ b/jjb/ci-management/ci-management-jobs.yaml
@@ -68,7 +68,7 @@
scm:
- gerrit-trigger-scm:
credentials-id: '{ssh-credentials}'
- refspec: '$GERRIT_REFSPEC'
+ refspec: refs/heads/master
choosing-strategy: 'gerrit'
wrappers:
diff --git a/jjb/global-defaults.yaml b/jjb/global-defaults.yaml
index bf14ab53d..192163d76 100644
--- a/jjb/global-defaults.yaml
+++ b/jjb/global-defaults.yaml
@@ -7,6 +7,8 @@
build-num-to-keep: 40
build-artifact-days-to-keep: -1
build-artifact-num-to-keep: 5
+ # Timeout in minutes
+ build-timeout: 360
ssh-credentials: 'jenkins-gerrit-credentials'
diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index d032bcc96..ec44e9a3e 100644
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -102,6 +102,19 @@
timeout: 360
fail: true
+- wrapper:
+ # This wrapper is required for all jobs as it configures the wrappers
+ # needed by the fd.io infra.
+ name: fdio-infra-wrappers
+ wrappers:
+ - timeout:
+ type: absolute
+ timeout: '{build-timeout}'
+ timeout-var: 'BUILD_TIMEOUT'
+ fail: true
+ - jclouds:
+ single-use: True
+
###### TRIGGERS
- trigger:
name: gerrit-trigger-patch-submitted
diff --git a/jjb/honeycomb/honeycomb.yaml b/jjb/honeycomb/honeycomb.yaml
index fb3416d3a..55f068141 100644
--- a/jjb/honeycomb/honeycomb.yaml
+++ b/jjb/honeycomb/honeycomb.yaml
@@ -210,6 +210,7 @@
publishers:
- sonar:
language: 'java'
+ branch: '{stream}'
- email-notification:
email-prefix: '[honeycomb]'
@@ -248,7 +249,7 @@
triggers:
- reverse:
- jobs: 'vpp-merge-{branch}-{os},honeycomb-merge-{branch}-{os}'
+ jobs: 'vpp-merge-{stream}-{os},honeycomb-merge-{stream}-{os}'
result: 'success'
prebuilders:
@@ -258,7 +259,7 @@
maven:
maven-name: '{mvn33}'
root-pom: 'pom.xml'
- goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dmerge -Dkaraf.keep.unpack=true -Dsonar'
+ goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dmerge -Dkaraf.keep.unpack=true'
maven-opts: '-Xmx2048m -Dmaven.compile.fork=true'
settings: 'honeycomb-settings'
settings-type: cfp
@@ -287,8 +288,6 @@
- findbugs
publishers:
- - sonar:
- language: 'java'
- email-notification:
email-prefix: '[honeycomb]'
- maven-deploy:
diff --git a/jjb/nsh_sfc/include-raw-nsh_sfc-pkg-push.sh b/jjb/nsh_sfc/include-raw-nsh_sfc-pkg-push.sh
new file mode 100644
index 000000000..bf9d53d40
--- /dev/null
+++ b/jjb/nsh_sfc/include-raw-nsh_sfc-pkg-push.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+# basic build script example
+set -e -o pipefail
+
+if [ "${{OS}}" == "ubuntu1404" ]; then
+ cd nsh-plugin/build/java/jvpp
+ $MVN deploy \
+ -gs $GLOBAL_SETTINGS_FILE -s $SETTINGS_FILE
+ cd -
+fi \ No newline at end of file
diff --git a/jjb/nsh_sfc/nsh_sfc.yaml b/jjb/nsh_sfc/nsh_sfc.yaml
index ab8265bdc..53558a05f 100644
--- a/jjb/nsh_sfc/nsh_sfc.yaml
+++ b/jjb/nsh_sfc/nsh_sfc.yaml
@@ -3,6 +3,7 @@
jobs:
- 'nsh_sfc-verify-{stream}-{os}'
- 'nsh_sfc-merge-{stream}-{os}'
+ - 'nsh_sfc-integration-{stream}-{os}'
- 'nsh_sfc-verify-image-{stream}-{os}'
project: 'nsh_sfc'
@@ -61,10 +62,20 @@
- maven-target:
maven-version: '{mvn33}'
goals: '--version'
- settings: 'vpp-settings'
+ settings: 'nsh_sfc-settings'
settings-type: cfp
global-settings: 'global-settings'
global-settings-type: cfp
+ - config-file-provider:
+ files:
+ - file-id: 'nsh_sfc-settings'
+ variable: 'SETTINGS_FILE'
+ - file-id: 'global-settings'
+ variable: 'GLOBAL_SETTINGS_FILE'
+ - shell:
+ !include-raw-escape: ../scripts/create_maven_env.sh
+ - inject:
+ properties-file: maven_env.txt
- shell:
!include-raw-escape:
- ../scripts/cleanup_vpp_plugin_dev_env.sh
@@ -128,10 +139,20 @@
- maven-target:
maven-version: '{mvn33}'
goals: '--version'
- settings: 'vpp-settings'
+ settings: 'nsh_sfc-settings'
settings-type: cfp
global-settings: 'global-settings'
global-settings-type: cfp
+ - config-file-provider:
+ files:
+ - file-id: 'nsh_sfc-settings'
+ variable: 'SETTINGS_FILE'
+ - file-id: 'global-settings'
+ variable: 'GLOBAL_SETTINGS_FILE'
+ - shell:
+ !include-raw-escape: ../scripts/create_maven_env.sh
+ - inject:
+ properties-file: maven_env.txt
- shell:
!include-raw-escape:
- ../scripts/cleanup_vpp_plugin_dev_env.sh
@@ -178,9 +199,77 @@
branch: '{branch}'
builders:
+ - config-file-provider:
+ files:
+ - file-id: 'nsh_sfc-settings'
+ variable: 'SETTINGS_FILE'
+ - file-id: 'global-settings'
+ variable: 'GLOBAL_SETTINGS_FILE'
+ - shell:
+ !include-raw-escape: ../scripts/create_maven_env.sh
+ - inject:
+ properties-file: maven_env.txt
- shell:
!include-raw-escape:
- ../scripts/cleanup_vpp_plugin_dev_env.sh
- ../scripts/setup_vpp_plugin_dev_env.sh
- include-raw-nsh_sfc-build.sh
- - ../scripts/cleanup_vpp_plugin_dev_env.sh \ No newline at end of file
+ - ../scripts/cleanup_vpp_plugin_dev_env.sh
+
+- job-template:
+ name: 'nsh_sfc-integration-{stream}-{os}'
+
+ project-type: freestyle
+ node: 'merge-{os}'
+
+ logrotate:
+ daysToKeep: '{build-days-to-keep}'
+ numToKeep: '{build-num-to-keep}'
+ artifactDaysToKeep: '{build-artifact-days-to-keep}'
+ artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+ parameters:
+ - project-parameter:
+ project: '{project}'
+ - gerrit-parameter:
+ branch: '{branch}'
+ - os-parameter:
+ os: '{os}'
+ - repo-name-parameter:
+ repo-name: '{repo-stream-part}.{repo-os-part}'
+
+ scm:
+ - gerrit-trigger-scm:
+ credentials-id: '{ssh-credentials}'
+ refspec: ''
+ choosing-strategy: 'default'
+
+ wrappers:
+ - ssh-agent-credentials:
+ users:
+ - '{ssh-credentials}'
+
+ triggers:
+ - reverse:
+ jobs: 'vpp-merge-{stream}-{os},nsh_sfc-merge-{stream}-{os}'
+ result: 'success'
+
+ builders:
+ - config-file-provider:
+ files:
+ - file-id: 'nsh_sfc-settings'
+ variable: 'SETTINGS_FILE'
+ - file-id: 'global-settings'
+ variable: 'GLOBAL_SETTINGS_FILE'
+ - shell:
+ !include-raw-escape: ../scripts/create_maven_env.sh
+ - inject:
+ properties-file: maven_env.txt
+ - shell:
+ !include-raw-escape:
+ - ../scripts/cleanup_vpp_plugin_dev_env.sh
+ - ../scripts/setup_vpp_plugin_dev_env.sh
+ - include-raw-nsh_sfc-build.sh
+ - ../scripts/cleanup_vpp_plugin_dev_env.sh
+ - ../scripts/maven_push_functions.sh
+ - include-raw-nsh_sfc-pkg-push.sh
diff --git a/jjb/scripts/create_maven_env.sh b/jjb/scripts/create_maven_env.sh
new file mode 100644
index 000000000..48a2da06f
--- /dev/null
+++ b/jjb/scripts/create_maven_env.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+echo "MAVEN_SETTINGS_OPTIONS=-s $SETTINGS_FILE -gs $GLOBAL_SETTINGS_FILE" > maven_env.txt