summaryrefslogtreecommitdiffstats
path: root/jjb/apex/apex.yml.j2
diff options
context:
space:
mode:
Diffstat (limited to 'jjb/apex/apex.yml.j2')
-rw-r--r--jjb/apex/apex.yml.j238
1 files changed, 4 insertions, 34 deletions
diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2
index 1df6e154c..3f10e214b 100644
--- a/jjb/apex/apex.yml.j2
+++ b/jjb/apex/apex.yml.j2
@@ -593,6 +593,9 @@
current-parameters: true
predefined-parameters: |
OPNFV_CLEAN=yes
+ GERRIT_BRANCH=$GERRIT_BRANCH
+ GERRIT_REFSPEC=
+ DEPLOY_SCENARIO=$DEPLOY_SCENARIO
kill-phase-on: FAILURE
abort-all-job: true
git-revision: false
@@ -929,30 +932,6 @@
abort-all-job: true
git-revision: false
-- job-template:
- name: 'apex-gs-clean-{stream}'
-
- # Job template for clean
- #
- # Required Variables:
- # stream: branch with - in place of / (eg. stable)
- node: '{slave}'
-
- disabled: false
-
- parameters:
- - project-parameter:
- project: '{project}'
- branch: '{branch}'
- - apex-parameter:
- gs-pathname: '{gs-pathname}'
-
- builders:
- - 'apex-gs-clean'
-
- triggers:
- - 'apex-gs-clean-{stream}'
-
########################
# parameter macros
########################
@@ -1029,12 +1008,6 @@
!include-raw: ./apex-download-artifact.sh
- builder:
- name: 'apex-gs-cleanup'
- builders:
- - shell:
- !include-raw: ./apex-gs-cleanup.sh
-
-- builder:
name: 'apex-deploy'
builders:
- shell:
@@ -1051,7 +1024,4 @@
name: 'apex-danube'
triggers:
- timed: '0 12 * * *'
-- trigger:
- name: 'apex-gs-clean-{stream}'
- triggers:
- - timed: '0 2 * * *'
+