Merge "Migrates Apex to virtual deployments to use new slave"

diff --combined jjb/apex/apex.yml
index 14c472b,b537b8b..8baf02b
--- 1/jjb/apex/apex.yml
--- 2/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@@ -20,7 -20,7 +20,7 @@@
  - job-template:
      name: 'apex-verify-{stream}'
  
-     node: opnfv-jump-1
+     node: intel-us-deploy-virtual-2
  
      parameters:
          - apex-parameter:
@@@ -80,7 -80,7 +80,7 @@@
      #
      # This job's purpose is to update all the JJB
  
-     node: opnfv-jump-1
+     node: intel-us-deploy-virtual-2
  
      disabled: true
  
@@@ -131,7 -131,7 +131,7 @@@
      # Required Variables:
      #     stream:    branch with - in place of / (eg. stable)
      #     branch:    branch (eg. stable)
-     node: opnfv-jump-1
+     node: intel-us-deploy-virtual-2
  
      disabled: false
  
@@@ -167,7 -167,7 +167,7 @@@
      # Required Variables:
      #     stream:    branch with - in place of / (eg. stable)
      #     branch:    branch (eg. stable)
-     node: opnfv-jump-1
+     node: intel-us-deploy-virtual-2
  
      disabled: false
  
@@@ -222,7 -222,7 +222,7 @@@
      # Required Variables:
      #     stream:    branch with - in place of / (eg. stable)
      #     branch:    branch (eg. stable)
-     node: opnfv-jump-1
+     node: intel-us-deploy-virtual-2
  
      disabled: false
  
@@@ -259,7 -259,7 +259,7 @@@
          - trigger-builds:
            - project: 'apex-deploy-baremetal-{stream}'
          - trigger-builds:
-           - project: 'functest-apex-opnfv-jump-1-daily-{stream}'
+           - project: 'functest-apex-intel-us-deploy-virtual-2-daily-{stream}'
              block: true
              block-thresholds:
                  build-step-failure-threshold: 'never'
@@@ -425,7 -425,7 +425,7 @@@
              # cleanup virtual machines before we start
              sudo opnfv-clean
              # initiate virtual deployment
 -            sudo opnfv-deploy -v -d /usr/share/doc/opnfv/deploy_settings.yaml.example
 +            sudo opnfv-deploy -v
  
              echo
              echo "--------------------------------------------------------"