diff options
Diffstat (limited to 'jjb/apex')
| -rwxr-xr-x | jjb/apex/apex-deploy.sh | 4 | ||||
| -rwxr-xr-x | jjb/apex/apex-download-artifact.sh | 2 | ||||
| -rw-r--r-- | jjb/apex/apex.yaml | 3 | ||||
| -rw-r--r-- | jjb/apex/apex.yaml.j2 | 3 |
4 files changed, 7 insertions, 5 deletions
diff --git a/jjb/apex/apex-deploy.sh b/jjb/apex/apex-deploy.sh index 1bc727d32..4876b8504 100755 --- a/jjb/apex/apex-deploy.sh +++ b/jjb/apex/apex-deploy.sh @@ -141,8 +141,8 @@ if [[ "$JOB_NAME" =~ "virtual" ]]; then fi if [[ "$PROMOTE" == "True" || "$CSIT_ENV_FLAG" == "True" ]]; then - if [[ "$DEPLOY_SCENARIO" =~ "queens" ]]; then - CSIT_ENV="csit-queens-environment.yaml" + if [[ "$OS_VERSION" != "master" ]]; then + CSIT_ENV="csit-${OS_VERSION}-environment.yaml" else CSIT_ENV="csit-environment.yaml" fi diff --git a/jjb/apex/apex-download-artifact.sh b/jjb/apex/apex-download-artifact.sh index 10efbe1a2..bc3311d68 100755 --- a/jjb/apex/apex-download-artifact.sh +++ b/jjb/apex/apex-download-artifact.sh @@ -47,7 +47,7 @@ else RPM_LIST=$(basename $OPNFV_RPM_URL) # find version of RPM VERSION_EXTENSION=$(echo $(basename $RPM_LIST) | grep -Eo '[0-9]+\.[0-9]+-([0-9]{8}|[a-z]+-[0-9]\.[0-9]+)') - if [ "$BRANCH" != 'master' ]; then + if [ "$BRANCH" == 'stable/fraser' ]; then # build RPM List which already includes base Apex RPM RPM_LIST+=" opnfv-apex-undercloud-${VERSION_EXTENSION}.noarch.rpm" RPM_LIST+=" python34-opnfv-apex-${VERSION_EXTENSION}.noarch.rpm" diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml index 0d555c551..5a8f241b1 100644 --- a/jjb/apex/apex.yaml +++ b/jjb/apex/apex.yaml @@ -240,7 +240,7 @@ os_version: - 'queens': - os_scenario: 'queens' + os_scenario: 'nofeature' odl_branch: 'stable/oxygen' - 'rocky': os_scenario: 'rocky' @@ -447,6 +447,7 @@ - 'apex-virtual-.*' - 'apex-verify-gate-.*' - 'odl-netvirt.*' + - 'apex-.*-promote.*' - throttle: max-per-node: 1 max-total: 10 diff --git a/jjb/apex/apex.yaml.j2 b/jjb/apex/apex.yaml.j2 index 5f024965c..908acb62c 100644 --- a/jjb/apex/apex.yaml.j2 +++ b/jjb/apex/apex.yaml.j2 @@ -86,7 +86,7 @@ os_version: - 'queens': - os_scenario: 'queens' + os_scenario: 'nofeature' odl_branch: 'stable/oxygen' - 'rocky': os_scenario: 'rocky' @@ -293,6 +293,7 @@ - 'apex-virtual-.*' - 'apex-verify-gate-.*' - 'odl-netvirt.*' + - 'apex-.*-promote.*' - throttle: max-per-node: 1 max-total: 10 |