summaryrefslogtreecommitdiffstats
path: root/jjb/xci
diff options
context:
space:
mode:
Diffstat (limited to 'jjb/xci')
-rw-r--r--jjb/xci/bifrost-verify-jobs.yml1
-rwxr-xr-xjjb/xci/bifrost-verify.sh5
-rw-r--r--jjb/xci/xci-verify-jobs.yml8
3 files changed, 5 insertions, 9 deletions
diff --git a/jjb/xci/bifrost-verify-jobs.yml b/jjb/xci/bifrost-verify-jobs.yml
index bbce9748a..e4c2d0e5b 100644
--- a/jjb/xci/bifrost-verify-jobs.yml
+++ b/jjb/xci/bifrost-verify-jobs.yml
@@ -172,6 +172,7 @@
- comment-added-contains-event:
comment-contains-value: 'recheck'
silent-start: true
+ custom-url: '* $JOB_NAME $BUILD_URL'
projects:
- project-compare-type: 'PLAIN'
project-pattern: 'openstack/bifrost'
diff --git a/jjb/xci/bifrost-verify.sh b/jjb/xci/bifrost-verify.sh
index 263f544ad..198f2e1c7 100755
--- a/jjb/xci/bifrost-verify.sh
+++ b/jjb/xci/bifrost-verify.sh
@@ -25,9 +25,6 @@ cd ~/bifrost
# provision 3 VMs; xcimaster, controller, and compute
./scripts/bifrost-provision.sh
-# list the provisioned VMs
-source env-vars
-ironic node-list
sudo -H -E virsh list
EOF
chmod a+x bifrost_test.sh
@@ -44,6 +41,6 @@ export XCI_UPDATE_CLEAN_VM_OS=true
./xci/scripts/vm/start-new-vm.sh $VM_DISTRO
-rsync -a $WORKSPACE/ ${VM_DISTRO}_xci_vm:~/bifrost
+rsync -a -e "ssh -F $HOME/.ssh/xci-vm-config" $WORKSPACE/ ${VM_DISTRO}_xci_vm:~/bifrost
ssh -F $HOME/.ssh/xci-vm-config ${VM_DISTRO}_xci_vm "cd ~/bifrost/releng-xci && ./bifrost_test.sh"
diff --git a/jjb/xci/xci-verify-jobs.yml b/jjb/xci/xci-verify-jobs.yml
index ca14cd9bc..9fa5633a0 100644
--- a/jjb/xci/xci-verify-jobs.yml
+++ b/jjb/xci/xci-verify-jobs.yml
@@ -107,11 +107,6 @@
- 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/**'
forbidden-file-paths:
- compare-type: ANT
pattern: 'prototypes/**'
@@ -121,7 +116,10 @@
pattern: '**/README.rst'
- compare-type: ANT
pattern: 'docs/**'
+ - compare-type: ANT
+ pattern: 'xci/scripts/vm/**'
readable-message: true
+ custom-url: '* $JOB_NAME $BUILD_URL'
skip-vote:
successful: '{obj:successful}'
failed: '{obj:failed}'