Merge "Adjust kni gerrit trigger to pick up merges"

diff --git a/jjb/ci-management/ci-jobs.yaml b/jjb/ci-management/ci-jobs.yaml
index 28b5054..a27fe15 100644 (file)
--- a/jjb/ci-management/ci-jobs.yaml
+++ b/jjb/ci-management/ci-jobs.yaml
@@ -8,7 +8,7 @@
     project: ci-management
     project-name: ci-management
     build-node: centos7-builder-2c-1g
-    jjb-version: 2.2.1
+    jjb-version: 2.9.1
 
     views:
       - project-view

diff --git a/jjb/validation/validation-docker.yaml b/jjb/validation/validation-docker.yaml
index 17f67d3..e7a5b63 100644 (file)
--- a/jjb/validation/validation-docker.yaml
+++ b/jjb/validation/validation-docker.yaml
@@ -36,14 +36,13 @@
     name: 'validation-{stream}-docker'
     project-type: multijob
     disabled: '{obj:disabled}'
+    node: 'centos7-builder-2c-1g'
 
     parameters:
       - validation-job-parameters:
           project: '{project}'
           branch: '{branch}'
           stream: '{stream}'
-          slave_label: 'ubuntu1604-docker-8c-8g'
-          arch_tag: 'amd64'
 
     properties:
       - throttle:
@@ -92,13 +91,15 @@
 - job-template:
     name: 'validation-docker-build-{arch_tag}-{stream}'
     disabled: '{obj:disabled}'
+    node: '{slave_label}'
+
     parameters:
       - validation-job-parameters:
           project: '{project}'
           branch: '{branch}'
           stream: '{stream}'
-          slave_label: '{slave_label}'
           arch_tag: '{arch_tag}'
+
     properties:
       - build-blocker:
           use-build-blocker: true
@@ -125,13 +126,13 @@
 
 - job-template:
     name: 'validation-docker-manifest-{stream}'
+    node: 'ubuntu1604-docker-8c-8g'
 
     parameters:
       - validation-job-parameters:
           project: '{project}'
           branch: '{branch}'
           stream: '{stream}'
-          slave_label: 'ubuntu1604-docker-8c-8g'
 
     disabled: '{obj:disabled}'
 
@@ -161,9 +162,3 @@
           project: '{project}'
           stream: '{stream}'
           branch: '{branch}'
-      - label:
-          name: SLAVE_LABEL
-          default: '{slave_label}'
-          description: 'Slave label on Jenkins'
-          all-nodes: false
-          node-eligibility: 'ignore-offline'