Merge "Moves LaaS Jobs to New Project"

diff --combined jjb/ci_gate_security/opnfv-ci-gate-security.yaml
index 45e6db5,06b192e..649538e
--- 1/jjb/ci_gate_security/opnfv-ci-gate-security.yaml
--- 2/jjb/ci_gate_security/opnfv-ci-gate-security.yaml
+++ b/jjb/ci_gate_security/opnfv-ci-gate-security.yaml
@@@ -22,6 -22,8 +22,6 @@@
        - bottlenecks
        - calipso
        - clover
 -      - compass-containers
 -      - compass4nfv
        - conductor
        - container4nfv
        - cperf
@@@ -48,7 -50,6 +48,6 @@@
        - ovsnfv
        - parser
        - pharos
-       - pharos-tools
        - promise
        - qtip
        - releng
@@@ -150,7 -151,7 +149,7 @@@
                  comment-contains-value: 'recheck'
            projects:
              - project-compare-type: 'REG_EXP'
 -              project-pattern: 'apex|armband|bamboo|barometer|bottlenecks|calipso|compass4nfv|conductor|cperf|daisy|doctor|dovetail|dpacc|enfv|fds|fuel|pharos|releng|sandbox|yardstick|infra|ipv6|kvmfornfv|models|moon'
 +              project-pattern: 'apex|armband|bamboo|barometer|bottlenecks|calipso|conductor|cperf|daisy|doctor|dovetail|dpacc|enfv|fds|fuel|pharos|releng|sandbox|yardstick|infra|ipv6|kvmfornfv|models|moon'
                branches:
                  - branch-compare-type: 'ANT'
                    branch-pattern: '**/{branch}'

diff --combined jjb/global/releng-macros.yaml
index cb6f0f2,8756a91..5b1bdee
--- 1/jjb/global/releng-macros.yaml
--- 2/jjb/global/releng-macros.yaml
+++ b/jjb/global/releng-macros.yaml
@@@ -641,6 -641,17 +641,6 @@@
            recipients: >
              stephen.wong1@huawei.com
  
 -- publisher: &email_compass4nfv_ptl_defaults
 -    name: 'email-compass4nfv-ptl'
 -    publishers:
 -      - email-ext:
 -          <<: *email_ptl_defaults
 -          recipients: >
 -            chigang@huawei.com
 -- publisher:
 -    name: 'email-compass-containers-ptl'
 -    <<: *email_compass4nfv_ptl_defaults
 -
  - publisher:
      name: 'email-conductor-ptl'
      publishers:
@@@ -856,9 -867,14 +856,14 @@@
            <<: *email_ptl_defaults
            recipients: >
              jack@jento.io
- - publisher:
-     name: 'email-pharos-tools-ptl'
-     <<: *email_pharos_ptl_defaults
+ 
+ - publisher: &email_laas_ptl_defaults
+     name: 'email-laas-ptl'
+     publishers:
+       - email-ext:
+         <<: *email_laas_ptl_defaults
+         recipients: >
+           pberberian@iol.unh.edu
  
  - publisher:
      name: 'email-promise-ptl'

diff --combined jjb/global/slave-params.yaml
index d721ff2,c483bd1..b597b30
--- 1/jjb/global/slave-params.yaml
--- 2/jjb/global/slave-params.yaml
+++ b/jjb/global/slave-params.yaml
@@@ -304,6 -304,44 +304,6 @@@
            name: SSH_KEY
            default: /root/.ssh/id_rsa
            description: 'SSH key to use for Apex'
 -- parameter:
 -    name: 'compass-baremetal-defaults'
 -    parameters:
 -      - label:
 -          name: SLAVE_LABEL
 -          default: 'compass-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: 'compass-baremetal-master-defaults'
 -    parameters:
 -      - label:
 -          name: SLAVE_LABEL
 -          default: 'compass-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'
 -
 -- parameter:
 -    name: 'compass-baremetal-branch-defaults'
 -    parameters:
 -      - label:
 -          name: SLAVE_LABEL
 -          default: 'compass-baremetal-branch'
 -          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: 'fuel-baremetal-defaults'
@@@ -405,6 -443,58 +405,6 @@@
            default: /root/.ssh/id_rsa
            description: 'SSH key to use for Apex'
  
 -- parameter:
 -    name: 'compass-virtual-defaults'
 -    parameters:
 -      - label:
 -          name: SLAVE_LABEL
 -          default: 'compass-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: 'compass-arm-virtual-defaults'
 -    parameters:
 -      - label:
 -          name: SLAVE_LABEL
 -          default: 'compass-arm-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: 'compass-virtual-master-defaults'
 -    parameters:
 -      - label:
 -          name: SLAVE_LABEL
 -          default: 'compass-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'
 -
 -- parameter:
 -    name: 'compass-virtual-branch-defaults'
 -    parameters:
 -      - label:
 -          name: SLAVE_LABEL
 -          default: 'compass-virtual-branch'
 -          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: 'fuel-virtual-defaults'
      parameters:
@@@ -539,11 -629,11 +539,11 @@@
            description: "Directory where the build artifact will be located upon the completion of the build."
  
  - parameter:
-     name: 'pharos-dashboard-defaults'
+     name: 'laas-dashboard-defaults'
      parameters:
        - label:
            name: SLAVE_LABEL
-           default: 'pharos-dashboard2'
+           default: 'laas-dashboard'
            description: 'Slave label on Jenkins'
            all-nodes: false
            node-eligibility: 'ignore-offline'