Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Use pharos repo in daisy master branch"
[releng.git]
/
jjb
/
xci
/
xci-verify-jobs.yml
diff --git
a/jjb/xci/xci-verify-jobs.yml
b/jjb/xci/xci-verify-jobs.yml
index
0a7b960
..
fffd5c2
100644
(file)
--- a/
jjb/xci/xci-verify-jobs.yml
+++ b/
jjb/xci/xci-verify-jobs.yml
@@
-68,8
+68,8
@@
- 'xci-verify-{distro}-.*'
- 'bifrost-verify-{distro}-.*'
- 'bifrost-periodic-{distro}-.*'
- 'xci-verify-{distro}-.*'
- 'bifrost-verify-{distro}-.*'
- 'bifrost-periodic-{distro}-.*'
- - 'osa-verify-{distro}-.*'
- - 'osa-periodic-{distro}-.*'
+ - '
xci-
osa-verify-{distro}-.*'
+ - '
xci-
osa-periodic-{distro}-.*'
block-level: 'NODE'
- throttle:
max-per-node: 2
block-level: 'NODE'
- throttle:
max-per-node: 2
@@
-106,22
+106,12
@@
branches:
- branch-compare-type: 'ANT'
branch-pattern: '**/{branch}'
branches:
- branch-compare-type: 'ANT'
branch-pattern: '**/{branch}'
- disable-strict-forbidden-file-verification: 'true'
- file-paths:
- - compare-type: ANT
- pattern: 'bifrost/**'
- - compare-type: ANT
- pattern: 'xci/**'
+ disable-strict-forbidden-file-verification: 'false'
forbidden-file-paths:
- compare-type: ANT
forbidden-file-paths:
- compare-type: ANT
- pattern: 'prototypes/**'
- - compare-type: ANT
- pattern: 'upstream/**'
- - compare-type: ANT
- pattern: '**/README.rst'
- - compare-type: ANT
- pattern: 'docs/**'
+ pattern: 'xci/scripts/vm/**'
readable-message: true
readable-message: true
+ custom-url: '* $JOB_NAME $BUILD_URL'
skip-vote:
successful: '{obj:successful}'
failed: '{obj:failed}'
skip-vote:
successful: '{obj:successful}'
failed: '{obj:failed}'
@@
-154,7
+144,7
@@
current-parameters: true
predefined-parameters: |
DISTRO={distro}
current-parameters: true
predefined-parameters: |
DISTRO={distro}
- DEPLOY_SCENARIO=os-nosdn-nofeature
-noha
+ DEPLOY_SCENARIO=os-nosdn-nofeature
CLEAN_DIB_IMAGES=$CLEAN_DIB_IMAGES
GERRIT_BRANCH=$GERRIT_BRANCH
GERRIT_REFSPEC=$GERRIT_REFSPEC
CLEAN_DIB_IMAGES=$CLEAN_DIB_IMAGES
GERRIT_BRANCH=$GERRIT_BRANCH
GERRIT_REFSPEC=$GERRIT_REFSPEC
@@
-171,7
+161,7
@@
current-parameters: true
predefined-parameters: |
DISTRO={distro}
current-parameters: true
predefined-parameters: |
DISTRO={distro}
- DEPLOY_SCENARIO=os-nosdn-nofeature
-noha
+ DEPLOY_SCENARIO=os-nosdn-nofeature
CLEAN_DIB_IMAGES=$CLEAN_DIB_IMAGES
FUNCTEST_MODE=tier
FUNCTEST_TIER=healthcheck
CLEAN_DIB_IMAGES=$CLEAN_DIB_IMAGES
FUNCTEST_MODE=tier
FUNCTEST_TIER=healthcheck
@@
-195,8
+185,8
@@
- build-blocker:
use-build-blocker: true
blocking-jobs:
- build-blocker:
use-build-blocker: true
blocking-jobs:
- - 'bifrost-verify-.*'
- - 'bifrost-periodic-.*'
+ - '
.*-
bifrost-verify-.*'
+ - '
.*-
bifrost-periodic-.*'
- 'osa-verify-.*'
- 'osa-periodic-.*'
block-level: 'NODE'
- 'osa-verify-.*'
- 'osa-periodic-.*'
block-level: 'NODE'
@@
-210,7
+200,7
@@
default: 'ubuntu'
- string:
name: DEPLOY_SCENARIO
default: 'ubuntu'
- string:
name: DEPLOY_SCENARIO
- default: 'os-nosdn-nofeature
-noha
'
+ default: 'os-nosdn-nofeature'
- string:
name: FUNCTEST_MODE
default: 'tier'
- string:
name: FUNCTEST_MODE
default: 'tier'
@@
-295,12
+285,12
@@
#!/bin/bash
# skip the deployment if the patch doesn't impact the deployment
#!/bin/bash
# skip the deployment if the patch doesn't impact the deployment
- if [[ "$GERRIT_TOPIC" =~
'skip-verify'
]]; then
+ if [[ "$GERRIT_TOPIC" =~
skip-verify|skip-deployment
]]; then
echo "Skipping the deployment!"
exit 0
fi
echo "Skipping the deployment!"
exit 0
fi
- ssh ${DISTRO}_xci_vm "cd releng-xci && ./xci_test.sh"
+ ssh
-F $HOME/.ssh/xci-vm-config
${DISTRO}_xci_vm "cd releng-xci && ./xci_test.sh"
- builder:
- builder:
@@
-310,7
+300,7
@@
#!/bin/bash
# skip the healthcheck if the patch doesn't impact the deployment
#!/bin/bash
# skip the healthcheck if the patch doesn't impact the deployment
- if [[ "$GERRIT_TOPIC" =~
'skip-verify'
]]; then
+ if [[ "$GERRIT_TOPIC" =~
skip-verify|skip-deployment
]]; then
echo "Skipping the healthcheck!"
exit 0
fi
echo "Skipping the healthcheck!"
exit 0
fi