Remove deprecated or useless macros

Change-Id: I8bd92fe53efbbcfc5e18f3835004374a5c6a0a66
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

diff --git a/jjb/barometer/barometer.yaml b/jjb/barometer/barometer.yaml
index 4d67f18..7b25e8e 100644 (file)
--- a/jjb/barometer/barometer.yaml
+++ b/jjb/barometer/barometer.yaml
@@ -3,6 +3,24 @@
 # All the jobs except verify have been removed!
 # They will only be enabled on request by projects!
 ###################################################
+
+- parameter:
+    name: 'opnfv-build-centos-defaults'
+    parameters:
+      - label:
+          name: SLAVE_LABEL
+          default: 'opnfv-build-centos'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
+      - string:
+          name: GIT_BASE
+          default: https://gerrit.opnfv.org/gerrit/$PROJECT
+          description: 'Git URL to use on this Jenkins Slave'
+      - string:
+          name: BUILD_DIRECTORY
+          default: $WORKSPACE/build_output
+          description: "Directory where the build artifact will be located upon the completion of the build."
+
 - project:
     name: barometer
 

diff --git a/jjb/global/basic-jobs.yaml b/jjb/global/basic-jobs.yaml
deleted file mode 100644 (file)
index d2c2711..0000000
--- a/jjb/global/basic-jobs.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
----
-##
-# Basic Job Config
-#
-# This is used for project which don't have any jobs of substance
-# defined yet, but still need 'Verified+1'.
-##
-- job-group:
-    name: '{project}-verify-basic'
-
-    stream:
-      - master:
-          branch: '{stream}'
-          gs-pathname: ''
-          disabled: false
-      - gambia:
-          branch: 'stable/{stream}'
-          gs-pathname: '/{stream}'
-          disabled: false
-
-    jobs:
-      - '{project}-verify-{stream}'
-
-- job-template:
-    name: '{project}-verify-{stream}'
-
-    disabled: '{obj:disabled}'
-
-    parameters:
-      - project-parameter:
-          project: '{project}'
-          branch: '{branch}'
-      - 'opnfv-build-defaults'
-
-    scm:
-      - git-scm-gerrit
-
-    triggers:
-      - gerrit-trigger-patchset-created:
-          project: '{project}'
-          branch: '{branch}'
-          files: 'docs/**|.gitignore'
-
-    builders:
-      - shell: |
-          echo "Nothing to verify!"

diff --git a/jjb/global/installer-params.yaml b/jjb/global/installer-params.yaml
deleted file mode 100644 (file)
index 163d915..0000000
--- a/jjb/global/installer-params.yaml
+++ /dev/null
@@ -1,140 +0,0 @@
----
-- parameter:
-    name: 'apex-defaults'
-    parameters:
-      - string:
-          name: INSTALLER_IP
-          default: '192.168.X.X'
-          description: 'IP of the installer'
-      - string:
-          name: INSTALLER_TYPE
-          default: apex
-          description: 'Installer used for deploying OPNFV on this POD'
-      - string:
-          name: EXTERNAL_NETWORK
-          default: 'external'
-          description: 'external network for test'
-
-- parameter:
-    name: 'fuel-defaults'
-    parameters:
-      - string:
-          name: INSTALLER_IP
-          default: '10.20.0.2'
-          description: 'IP of the installer'
-      - string:
-          name: SSH_KEY
-          default: "/var/lib/opnfv/mcp.rsa"
-          description: 'Path to private SSH key to access environment nodes'
-      - string:
-          name: INSTALLER_TYPE
-          default: fuel
-          description: 'Installer used for deploying OPNFV on this POD'
-      - string:
-          name: EXTERNAL_NETWORK
-          default: 'floating_net'
-          description: 'external network for test'
-      - string:
-          name: GS_URL
-          default: '$GS_BASE{gs-pathname}'
-          description: "URL to Google Storage."
-      - string:
-          name: CI_DEBUG
-          default: 'false'
-          description: "Show debug output information"
-
-- parameter:
-    name: 'joid-defaults'
-    parameters:
-      - string:
-          name: INSTALLER_IP
-          default: '192.168.122.5'
-          description: 'IP of the installer'
-      - string:
-          name: INSTALLER_TYPE
-          default: joid
-          description: 'Installer used for deploying OPNFV on this POD'
-      - string:
-          name: MODEL
-          default: 'os'
-          description: 'Model to deploy (os|k8)'
-      - string:
-          name: OS_RELEASE
-          default: 'pike'
-          description: 'OpenStack release (mitaka|ocata|pike)'
-      - string:
-          name: EXTERNAL_NETWORK
-          default: ext-net
-          description: "External network used for Floating ips."
-      - string:
-          name: LAB_CONFIG
-          default: "$HOME/joid_config"
-          description: "Local lab config and Openstack openrc location"
-      - string:
-          name: MAAS_REINSTALL
-          default: 'false'
-          description: "Reinstall MAAS and Bootstrap before deploy [true/false]"
-      - string:
-          name: UBUNTU_DISTRO
-          default: 'xenial'
-          description: "Ubuntu distribution to use for Openstack (xenial)"
-      - string:
-          name: CPU_ARCHITECTURE
-          default: 'amd64'
-          description: "CPU Architecture to use for Ubuntu distro "
-
-- parameter:
-    name: 'daisy-defaults'
-    parameters:
-      - string:
-          name: INSTALLER_IP
-          default: '10.20.7.3'
-          description: 'IP of the installer'
-      - string:
-          name: INSTALLER_TYPE
-          default: daisy
-          description: 'Installer used for deploying OPNFV on this POD'
-      - string:
-          name: BRIDGE
-          default: 'br7'
-          description: 'pxe bridge for booting of Daisy master'
-      - string:
-          name: EXTERNAL_NETWORK
-          default: 'admin_external'
-          description: 'external network for test'
-
-- parameter:
-    name: 'infra-defaults'
-    parameters:
-      - string:
-          name: INSTALLER_IP
-          default: '192.168.122.2'
-          description: 'IP of the installer'
-      - string:
-          name: INSTALLER_TYPE
-          default: infra
-          description: 'Installer used for deploying OPNFV on this POD'
-
-- parameter:
-    name: 'netvirt-defaults'
-    parameters:
-      - string:
-          name: INSTALLER_IP
-          default: '192.168.X.X'
-          description: 'IP of the installer'
-      - string:
-          name: INSTALLER_TYPE
-          default: apex
-          description: 'Installer used for deploying OPNFV on this POD'
-      - string:
-          name: EXTERNAL_NETWORK
-          default: 'external'
-          description: 'external network for test'
-
-- parameter:
-    name: 'deploy-scenario'
-    parameters:
-      - string:
-          name: DEPLOY_SCENARIO
-          default: 'os-nosdn-nofeature-ha'
-          description: "OPNFV deployment scenario"

diff --git a/jjb/global/installer-report.sh b/jjb/global/installer-report.sh
deleted file mode 100755 (executable)
index 6cd83f1..0000000
--- a/jjb/global/installer-report.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2017 ZTE Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-source $WORKSPACE/installer_track.sh
-
-gen_content()
-{
-    cat <<EOF
-{
-    "installer": "$INSTALLER",
-    "version": "$INSTALLER_VERSION",
-    "pod_name": "$NODE_NAME",
-    "job_name": "$JOB_NAME",
-    "build_id": "$BUILD_ID",
-    "scenario": "$DEPLOY_SCENARIO",
-    "upstream_job_name": "$UPSTREAM_JOB_NAME",
-    "upstream_build_id":"$UPSTREAM_BUILD_ID",
-    "criteria": "$PROVISION_RESULT",
-    "start_date": "$TIMESTAMP_START",
-    "stop_date": "$TIMESTAMP_END",
-    "details":""
-}
-EOF
-}
-
-echo "Installer: $INSTALLER provision result: $PROVISION_RESULT"
-echo $(gen_content)
-
-set -o xtrace
-curl -H "Content-Type: application/json" -X POST -v -d "$(gen_content)" \
-    $TESTAPI_URL/deployresults || true
-
-# INFO
-# postbuildscript plugin shall always return the original job running status,
-# for the result returned from postbuildscript affects the CI pipeline.
-if [ "$PROVISION_RESULT" == "PASS" ]; then
-    exit 0
-else
-    exit 1
-fi

diff --git a/jjb/global/releng-macros.yaml b/jjb/global/releng-macros.yaml
index ddf2a73..8a8bbaf 100644 (file)
--- a/jjb/global/releng-macros.yaml
+++ b/jjb/global/releng-macros.yaml
@@ -558,36 +558,3 @@
           failure: true
           send-to:
             - recipients
-
-- publisher:
-    name: 'report-provision-result'
-    publishers:
-      - postbuildscript:
-          builders:
-            - role: BOTH
-              build-on:
-                - SUCCESS
-              build-steps:
-                - shell: |
-                    echo "export PROVISION_RESULT=PASS" >> $WORKSPACE/installer_track.sh
-                    echo "export INSTALLER=$INSTALLER_TYPE" >> $WORKSPACE/installer_track.sh
-                    echo "export TIMESTAMP_END="\'`date '+%Y-%m-%d %H:%M:%S.%3N'`\' >> $WORKSPACE/installer_track.sh
-                - shell:
-                    !include-raw: installer-report.sh
-          mark-unstable-if-failed: true
-      - postbuildscript:
-          builders:
-            - role: BOTH
-              build-on:
-                - ABORTED
-                - FAILURE
-                - NOT_BUILT
-                - UNSTABLE
-              build-steps:
-                - shell: |
-                    echo "export PROVISION_RESULT=FAIL" >> $WORKSPACE/installer_track.sh
-                    echo "export INSTALLER=$INSTALLER_TYPE" >> $WORKSPACE/installer_track.sh
-                    echo "export TIMESTAMP_END="\'`date '+%Y-%m-%d %H:%M:%S.%3N'`\' >> $WORKSPACE/installer_track.sh
-                - shell:
-                    !include-raw: installer-report.sh
-          mark-unstable-if-failed: true

diff --git a/jjb/global/slave-params.yaml b/jjb/global/slave-params.yaml
index d231718..50743b7 100644 (file)
--- a/jjb/global/slave-params.yaml
+++ b/jjb/global/slave-params.yaml
@@ -1,1241 +1,9 @@
----
-#####################################################
-# Parameters for slaves using old labels
-# This will be cleaned up once the new job structure and
-# use of the new labels are in place
-#####################################################
 - parameter:
-    name: 'apex-baremetal-master-defaults'
-    parameters:
-      - label:
-          name: SLAVE_LABEL
-          default: 'apex-baremetal-master'
-          all-nodes: false
-          node-eligibility: 'ignore-offline'
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-      - string:
-          name: SSH_KEY
-          default: /root/.ssh/id_rsa
-          description: 'SSH key to use for Apex'
-
-- parameter:
-    name: 'apex-baremetal-hunter-defaults'
-    parameters:
-      - label:
-          name: SLAVE_LABEL
-          default: 'apex-baremetal-master'
-          all-nodes: false
-          node-eligibility: 'ignore-offline'
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-      - string:
-          name: SSH_KEY
-          default: /root/.ssh/id_rsa
-          description: 'SSH key to use for Apex'
-
-- parameter:
-    name: 'apex-baremetal-gambia-defaults'
-    parameters:
-      - label:
-          name: SLAVE_LABEL
-          default: 'apex-baremetal-master'
-          all-nodes: false
-          node-eligibility: 'ignore-offline'
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-      - string:
-          name: SSH_KEY
-          default: /root/.ssh/id_rsa
-          description: 'SSH key to use for Apex'
-
-- parameter:
-    name: 'apex-baremetal-fraser-defaults'
-    parameters:
-      - label:
-          name: SLAVE_LABEL
-          default: 'apex-baremetal-master'
-          all-nodes: false
-          node-eligibility: 'ignore-offline'
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-      - string:
-          name: SSH_KEY
-          default: /root/.ssh/id_rsa
-          description: 'SSH key to use for Apex'
-
-- parameter:
-    name: 'apex-baremetal-euphrates-defaults'
-    parameters:
-      - label:
-          name: SLAVE_LABEL
-          default: 'apex-baremetal-master'
-          all-nodes: false
-          node-eligibility: 'ignore-offline'
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-      - string:
-          name: SSH_KEY
-          default: /root/.ssh/id_rsa
-          description: 'SSH key to use for Apex'
-
-- parameter:
-    name: 'apex-baremetal-danube-defaults'
-    parameters:
-      - label:
-          name: SLAVE_LABEL
-          default: 'apex-baremetal-danube'
-          all-nodes: false
-          node-eligibility: 'ignore-offline'
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-      - string:
-          name: SSH_KEY
-          default: /root/.ssh/id_rsa
-          description: 'SSH key to use for Apex'
-
-
-- parameter:
-    name: 'apex-virtual-master-defaults'
-    parameters:
-      - label:
-          name: SLAVE_LABEL
-          default: 'apex-virtual-master'
-          all-nodes: false
-          node-eligibility: 'ignore-offline'
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-      - string:
-          name: SSH_KEY
-          default: /root/.ssh/id_rsa
-          description: 'SSH key to use for Apex'
-
-- parameter:
-    name: 'apex-virtual-hunter-defaults'
-    parameters:
-      - label:
-          name: SLAVE_LABEL
-          default: 'apex-virtual-master'
-          all-nodes: false
-          node-eligibility: 'ignore-offline'
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-      - string:
-          name: SSH_KEY
-          default: /root/.ssh/id_rsa
-          description: 'SSH key to use for Apex'
-
-- parameter:
-    name: 'apex-virtual-gambia-defaults'
-    parameters:
-      - label:
-          name: SLAVE_LABEL
-          default: 'apex-virtual-master'
-          all-nodes: false
-          node-eligibility: 'ignore-offline'
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-      - string:
-          name: SSH_KEY
-          default: /root/.ssh/id_rsa
-          description: 'SSH key to use for Apex'
-
-- parameter:
-    name: 'apex-virtual-fraser-defaults'
-    parameters:
-      - label:
-          name: SLAVE_LABEL
-          default: 'apex-virtual-master'
-          all-nodes: false
-          node-eligibility: 'ignore-offline'
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-      - string:
-          name: SSH_KEY
-          default: /root/.ssh/id_rsa
-          description: 'SSH key to use for Apex'
-
-- parameter:
-    name: 'apex-virtual-euphrates-defaults'
-    parameters:
-      - label:
-          name: SLAVE_LABEL
-          default: 'apex-virtual-master'
-          all-nodes: false
-          node-eligibility: 'ignore-offline'
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-      - string:
-          name: SSH_KEY
-          default: /root/.ssh/id_rsa
-          description: 'SSH key to use for Apex'
-
-- parameter:
-    name: 'apex-virtual-danube-defaults'
-    parameters:
-      - label:
-          name: SLAVE_LABEL
-          default: 'apex-virtual-danube'
-          all-nodes: false
-          node-eligibility: 'ignore-offline'
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-      - string:
-          name: SSH_KEY
-          default: /root/.ssh/id_rsa
-          description: 'SSH key to use for Apex'
-
-- parameter:
-    name: 'lf-pod1-defaults'
-    parameters:
-      - node:
-          name: SLAVE_NAME
-          description: 'Slave name on Jenkins'
-          allowed-slaves:
-            - lf-pod1
-          default-slaves:
-            - lf-pod1
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-      - string:
-          name: SSH_KEY
-          default: /root/.ssh/id_rsa
-          description: 'SSH key to use for Apex'
-
-- parameter:
-    name: 'lf-pod3-defaults'
-    parameters:
-      - node:
-          name: SLAVE_NAME
-          description: 'Slave name on Jenkins'
-          allowed-slaves:
-            - lf-pod3
-          default-slaves:
-            - lf-pod3
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-      - string:
-          name: SSH_KEY
-          default: /root/.ssh/id_rsa
-          description: 'SSH key to use for Apex'
-
-- parameter:
-    name: 'lf-pod4-defaults'
-    parameters:
-      - node:
-          name: SLAVE_NAME
-          description: 'Slave name on Jenkins'
-          allowed-slaves:
-            - lf-pod4
-          default-slaves:
-            - lf-pod4
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-      - string:
-          name: SSH_KEY
-          default: /root/.ssh/id_rsa
-          description: 'SSH key to use for Apex'
-
-- parameter:
-    name: 'lf-pod5-defaults'
-    parameters:
-      - node:
-          name: SLAVE_NAME
-          description: 'Slave name on Jenkins'
-          allowed-slaves:
-            - lf-pod5
-          default-slaves:
-            - lf-pod5
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-      - string:
-          name: SSH_KEY
-          default: /root/.ssh/id_rsa
-          description: 'SSH key to use for Apex'
-
-#####################################################
-# Parameters for CI baremetal PODs
-#####################################################
-- parameter:
-    name: 'apex-baremetal-defaults'
-    parameters:
-      - label:
-          name: SLAVE_LABEL
-          default: 'apex-baremetal'
-          all-nodes: false
-          node-eligibility: 'ignore-offline'
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-      - string:
-          name: SSH_KEY
-          default: /root/.ssh/id_rsa
-          description: 'SSH key to use for Apex'
-
-- parameter:
-    name: 'fuel-baremetal-defaults'
-    parameters:
-      - label:
-          name: SLAVE_LABEL
-          default: 'fuel-baremetal'
-          all-nodes: false
-          node-eligibility: 'ignore-offline'
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-
-- parameter:
-    name: 'armband-baremetal-defaults'
-    parameters:
-      - label:
-          name: SLAVE_LABEL
-          default: 'armband-baremetal'
-          all-nodes: false
-          node-eligibility: 'ignore-offline'
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-
-- parameter:
-    name: 'auto-baremetal-defaults'
-    parameters:
-      - label:
-          name: SLAVE_LABEL
-          default: 'auto-baremetal'
-          all-nodes: false
-          node-eligibility: 'ignore-offline'
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-
-- parameter:
-    name: 'joid-baremetal-defaults'
-    parameters:
-      - label:
-          name: SLAVE_LABEL
-          default: 'joid-baremetal'
-          all-nodes: false
-          node-eligibility: 'ignore-offline'
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-      - string:
-          name: EXTERNAL_NETWORK
-          default: ext-net
-          description: "External network floating ips"
-
-- parameter:
-    name: 'daisy-baremetal-defaults'
-    parameters:
-      - node:
-          name: SLAVE_NAME
-          description: 'Slave name on Jenkins'
-          allowed-slaves:
-            - zte-pod2
-          default-slaves:
-            - zte-pod2
-      - label:
-          name: SLAVE_LABEL
-          default: 'daisy-baremetal'
-          all-nodes: false
-          node-eligibility: 'ignore-offline'
-      - string:
-          name: INSTALLER_IP
-          default: '10.20.7.3'
-          description: 'IP of the installer'
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-
-#####################################################
-# Parameters for CI virtual PODs
-#####################################################
-- parameter:
-    name: 'apex-virtual-defaults'
-    parameters:
-      - label:
-          name: SLAVE_LABEL
-          default: 'apex-virtual'
-          all-nodes: false
-          node-eligibility: 'ignore-offline'
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-      - string:
-          name: SSH_KEY
-          default: /root/.ssh/id_rsa
-          description: 'SSH key to use for Apex'
-
-- parameter:
-    name: 'fuel-virtual-defaults'
-    parameters:
-      - label:
-          name: SLAVE_LABEL
-          default: 'fuel-virtual'
-          all-nodes: false
-          node-eligibility: 'ignore-offline'
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-
-- parameter:
-    name: 'armband-virtual-defaults'
-    parameters:
-      - label:
-          name: SLAVE_LABEL
-          default: 'armband-virtual'
-          all-nodes: false
-          node-eligibility: 'ignore-offline'
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-
-- parameter:
-    name: 'joid-virtual-defaults'
-    parameters:
-      - label:
-          name: SLAVE_LABEL
-          default: 'joid-virtual'
-          all-nodes: false
-          node-eligibility: 'ignore-offline'
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-
-- parameter:
-    name: 'daisy-virtual-defaults'
-    parameters:
-      - node:
-          name: SLAVE_NAME
-          description: 'Slave name on Jenkins'
-          allowed-slaves:
-            - zte-virtual1
-            - zte-virtual2
-          default-slaves:
-            - zte-virtual1
-      - label:
-          name: SLAVE_LABEL
-          default: 'daisy-virtual'
-          all-nodes: false
-          node-eligibility: 'ignore-offline'
-      - string:
-          name: INSTALLER_IP
-          default: '10.20.11.2'
-          description: 'IP of the installer'
-      - string:
-          name: BRIDGE
-          default: 'daisy1'
-          description: 'pxe bridge for booting of Daisy master'
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-
-- parameter:
-    name: 'functest-virtual-defaults'
-    parameters:
-      - label:
-          name: SLAVE_LABEL
-          default: 'functest-virtual'
-          all-nodes: false
-          node-eligibility: 'ignore-offline'
-
-#####################################################
-# Parameters for build slaves
-#####################################################
-- parameter:
-    name: 'opnfv-build-centos-defaults'
-    parameters:
-      - label:
-          name: SLAVE_LABEL
-          default: 'opnfv-build-centos'
-          all-nodes: false
-          node-eligibility: 'ignore-offline'
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-      - string:
-          name: BUILD_DIRECTORY
-          default: $WORKSPACE/build_output
-          description: "Directory where the build artifact will be located upon the completion of the build."
-
-- parameter:
-    name: 'opnfv-build-ubuntu-defaults'
-    parameters:
-      - label:
-          name: SLAVE_LABEL
-          default: 'opnfv-build-ubuntu'
-          description: 'Slave label on Jenkins'
-          all-nodes: false
-          node-eligibility: 'ignore-offline'
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-      - string:
-          name: BUILD_DIRECTORY
-          default: $WORKSPACE/build_output
-          description: "Directory where the build artifact will be located upon the completion of the build."
-
-- parameter:
-    name: 'lf-virtual1-defaults'
-    parameters:
-      - label:
-          name: SLAVE_LABEL
-          default: 'lf-virtual1'
-          description: 'Slave label on Jenkins'
-          all-nodes: false
-          node-eligibility: 'ignore-offline'
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-      - string:
-          name: BUILD_DIRECTORY
-          default: $WORKSPACE/build_output
-          description: "Directory where the build artifact will be located upon the completion of the build."
-
-- parameter:
-    name: 'laas-dashboard-defaults'
-    parameters:
-      - label:
-          name: SLAVE_LABEL
-          default: 'laas-dashboard'
-          description: 'Slave label on Jenkins'
-          all-nodes: false
-          node-eligibility: 'ignore-offline'
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-      - string:
-          name: BUILD_DIRECTORY
-          default: $WORKSPACE/build_output
-          description: "Directory where the build artifact will be located upon the completion of the build."
-
-- parameter:
-    name: 'opnfv-build-defaults'
-    parameters:
-      - label:
-          name: SLAVE_LABEL
-          default: 'opnfv-build'
-          description: 'Slave label on Jenkins'
-          all-nodes: false
-          node-eligibility: 'ignore-offline'
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-      - string:
-          name: BUILD_DIRECTORY
-          default: $WORKSPACE/build_output
-          description: "Directory where the build artifact will be located upon the completion of the build."
-
-- parameter:
-    name: 'huawei-build-defaults'
-    parameters:
-      - node:
-          name: SLAVE_NAME
-          description: 'Slave name on Jenkins'
-          allowed-slaves:
-            - huawei-build
-          default-slaves:
-            - huawei-build
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-
-- parameter:
-    name: 'opnfv-build-ubuntu-arm-defaults'
-    parameters:
-      - label:
-          name: SLAVE_LABEL
-          default: 'opnfv-build-ubuntu-arm'
-          description: 'Slave label on Jenkins'
-          all-nodes: false
-          node-eligibility: 'ignore-offline'
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-      - string:
-          name: BUILD_DIRECTORY
-          default: $WORKSPACE/build_output
-          description: "Directory where the build artifact will be located upon the completion of the build."
-
-#####################################################
-# Parameters for none-CI PODs
-#####################################################
-- parameter:
-    name: 'cengn-pod1-defaults'
-    parameters:
-      - node:
-          name: SLAVE_NAME
-          description: 'Slave name on Jenkins'
-          allowed-slaves:
-            - cengn-pod1
-          default-slaves:
-            - cengn-pod1
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-
-- parameter:
-    name: 'intel-pod1-defaults'
-    parameters:
-      - node:
-          name: SLAVE_NAME
-          description: 'Slave name on Jenkins'
-          allowed-slaves:
-            - intel-pod1
-          default-slaves:
-            - intel-pod1
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-
-- parameter:
-    name: 'intel-pod2-defaults'
-    parameters:
-      - node:
-          name: SLAVE_NAME
-          description: 'Slave name on Jenkins'
-          allowed-slaves:
-            - intel-pod2
-          default-slaves:
-            - intel-pod2
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-      - string:
-          name: SSH_KEY
-          default: /root/.ssh/id_rsa
-          description: 'SSH key to use for Apex'
-
-- parameter:
-    name: 'intel-pod9-defaults'
-    parameters:
-      - node:
-          name: SLAVE_NAME
-          description: 'Slave name on Jenkins'
-          allowed-slaves:
-            - intel-pod9
-          default-slaves:
-            - intel-pod9
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-
-- parameter:
-    name: 'intel-pod10-defaults'
-    parameters:
-      - node:
-          name: SLAVE_NAME
-          description: 'Slave name on Jenkins'
-          allowed-slaves:
-            - intel-pod10
-          default-slaves:
-            - intel-pod10
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-
-- parameter:
-    name: 'intel-pod12-defaults'
-    parameters:
-      - node:
-          name: SLAVE_NAME
-          description: 'Slave name on Jenkins'
-          allowed-slaves:
-            - intel-pod12
-          default-slaves:
-            - intel-pod12
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-
-- parameter:
-    name: 'intel-pod18-defaults'
-    parameters:
-      - node:
-          name: SLAVE_NAME
-          description: 'Slave name on Jenkins'
-          allowed-slaves:
-            - intel-pod18
-          default-slaves:
-            - intel-pod18
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-
-- parameter:
-    name: 'itri-pod1-defaults'
-    parameters:
-      - node:
-          name: SLAVE_NAME
-          description: 'Slave name on Jenkins'
-          allowed-slaves:
-            - itri-pod1
-          default-slaves:
-            - itri-pod1
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-      - string:
-          name: INSTALLER_IP
-          default: '10.20.0.2'
-          description: 'IP of the installer'
-
-- parameter:
-    name: 'huawei-pod3-defaults'
-    parameters:
-      - node:
-          name: SLAVE_NAME
-          description: 'Slave name on Jenkins'
-          allowed-slaves:
-            - huawei-pod3
-          default-slaves:
-            - huawei-pod3
-      - label:
-          name: SLAVE_LABEL
-          default: 'huawei-test'
-          all-nodes: false
-          node-eligibility: 'ignore-offline'
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-
-- parameter:
-    name: 'huawei-pod4-defaults'
-    parameters:
-      - node:
-          name: SLAVE_NAME
-          description: 'Slave name on Jenkins'
-          allowed-slaves:
-            - huawei-pod4
-          default-slaves:
-            - huawei-pod4
-      - label:
-          name: SLAVE_LABEL
-          default: 'huawei-test'
-          all-nodes: false
-          node-eligibility: 'ignore-offline'
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-
-- parameter:
-    name: 'intel-pod8-defaults'
-    parameters:
-      - node:
-          name: SLAVE_NAME
-          description: 'Slave name on Jenkins'
-          allowed-slaves:
-            - intel-pod8
-          default-slaves:
-            - intel-pod8
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-
-
-- parameter:
-    name: 'intel-pod15-defaults'
-    parameters:
-      - node:
-          name: SLAVE_NAME
-          description: 'Slave name on Jenkins'
-          allowed-slaves:
-            - intel-pod15
-          default-slaves:
-            - intel-pod15
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-
-- parameter:
-    name: 'intel-pod17-defaults'
-    parameters:
-      - node:
-          name: SLAVE_NAME
-          description: 'Slave name on Jenkins'
-          allowed-slaves:
-            - intel-pod17
-          default-slaves:
-            - intel-pod17
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-
-- parameter:
-    name: 'huawei-virtual5-defaults'
-    parameters:
-      - label:
-          name: SLAVE_LABEL
-          default: 'huawei-virtual5'
-          all-nodes: false
-          node-eligibility: 'ignore-offline'
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-
-- parameter:
-    name: 'huawei-virtual7-defaults'
-    parameters:
-      - node:
-          name: SLAVE_NAME
-          description: 'Slave name on Jenkins'
-          allowed-slaves:
-            - huawei-virtual7
-          default-slaves:
-            - huawei-virtual7
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-
-- parameter:
-    name: 'huawei-pod7-defaults'
-    parameters:
-      - node:
-          name: SLAVE_NAME
-          description: 'Slave name on Jenkins'
-          allowed-slaves:
-            - huawei-pod7
-          default-slaves:
-            - huawei-pod7
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-
-- parameter:
-    name: 'zte-pod1-defaults'
-    parameters:
-      - node:
-          name: SLAVE_NAME
-          description: 'Slave name on Jenkins'
-          allowed-slaves:
-            - zte-pod1
-          default-slaves:
-            - zte-pod1
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-      - string:
-          name: INSTALLER_IP
-          default: '10.20.6.2'
-          description: 'IP of the installer'
-      - string:
-          name: BRIDGE
-          default: 'br6'
-          description: 'pxe bridge for booting of Fuel master'
-
-- parameter:
-    name: 'zte-pod2-defaults'
-    parameters:
-      - node:
-          name: SLAVE_NAME
-          description: 'Slave name on Jenkins'
-          allowed-slaves:
-            - zte-pod2
-          default-slaves:
-            - zte-pod2
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-      - string:
-          name: INSTALLER_IP
-          default: '10.20.7.3'
-          description: 'IP of the installer'
-      - string:
-          name: BRIDGE
-          default: 'br7'
-          description: 'pxe bridge for booting of Daisy master'
-
-- parameter:
-    name: 'zte-pod3-defaults'
-    parameters:
-      - node:
-          name: SLAVE_NAME
-          description: 'Slave name on Jenkins'
-          allowed-slaves:
-            - zte-pod3
-          default-slaves:
-            - zte-pod3
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-      - string:
-          name: INSTALLER_IP
-          default: '10.20.0.2'
-          description: 'IP of the installer'
-      - string:
-          name: BRIDGE
-          default: 'br0'
-          description: 'pxe bridge for booting of Daisy master'
-
-- parameter:
-    name: 'zte-pod9-defaults'
-    parameters:
-      - node:
-          name: SLAVE_NAME
-          description: 'Slave name on Jenkins'
-          allowed-slaves:
-            - zte-pod9
-          default-slaves:
-            - zte-pod9
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-      - string:
-          name: INSTALLER_IP
-          default: '10.20.7.2'
-          description: 'IP of the installer'
-      - string:
-          name: BRIDGE
-          default: 'br0'
-          description: 'pxe bridge for booting of Daisy master'
-
-- parameter:
-    name: zte-virtual5-defaults
-    parameters:
-      - node:
-          name: SLAVE_NAME
-          description: 'Slave name on Jenkins'
-          allowed-slaves:
-            - zte-virtual5
-          default-slaves:
-            - zte-virtual5
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-
-- parameter:
-    name: zte-virtual6-defaults
-    parameters:
-      - node:
-          name: SLAVE_NAME
-          description: 'Slave name on Jenkins'
-          allowed-slaves:
-            - zte-virtual6
-          default-slaves:
-            - zte-virtual6
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-
-- parameter:
-    name: 'juniper-pod1-defaults'
-    parameters:
-      - node:
-          name: SLAVE_NAME
-          description: 'Slave name on Jenkins'
-          allowed-slaves:
-            - juniper-pod1
-          default-slaves:
-            - juniper-pod1
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-      - string:
-          name: CEPH_DISKS
-          default: /srv
-          description: "Disks to use by ceph (comma separated list)"
-
-- parameter:
-    name: 'orange-pod1-defaults'
-    parameters:
-      - node:
-          name: SLAVE_NAME
-          description: 'Slave name on Jenkins'
-          allowed-slaves:
-            - orange-pod1
-          default-slaves:
-            - orange-pod1
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-
-- parameter:
-    name: 'orange-pod2-defaults'
-    parameters:
-      - node:
-          name: SLAVE_NAME
-          description: 'Slave name on Jenkins'
-          allowed-slaves:
-            - orange-pod2
-          default-slaves:
-            - orange-pod2
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-
-- parameter:
-    name: 'orange-pod5-defaults'
-    parameters:
-      - node:
-          name: SLAVE_NAME
-          description: 'Slave name on Jenkins'
-          allowed-slaves:
-            - orange-pod5
-          default-slaves:
-            - orange-pod5
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-
-- parameter:
-    name: 'dell-pod1-defaults'
-    parameters:
-      - node:
-          name: SLAVE_NAME
-          description: 'Slave name on Jenkins'
-          allowed-slaves:
-            - dell-pod1
-          default-slaves:
-            - dell-pod1
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-
-- parameter:
-    name: 'dell-pod2-defaults'
-    parameters:
-      - node:
-          name: SLAVE_NAME
-          description: 'Slave name on Jenkins'
-          allowed-slaves:
-            - dell-pod2
-          default-slaves:
-            - dell-pod2
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-
-- parameter:
-    name: 'nokia-pod1-defaults'
-    parameters:
-      - node:
-          name: SLAVE_NAME
-          description: 'Slave name on Jenkins'
-          allowed-slaves:
-            - nokia-pod1
-          default-slaves:
-            - nokia-pod1
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-      - string:
-          name: SSH_KEY
-          default: /root/.ssh/id_rsa
-          description: 'SSH key to use for Apex'
-
-- parameter:
-    name: 'intel-virtual6-defaults'
-    parameters:
-      - node:
-          name: SLAVE_NAME
-          description: 'Slave name on Jenkins'
-          allowed-slaves:
-            - intel-virtual6
-          default-slaves:
-            - intel-virtual6
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-
-- parameter:
-    name: 'intel-virtual10-defaults'
-    parameters:
-      - node:
-          name: SLAVE_NAME
-          description: 'Slave name on Jenkins'
-          allowed-slaves:
-            - intel-virtual10
-          default-slaves:
-            - intel-virtual10
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-
-- parameter:
-    name: 'doctor-slave-parameter'
-    parameters:
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-
-- parameter:
-    name: 'ericsson-virtual5-defaults'
-    parameters:
-      - label:
-          name: SLAVE_LABEL
-          default: 'ericsson-virtual5'
-          all-nodes: false
-          node-eligibility: 'ignore-offline'
-      - string:
-          name: GIT_BASE
-          default: https://git.opendaylight.org/gerrit/p/$PROJECT.git
-          description: 'Git URL to use on this Jenkins Slave'
-
-- parameter:
-    name: 'ericsson-virtual12-defaults'
-    parameters:
-      - label:
-          name: SLAVE_LABEL
-          default: 'ericsson-virtual12'
-          all-nodes: false
-          node-eligibility: 'ignore-offline'
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-
-- parameter:
-    name: 'ericsson-virtual13-defaults'
-    parameters:
-      - label:
-          name: SLAVE_LABEL
-          default: 'ericsson-virtual13'
-          all-nodes: false
-          node-eligibility: 'ignore-offline'
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-
-- parameter:
-    name: 'ericsson-virtual-pod1bl01-defaults'
-    parameters:
-      - label:
-          name: SLAVE_LABEL
-          default: 'ericsson-virtual-pod1bl01'
-          all-nodes: false
-          node-eligibility: 'ignore-offline'
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-
-- parameter:
-    name: 'odl-netvirt-virtual-defaults'
-    parameters:
-      - label:
-          name: SLAVE_LABEL
-          default: 'odl-netvirt-virtual'
-          all-nodes: false
-          node-eligibility: 'ignore-offline'
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-
-- parameter:
-    name: 'odl-netvirt-virtual-intel-defaults'
-    parameters:
-      - label:
-          name: SLAVE_LABEL
-          default: 'odl-netvirt-virtual-intel'
-          all-nodes: false
-          node-eligibility: 'ignore-offline'
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-
-- parameter:
-    name: 'flex-pod1-defaults'
-    parameters:
-      - node:
-          name: SLAVE_NAME
-          description: 'Slave name on Jenkins'
-          allowed-slaves:
-            - flex-pod1
-          default-slaves:
-            - flex-pod1
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-
-#####################################################
-# These slaves are just dummy slaves for sandbox jobs
-#####################################################
-- parameter:
-    name: 'sandbox-baremetal-defaults'
+    name: 'opnfv-build-defaults'
     parameters:
       - label:
           name: SLAVE_LABEL
-          default: 'sandbox-baremetal'
+          default: 'opnfv-build'
           description: 'Slave label on Jenkins'
           all-nodes: false
           node-eligibility: 'ignore-offline'
@@ -1249,11 +17,11 @@
           description: "Directory where the build artifact will be located upon the completion of the build."
 
 - parameter:
-    name: 'sandbox-virtual-defaults'
+    name: 'opnfv-build-ubuntu-defaults'
     parameters:
       - label:
           name: SLAVE_LABEL
-          default: 'sandbox-virtual'
+          default: 'opnfv-build-ubuntu'
           description: 'Slave label on Jenkins'
           all-nodes: false
           node-eligibility: 'ignore-offline'
@@ -1267,19 +35,16 @@
           description: "Directory where the build artifact will be located upon the completion of the build."
 
 - parameter:
-    name: 'dummy-pod1-defaults'
+    name: 'intel-pod12-defaults'
     parameters:
-      - label:
-          name: SLAVE_LABEL
-          default: 'dummy-pod1'
-          description: 'Slave label on Jenkins'
-          all-nodes: false
-          node-eligibility: 'ignore-offline'
+      - node:
+          name: SLAVE_NAME
+          description: 'Slave name on Jenkins'
+          allowed-slaves:
+            - intel-pod12
+          default-slaves:
+            - intel-pod12
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
           description: 'Git URL to use on this Jenkins Slave'
-      - string:
-          name: BUILD_DIRECTORY
-          default: $WORKSPACE/build_output
-          description: "Directory where the build artifact will be located upon the completion of the build."

diff --git a/jjb/laas/laas.yml b/jjb/laas/laas.yml
index 14141de..1974954 100644 (file)
--- a/jjb/laas/laas.yml
+++ b/jjb/laas/laas.yml
@@ -1,4 +1,22 @@
 ---
+- parameter:
+    name: 'laas-dashboard-defaults'
+    parameters:
+      - label:
+          name: SLAVE_LABEL
+          default: 'laas-dashboard'
+          description: 'Slave label on Jenkins'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
+      - string:
+          name: GIT_BASE
+          default: https://gerrit.opnfv.org/gerrit/$PROJECT
+          description: 'Git URL to use on this Jenkins Slave'
+      - string:
+          name: BUILD_DIRECTORY
+          default: $WORKSPACE/build_output
+          description: "Directory where the build artifact will be located upon the completion of the build."
+
 - project:
     name: laas-dashboard-jobs
 

diff --git a/jjb/releng/opnfv-docker-arm.yaml b/jjb/releng/opnfv-docker-arm.yaml
deleted file mode 100644 (file)
index 8a10a28..0000000
--- a/jjb/releng/opnfv-docker-arm.yaml
+++ /dev/null
@@ -1,215 +0,0 @@
----
-##############################################
-# job configuration for docker build and push
-##############################################
-
-- project:
-
-    name: opnfv-docker-arm
-
-    master: &master
-      stream: master
-      branch: '{stream}'
-      disabled: false
-    euphrates: &euphrates
-      stream: euphrates
-      branch: 'stable/{stream}'
-      disabled: false
-    hunter: &hunter
-      stream: hunter
-      branch: 'stable/{stream}'
-      disabled: false
-    iruya: &iruya
-      stream: iruya
-      branch: 'stable/{stream}'
-      disabled: false
-    jerma: &jerma
-      stream: jerma
-      branch: 'stable/{stream}'
-      disabled: false
-    dovetail-arm-receivers: &dovetail-arm-receivers
-      receivers: >
-          cristina.pauna@enea.com
-          alexandru.avadanii@enea.com
-    storperf-arm-receivers: &storperf-arm-receivers
-      receivers: >
-          cristina.pauna@enea.com
-          alexandru.avadanii@enea.com
-          mbeierl@vmware.com
-    other-receivers: &other-receivers
-      receivers: ''
-
-    dockerfile: "Dockerfile"
-    dockerdir: "docker"
-    docker_repo_name: "opnfv/{project}_aarch64"
-    arch_tag: ""
-    extra_build_args: ""
-
-    # yamllint disable rule:key-duplicates
-    dockerrepo:
-      # projects with jobs for master
-      - 'dovetail':
-          project: 'dovetail'
-          <<: *master
-          <<: *dovetail-arm-receivers
-      - 'storperf-master':
-          project: 'storperf'
-          dockerdir: 'docker/storperf-master'
-          docker_repo_name: 'opnfv/storperf-master'
-          arch_tag: 'aarch64'
-          <<: *master
-          <<: *storperf-arm-receivers
-      - 'storperf-graphite':
-          project: 'storperf'
-          dockerdir: 'docker/storperf-graphite'
-          docker_repo_name: 'opnfv/storperf-graphite'
-          arch_tag: 'aarch64'
-          <<: *master
-          <<: *storperf-arm-receivers
-      - 'storperf-httpfrontend':
-          project: 'storperf'
-          dockerdir: 'docker/storperf-httpfrontend'
-          docker_repo_name: 'opnfv/storperf-httpfrontend'
-          arch_tag: 'aarch64'
-          <<: *master
-          <<: *storperf-arm-receivers
-      - 'storperf-reporting':
-          project: 'storperf'
-          dockerdir: 'docker/storperf-reporting'
-          docker_repo_name: 'opnfv/storperf-reporting'
-          arch_tag: 'aarch64'
-          <<: *master
-          <<: *storperf-arm-receivers
-      - 'storperf-swaggerui':
-          project: 'storperf'
-          dockerdir: 'docker/storperf-swaggerui'
-          docker_repo_name: 'opnfv/storperf-swaggerui'
-          arch_tag: 'aarch64'
-          <<: *master
-          <<: *storperf-arm-receivers
-      - 'storperf-workloadagent':
-          project: 'storperf'
-          dockerdir: 'docker/storperf-workloadagent'
-          docker_repo_name: 'opnfv/storperf-workloadagent'
-          arch_tag: 'aarch64'
-          <<: *master
-          <<: *storperf-arm-receivers
-
-      # projects with jobs for stable/euphrates
-      - 'dovetail':
-          project: 'dovetail'
-          <<: *euphrates
-          <<: *dovetail-arm-receivers
-
-      # projects with jobs for stable/iruya
-      - 'storperf-master':
-          project: 'storperf'
-          dockerdir: 'docker/storperf-master'
-          docker_repo_name: 'opnfv/storperf-master'
-          arch_tag: 'aarch64'
-          <<: *iruya
-          <<: *storperf-arm-receivers
-      - 'storperf-graphite':
-          project: 'storperf'
-          dockerdir: 'docker/storperf-graphite'
-          docker_repo_name: 'opnfv/storperf-graphite'
-          arch_tag: 'aarch64'
-          <<: *iruya
-          <<: *storperf-arm-receivers
-      - 'storperf-httpfrontend':
-          project: 'storperf'
-          dockerdir: 'docker/storperf-httpfrontend'
-          docker_repo_name: 'opnfv/storperf-httpfrontend'
-          arch_tag: 'aarch64'
-          <<: *iruya
-          <<: *storperf-arm-receivers
-      - 'storperf-reporting':
-          project: 'storperf'
-          dockerdir: 'docker/storperf-reporting'
-          docker_repo_name: 'opnfv/storperf-reporting'
-          arch_tag: 'aarch64'
-          <<: *iruya
-          <<: *storperf-arm-receivers
-      - 'storperf-swaggerui':
-          project: 'storperf'
-          dockerdir: 'docker/storperf-swaggerui'
-          docker_repo_name: 'opnfv/storperf-swaggerui'
-          arch_tag: 'aarch64'
-          <<: *iruya
-          <<: *storperf-arm-receivers
-      - 'storperf-workloadagent':
-          project: 'storperf'
-          dockerdir: 'docker/storperf-workloadagent'
-          docker_repo_name: 'opnfv/storperf-workloadagent'
-          arch_tag: 'aarch64'
-          <<: *iruya
-          <<: *storperf-arm-receivers
-
-    # yamllint enable rule:key-duplicates
-    jobs:
-      - '{dockerrepo}-docker-build-arm-push-{stream}'
-
-########################
-# job templates
-########################
-- job-template:
-    name: '{dockerrepo}-docker-build-arm-push-{stream}'
-
-    disabled: '{obj:disabled}'
-
-    parameters: &parameters
-      - project-parameter:
-          project: '{project}'
-          branch: '{branch}'
-      - 'opnfv-build-ubuntu-arm-defaults'
-      - string:
-          name: PUSH_IMAGE
-          default: "true"
-          description: "To enable/disable pushing the image to Dockerhub."
-      - string:
-          name: DOCKER_REPO_NAME
-          default: "{docker_repo_name}"
-          description: "Dockerhub repo to be pushed to."
-      - string:
-          name: GERRIT_REFNAME
-          default: ""
-          description: "Docker tag to be built, e.g. refs/tags/5.0.0, refs/tags/opnfv-5.0.0, refs/tags/5.0.RC1"
-      - string:
-          name: DOCKER_DIR
-          default: "{dockerdir}"
-          description: "Directory containing files needed by the Dockerfile"
-      - string:
-          name: DOCKERFILE
-          default: "{dockerfile}"
-          description: "Dockerfile to use for creating the image."
-      - string:
-          name: ARCH_TAG
-          default: "{arch_tag}"
-          description: "If set, this value will be added to the docker image tag"
-      - string:
-          name: EXTRA_BUILD_ARGS
-          default: "{extra_build_args}"
-          description: "Whitespace separated key=value pairs. If set, these args will be used to build docker image"
-
-    properties:
-      - throttle:
-          max-per-node: 1
-          option: 'project'
-
-    scm:
-      - git-scm
-
-    builders: &builders
-      - shell:
-          !include-raw-escape: ./opnfv-docker.sh
-
-    triggers:
-      - pollscm:
-          cron: "*/30 * * * *"
-      - gerrit-trigger-tag-created:
-          project: '{project}'
-
-    publishers:
-      - email:
-          recipients: '{receivers}'
-      - email-jenkins-admins-on-failure