diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-05-26 13:50:38 -0400 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2016-05-26 15:38:43 -0400 |
| commit | 56e0013634afa6424eac9e2819faae0ad6eead39 (patch) | |
| tree | 11b0978574d7389d68950bd802f4ff9c762c5fe7 /jjb/apex/apex.yml | |
| parent | 1a5bfeacf2743cde6336e0e3f4e5f8be18a6237f (diff) | |
Apex: Converges separate virtual and baremetal deploy scripts
Changes Include:
- Combined apex-deploy-baremetal and apex-deploy-virtual into the
apex-deploy.sh
into functions
- JJB modified to only use single builder for deploy
Change-Id: Ia129d8d6004b36c09bdb01685f2a0fced13bccea
Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'jjb/apex/apex.yml')
| -rw-r--r-- | jjb/apex/apex.yml | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index ed06113d5..c121d635f 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -412,7 +412,7 @@ max-total: 10 builders: - - 'apex-deploy-virtual' + - 'apex-deploy' - 'apex-workspace-cleanup' - job-template: @@ -453,7 +453,7 @@ builders: - - 'apex-deploy-baremetal' + - 'apex-deploy' - 'apex-workspace-cleanup' # Brahmaputra Daily @@ -754,16 +754,11 @@ !include-raw: ./apex-gs-cleanup.sh - builder: - name: 'apex-deploy-virtual' + name: 'apex-deploy' builders: - shell: - !include-raw: ./apex-deploy-virtual.sh + !include-raw: ./apex-deploy.sh -- builder: - name: 'apex-deploy-baremetal' - builders: - - shell: - !include-raw: ./apex-deploy-baremetal.sh ####################### # trigger macros |