summaryrefslogtreecommitdiffstats
path: root/jjb/apex/apex.yml
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2017-04-19 23:33:25 -0400
committerTim Rozet <trozet@redhat.com>2017-04-19 23:33:25 -0400
commit9ddd858db21e9cd1cf01b9462867ed3ed0f28324 (patch)
treeb79c9463a04691438d8f7e6ae980b91060edb7c7 /jjb/apex/apex.yml
parent76ec9e7ab2d834f3e84d02c9696f393eb8139754 (diff)
Apex: more fixes for iso verify
Change-Id: Ie1a59806b20072f27adc2f7248c4244e53a5f2bb Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'jjb/apex/apex.yml')
-rw-r--r--jjb/apex/apex.yml39
1 files changed, 15 insertions, 24 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 248f296e1..3f5ef5a42 100644
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -444,7 +444,9 @@
git-revision: false
same-node: true
block: true
- - 'apex-upload-rpm-artifact'
+ - inject:
+ properties-content: ARTIFACT_TYPE=rpm
+ - 'apex-upload-artifact'
- trigger-builds:
- project: 'apex-verify-iso-{stream}'
predefined-parameters: |
@@ -452,7 +454,9 @@
git-revision: false
block: true
same-node: true
- - 'apex-upload-iso-artifact'
+ - inject:
+ properties-content: ARTIFACT_TYPE=iso
+ - 'apex-upload-artifact'
# ISO verify job
- job-template:
@@ -1066,7 +1070,9 @@
same-node: true
- shell:
!include-raw-escape: ./apex-snapshot-create.sh
- - 'apex-upload-snapshot-artifact'
+ - inject:
+ properties-content: ARTIFACT_TYPE=snapshot
+ - 'apex-upload-artifact'
# FDIO promote
- job-template:
@@ -1114,7 +1120,9 @@
same-node: true
- shell:
!include-raw-escape: ./apex-snapshot-create.sh
- - 'apex-upload-snapshot-artifact'
+ - inject:
+ properties-content: ARTIFACT_TYPE=snapshot
+ - 'apex-upload-artifact'
- job-template:
name: 'apex-gs-clean-{stream}'
@@ -1203,29 +1211,12 @@
- shell:
!include-raw: ./apex-iso-verify.sh
-- builder:
- name: 'apex-upload-rpm-artifact'
- builders:
- - inject:
- properties-content: ARTIFACT_TYPE=rpm
- script-content:
- !include-raw: ./apex-upload-artifact.sh
-
-- builder:
- name: 'apex-upload-iso-artifact'
- builders:
- - inject:
- properties-content: ARTIFACT_TYPE=iso
- script-content:
- !include-raw: ./apex-upload-artifact.sh
- builder:
- name: 'apex-upload-snapshot-artifact'
+ name: 'apex-upload-artifact'
builders:
- - inject:
- properties-content: ARTIFACT_TYPE=snapshot
- script-content:
- !include-raw: ./apex-upload-artifact.sh
+ - shell:
+ !include-raw: ./apex-upload-artifact.sh
- builder:
name: 'apex-gs-cleanup'