Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Apex: Do not use apex branch in promote gs path
[releng.git]
/
jjb
/
apex
/
apex.yaml
diff --git
a/jjb/apex/apex.yaml
b/jjb/apex/apex.yaml
index
bac98a8
..
15fab23
100644
(file)
--- a/
jjb/apex/apex.yaml
+++ b/
jjb/apex/apex.yaml
@@
-240,7
+240,7
@@
os_version:
- 'queens':
os_version:
- 'queens':
- os_scenario: '
queens
'
+ os_scenario: '
nofeature
'
odl_branch: 'stable/oxygen'
- 'rocky':
os_scenario: 'rocky'
odl_branch: 'stable/oxygen'
- 'rocky':
os_scenario: 'rocky'
@@
-307,7
+307,7
@@
- logrotate-default
- build-blocker:
use-build-blocker: false
- logrotate-default
- build-blocker:
use-build-blocker: false
- block-level: 'NODE'
+ block
ing
-level: 'NODE'
blocking-jobs:
- 'apex-deploy.*'
- throttle:
blocking-jobs:
- 'apex-deploy.*'
- throttle:
@@
-384,7
+384,7
@@
- logrotate-default
- build-blocker:
use-build-blocker: true
- logrotate-default
- build-blocker:
use-build-blocker: true
- block-level: 'NODE'
+ block
ing
-level: 'NODE'
blocking-jobs:
- 'apex-deploy.*'
- 'functest.*'
blocking-jobs:
- 'apex-deploy.*'
- 'functest.*'
@@
-440,13
+440,14
@@
- logrotate-default
- build-blocker:
use-build-blocker: true
- logrotate-default
- build-blocker:
use-build-blocker: true
- block-level: 'NODE'
+ block
ing
-level: 'NODE'
blocking-jobs:
- 'apex-runner.*'
- 'apex-run.*'
- 'apex-virtual-.*'
- 'apex-verify-gate-.*'
- 'odl-netvirt.*'
blocking-jobs:
- 'apex-runner.*'
- 'apex-run.*'
- 'apex-virtual-.*'
- 'apex-verify-gate-.*'
- 'odl-netvirt.*'
+ - 'apex-.*-promote.*'
- throttle:
max-per-node: 1
max-total: 10
- throttle:
max-per-node: 1
max-total: 10
@@
-544,7
+545,7
@@
- logrotate-default
- build-blocker:
use-build-blocker: true
- logrotate-default
- build-blocker:
use-build-blocker: true
- block-level: 'NODE'
+ block
ing
-level: 'NODE'
blocking-jobs:
- 'apex-verify.*'
- 'apex-runner.*'
blocking-jobs:
- 'apex-verify.*'
- 'apex-runner.*'
@@
-656,7
+657,7
@@
- logrotate-default
- build-blocker:
use-build-blocker: true
- logrotate-default
- build-blocker:
use-build-blocker: true
- block-level: 'NODE'
+ block
ing
-level: 'NODE'
blocking-jobs:
- 'apex-verify.*'
- 'apex-runner.*'
blocking-jobs:
- 'apex-verify.*'
- 'apex-runner.*'
@@
-771,7
+772,7
@@
- logrotate-default
- build-blocker:
use-build-blocker: true
- logrotate-default
- build-blocker:
use-build-blocker: true
- block-level: 'NODE'
+ block
ing
-level: 'NODE'
blocking-jobs:
- 'apex-daily.*'
blocking-jobs:
- 'apex-daily.*'
@@
-884,7
+885,7
@@
description: "Used for overriding the PROMOTE"
- string:
name: GS_URL
description: "Used for overriding the PROMOTE"
- string:
name: GS_URL
- default:
$GS_BASE{gs-pathname}/{os_version}/{topology}
+ default:
'gs://artifacts.opnfv.org/apex/{os_version}/{topology}'
description: "User for overriding GS_URL from apex params"
- string:
name: OS_VERSION
description: "User for overriding GS_URL from apex params"
- string:
name: OS_VERSION
@@
-894,11
+895,14
@@
name: ODL_BRANCH
default: '{odl_branch}'
description: ODL branch being used
name: ODL_BRANCH
default: '{odl_branch}'
description: ODL branch being used
-
+ - string:
+ name: FORCE_PROMOTE
+ default: 'False'
+ description: "Used to force promotion and skip CSIT"
properties:
- build-blocker:
use-build-blocker: true
properties:
- build-blocker:
use-build-blocker: true
- block-level: 'NODE'
+ block
ing
-level: 'NODE'
blocking-jobs:
- 'apex-verify.*'
- 'apex-runner.*'
blocking-jobs:
- 'apex-verify.*'
- 'apex-runner.*'
@@
-954,6
+958,7
@@
SSH_KEY_PATH=/tmp/csit/id_rsa
ODL_CONTAINERIZED=true
OS_VERSION=$OS_VERSION
SSH_KEY_PATH=/tmp/csit/id_rsa
ODL_CONTAINERIZED=true
OS_VERSION=$OS_VERSION
+ SKIP_CSIT=$FORCE_PROMOTE
node-parameters: true
kill-phase-on: NEVER
abort-all-job: false
node-parameters: true
kill-phase-on: NEVER
abort-all-job: false
@@
-1026,7
+1031,7
@@
properties:
- build-blocker:
use-build-blocker: true
properties:
- build-blocker:
use-build-blocker: true
- block-level: 'NODE'
+ block
ing
-level: 'NODE'
blocking-jobs:
- 'apex-verify.*'
- 'apex-deploy.*'
blocking-jobs:
- 'apex-verify.*'
- 'apex-deploy.*'
@@
-1132,7
+1137,7
@@
- logrotate-default
- build-blocker:
use-build-blocker: true
- logrotate-default
- build-blocker:
use-build-blocker: true
- block-level: 'NODE'
+ block
ing
-level: 'NODE'
blocking-jobs:
- 'apex-verify.*'
- 'apex-runner.*'
blocking-jobs:
- 'apex-verify.*'
- 'apex-runner.*'
@@
-1201,7
+1206,7
@@
- logrotate-default
- build-blocker:
use-build-blocker: true
- logrotate-default
- build-blocker:
use-build-blocker: true
- block-level: 'NODE'
+ block
ing
-level: 'NODE'
blocking-jobs:
- 'apex-verify.*'
- 'apex-runner.*'
blocking-jobs:
- 'apex-verify.*'
- 'apex-runner.*'