summaryrefslogtreecommitdiffstats
path: root/jjb/releng
diff options
context:
space:
mode:
Diffstat (limited to 'jjb/releng')
-rw-r--r--jjb/releng/compass4nfv-docker.yaml5
-rw-r--r--jjb/releng/opnfv-docker.yaml24
-rw-r--r--jjb/releng/opnfv-utils.yaml2
-rw-r--r--jjb/releng/releng-ci-jobs.yaml1
-rw-r--r--jjb/releng/testresults-automate.yaml2
5 files changed, 33 insertions, 1 deletions
diff --git a/jjb/releng/compass4nfv-docker.yaml b/jjb/releng/compass4nfv-docker.yaml
index 2a5453658..7cedba916 100644
--- a/jjb/releng/compass4nfv-docker.yaml
+++ b/jjb/releng/compass4nfv-docker.yaml
@@ -15,6 +15,9 @@
- euphrates:
branch: 'stable/{stream}'
disabled: true
+ - gambia:
+ branch: 'stable/{stream}'
+ disabled: false
arch_tag:
- 'amd64':
@@ -216,6 +219,8 @@
name: SLAVE_LABEL
default: '{slave_label}'
description: 'Slave label on Jenkins'
+ all-nodes: false
+ node-eligibility: 'ignore-offline'
- string:
name: GIT_BASE
default: https://gerrit.opnfv.org/gerrit/$PROJECT
diff --git a/jjb/releng/opnfv-docker.yaml b/jjb/releng/opnfv-docker.yaml
index 40e62b3bc..5b93b0f8d 100644
--- a/jjb/releng/opnfv-docker.yaml
+++ b/jjb/releng/opnfv-docker.yaml
@@ -120,6 +120,30 @@
dockerfile: 'Dockerfile'
<<: *master
<<: *other-receivers
+ - 'clover-controller':
+ project: 'clover'
+ dockerdir: 'clover/controller'
+ dockerfile: 'docker/Dockerfile'
+ <<: *master
+ <<: *other-receivers
+ - 'clover-collector':
+ project: 'clover'
+ dockerdir: 'clover/collector'
+ dockerfile: 'docker/Dockerfile'
+ <<: *master
+ <<: *other-receivers
+ - 'clover-jmeter-master':
+ project: 'clover'
+ dockerdir: 'clover/tools/jmeter'
+ dockerfile: 'jmeter-master/Dockerfile'
+ <<: *master
+ <<: *other-receivers
+ - 'clover-jmeter-slave':
+ project: 'clover'
+ dockerdir: 'clover/tools/jmeter'
+ dockerfile: 'jmeter-slave/Dockerfile'
+ <<: *master
+ <<: *other-receivers
- 'clover-sample-app':
project: 'clover'
dockerdir: 'samples/scenarios/sample_app'
diff --git a/jjb/releng/opnfv-utils.yaml b/jjb/releng/opnfv-utils.yaml
index b0ea7672c..457f7dc2b 100644
--- a/jjb/releng/opnfv-utils.yaml
+++ b/jjb/releng/opnfv-utils.yaml
@@ -28,7 +28,6 @@
- arm-build3
- arm-build4
- arm-build5
- - arm-build6
- ericsson-build3
- ericsson-build4
- lf-build2
@@ -131,6 +130,7 @@
default-slaves:
- lf-build1
- lf-build2
+ - lf-build3
- ericsson-build3
- ericsson-build4
allowed-multiselect: true
diff --git a/jjb/releng/releng-ci-jobs.yaml b/jjb/releng/releng-ci-jobs.yaml
index 17fb6e42c..f7c960335 100644
--- a/jjb/releng/releng-ci-jobs.yaml
+++ b/jjb/releng/releng-ci-jobs.yaml
@@ -3,6 +3,7 @@
name: releng-builder-jobs
project: 'releng'
project-name: 'releng'
+ jjb-version: '2.5.0'
build-timeout: 60
diff --git a/jjb/releng/testresults-automate.yaml b/jjb/releng/testresults-automate.yaml
index 01fbe0c6d..3a9beadfe 100644
--- a/jjb/releng/testresults-automate.yaml
+++ b/jjb/releng/testresults-automate.yaml
@@ -28,6 +28,8 @@
name: SLAVE_LABEL
default: 'testresults'
description: 'Slave label on Jenkins'
+ all-nodes: false
+ node-eligibility: 'ignore-offline'
- project-parameter:
project: 'releng-testresults'
branch: 'master'