diff options
| author |   Tim Rozet <trozet@redhat.com> | 2018-06-20 18:39:07 -0400 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2018-06-20 18:39:07 -0400 |
| commit | 585ae3468c2c7dc1387687bf5e71a9d61c6b15c7 (patch) | |
| tree | 7607e5f432a18783585637b2825a7ba40ab6faa9 | |
| parent | d46debf65ce98f7df8ef8d7d677126225ed2c51c (diff) | |
Apex: fix parameter passing to snapshot jobs
GS_URL is required for the builders with the snapshot related jobs.
Change-Id: I4b194bbf5646361c527b522a25b71d4c268d9b6c
Signed-off-by: Tim Rozet <trozet@redhat.com>
| -rw-r--r-- | jjb/apex/apex.yaml | 20 | ||||
| -rw-r--r-- | jjb/apex/apex.yaml.j2 | 20 |
2 files changed, 16 insertions, 24 deletions
diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml index 9ad72e404..249fb0a90 100644 --- a/jjb/apex/apex.yaml +++ b/jjb/apex/apex.yaml @@ -752,13 +752,11 @@ - job-template: name: 'apex-create-snapshot' - # Job template for clean - # - # Required Variables: - # stream: branch with - in place of / (eg. stable) - disabled: false + parameters: + - '{project}-defaults' + builders: - shell: !include-raw-escape: ./apex-snapshot-create.sh @@ -767,13 +765,11 @@ - job-template: name: 'apex-upload-snapshot' - # Job template for clean - # - # Required Variables: - # stream: branch with - in place of / (eg. stable) - disabled: false + parameters: + - '{project}-defaults' + builders: - inject: properties-content: ARTIFACT_TYPE=snapshot @@ -847,7 +843,7 @@ condition: SUCCESSFUL projects: - name: 'apex-create-snapshot' - current-parameters: false + current-parameters: true predefined-parameters: | SNAP_TYPE=csit node-parameters: true @@ -859,7 +855,7 @@ condition: SUCCESSFUL projects: - name: 'apex-upload-snapshot' - current-parameters: false + current-parameters: true predefined-parameters: | SNAP_TYPE=csit node-parameters: true diff --git a/jjb/apex/apex.yaml.j2 b/jjb/apex/apex.yaml.j2 index 29ddef9c9..166e7a07b 100644 --- a/jjb/apex/apex.yaml.j2 +++ b/jjb/apex/apex.yaml.j2 @@ -624,13 +624,11 @@ - job-template: name: 'apex-create-snapshot' - # Job template for clean - # - # Required Variables: - # stream: branch with - in place of / (eg. stable) - disabled: false + parameters: + - '{project}-defaults' + builders: - shell: !include-raw-escape: ./apex-snapshot-create.sh @@ -639,13 +637,11 @@ - job-template: name: 'apex-upload-snapshot' - # Job template for clean - # - # Required Variables: - # stream: branch with - in place of / (eg. stable) - disabled: false + parameters: + - '{project}-defaults' + builders: - inject: properties-content: ARTIFACT_TYPE=snapshot @@ -719,7 +715,7 @@ condition: SUCCESSFUL projects: - name: 'apex-create-snapshot' - current-parameters: false + current-parameters: true predefined-parameters: | SNAP_TYPE=csit node-parameters: true @@ -731,7 +727,7 @@ condition: SUCCESSFUL projects: - name: 'apex-upload-snapshot' - current-parameters: false + current-parameters: true predefined-parameters: | SNAP_TYPE=csit node-parameters: true |