summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2018-02-08 16:08:27 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-02-08 16:08:27 +0000
commitad4acb5b5594ad9cbcef870cb115daaf2eb5d82c (patch)
tree72d1de297f38a04574649489db43dfbae1020595 /jjb
parent14601e08b9147c4705a444815d9d3b142ccc9893 (diff)
parent1786544e04f38eeb5a2046886c712e4b96c2bfbf (diff)
Merge "Apex: Cleanup slave/slave-label configuration"
Diffstat (limited to 'jjb')
-rw-r--r--jjb/apex/apex-verify-jobs.yml6
-rw-r--r--jjb/apex/apex.yml6
-rw-r--r--jjb/apex/apex.yml.j26
-rw-r--r--jjb/global/slave-params.yml38
4 files changed, 3 insertions, 53 deletions
diff --git a/jjb/apex/apex-verify-jobs.yml b/jjb/apex/apex-verify-jobs.yml
index 111d0c18b..421a3fa31 100644
--- a/jjb/apex/apex-verify-jobs.yml
+++ b/jjb/apex/apex-verify-jobs.yml
@@ -108,8 +108,6 @@
- job-template:
name: 'apex-verify-{stream}'
- node: 'apex-virtual-master'
-
concurrent: true
disabled: '{obj:disabled}'
@@ -117,6 +115,7 @@
project-type: 'multijob'
parameters:
+ - '{project}-virtual-{stream}-defaults'
- apex-parameter:
gs-pathname: '{gs-pathname}/dev'
- project-parameter:
@@ -248,8 +247,6 @@
- job-template:
name: 'apex-verify-gate-{stream}'
- node: 'apex-build-{stream}'
-
concurrent: true
disabled: '{obj:disabled}'
@@ -257,6 +254,7 @@
project-type: 'multijob'
parameters:
+ - '{project}-virtual-{stream}-defaults'
- apex-parameter:
gs-pathname: '{gs-pathname}/dev'
- project-parameter:
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 6714d6a66..b07ccd660 100644
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -255,8 +255,6 @@
- job-template:
name: 'apex-deploy-{platform}-{stream}'
- node: 'apex-{platform}-{stream}'
-
concurrent: true
disabled: false
@@ -315,8 +313,6 @@
- job-template:
name: 'apex-virtual-{stream}'
- node: 'apex-virtual-master'
-
project-type: 'multijob'
disabled: false
@@ -581,8 +577,6 @@
# branch: branch (eg. stable)
project-type: 'multijob'
- node: '{baremetal-slave}'
-
disabled: '{obj:disable_daily}'
scm:
diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2
index 27a854dd7..b9cbd0240 100644
--- a/jjb/apex/apex.yml.j2
+++ b/jjb/apex/apex.yml.j2
@@ -129,8 +129,6 @@
- job-template:
name: 'apex-deploy-{platform}-{stream}'
- node: 'apex-{platform}-{stream}'
-
concurrent: true
disabled: false
@@ -189,8 +187,6 @@
- job-template:
name: 'apex-virtual-{stream}'
- node: 'apex-virtual-master'
-
project-type: 'multijob'
disabled: false
@@ -455,8 +451,6 @@
# branch: branch (eg. stable)
project-type: 'multijob'
- node: '{baremetal-slave}'
-
disabled: '{obj:disable_daily}'
scm:
diff --git a/jjb/global/slave-params.yml b/jjb/global/slave-params.yml
index 16de0bced..86b369bcd 100644
--- a/jjb/global/slave-params.yml
+++ b/jjb/global/slave-params.yml
@@ -18,13 +18,6 @@
name: SSH_KEY
default: /root/.ssh/id_rsa
description: 'SSH key to use for Apex'
- - node:
- name: SLAVE_NAME
- description: 'Slave name on Jenkins'
- allowed-slaves:
- - lf-pod1
- default-slaves:
- - lf-pod1
- parameter:
name: 'apex-baremetal-euphrates-defaults'
@@ -40,13 +33,6 @@
name: SSH_KEY
default: /root/.ssh/id_rsa
description: 'SSH key to use for Apex'
- - node:
- name: SLAVE_NAME
- description: 'Slave name on Jenkins'
- allowed-slaves:
- - lf-pod1
- default-slaves:
- - lf-pod1
- parameter:
name: 'apex-baremetal-danube-defaults'
@@ -62,13 +48,7 @@
name: SSH_KEY
default: /root/.ssh/id_rsa
description: 'SSH key to use for Apex'
- - node:
- name: SLAVE_NAME
- description: 'Slave name on Jenkins'
- allowed-slaves:
- - lf-pod1
- default-slaves:
- - lf-pod1
+
- parameter:
name: 'apex-virtual-master-defaults'
@@ -99,15 +79,6 @@
name: SSH_KEY
default: /root/.ssh/id_rsa
description: 'SSH key to use for Apex'
- - node:
- name: SLAVE_NAME
- description: 'Slave name on Jenkins'
- allowed-slaves:
- - lf-virtual2
- - lf-virtual3
- default-slaves:
- - lf-virtual2
- - lf-virtual3
- parameter:
name: 'apex-virtual-danube-defaults'
@@ -123,13 +94,6 @@
name: SSH_KEY
default: /root/.ssh/id_rsa
description: 'SSH key to use for Apex'
- - node:
- name: SLAVE_NAME
- description: 'Slave name on Jenkins'
- allowed-slaves:
- - lf-pod3
- default-slaves:
- - lf-pod3
- parameter:
name: 'lf-pod1-defaults'