diff options
| author |   Tim Rozet <trozet@redhat.com> | 2015-12-18 15:05:14 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2015-12-18 15:05:14 +0000 |
| commit | 02bd9f7df86c8f6359ac516b2c0c93116adc77f2 (patch) | |
| tree | 67b53cb1161952666a9aad4c8be68262f23c03bb | |
| parent | 16a999c8ae7b36d471e5e632be3f5cbed66a5f98 (diff) | |
| parent | 8f24ccf47d21f5cb96281605e55665458a0f3459 (diff) | |
Merge "Migrates Apex to virtual deployments to use new slave"
| -rw-r--r-- | jjb/apex/apex.yml | 12 | ||||
| -rw-r--r-- | jjb/functest/functest.yml | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index 14c472b1e..8baf02b01 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -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 @@ # # 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 @@ # 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 @@ # 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 @@ # 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 @@ - 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' diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml index 155bbcfdf..a22e92582 100644 --- a/jjb/functest/functest.yml +++ b/jjb/functest/functest.yml @@ -7,7 +7,7 @@ project: '{name}' pod: - - opnfv-jump-1: + - intel-us-deploy-virtual-2: installer: apex - opnfv-jump-2: installer: fuel |