diff options
| author |   Markos Chandras <mchandras@suse.de> | 2017-11-30 14:11:51 +0000 |
|---|---|---|
| committer | Markos Chandras <mchandras@suse.de> | 2017-11-30 14:18:35 +0000 |
| commit | ef89690c70e6bd0671ead70d31f2c94bc10edcc3 (patch) | |
| tree | bbcda7a298d371358d438cf7afd4031a46108d00 /jjb | |
| parent | b74ac9b3ce17ba5057684588ebbf8d95465b7482 (diff) | |
jjb: xci: bifrost-verify: Simplify bifrost job
We no longer test OPNFV commits that affect bifrost since these are
being tested as part of the XCI jobs. As such, simplify the job to
only test incoming upstream patchsets. Moreover, we need to block
when an XCI job is running since both jobs run on the same hosts and
create the same VMs.
Change-Id: I5c11ae5b6a4d719ec41a6e663ddf6ecbd71ac1a5
Signed-off-by: Markos Chandras <mchandras@suse.de>
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/xci/bifrost-verify-jobs.yml | 5 | ||||
| -rwxr-xr-x | jjb/xci/bifrost-verify.sh | 8 |
2 files changed, 5 insertions, 8 deletions
diff --git a/jjb/xci/bifrost-verify-jobs.yml b/jjb/xci/bifrost-verify-jobs.yml index f8d39b2fb..bbce9748a 100644 --- a/jjb/xci/bifrost-verify-jobs.yml +++ b/jjb/xci/bifrost-verify-jobs.yml @@ -70,7 +70,9 @@ - build-blocker: use-build-blocker: true blocking-jobs: + - 'xci-verify-{distro}-.*' - '.*-bifrost-verify.*-{type}' + block-level: 'NODE' parameters: @@ -78,9 +80,6 @@ name: PROJECT_REPO default: 'https://git.openstack.org/openstack/bifrost' - string: - name: CLONE_LOCATION - default: '$WORKSPACE/bifrost' - - string: name: DISTRO default: '{distro}' - string: diff --git a/jjb/xci/bifrost-verify.sh b/jjb/xci/bifrost-verify.sh index a86ba91c3..438a24366 100755 --- a/jjb/xci/bifrost-verify.sh +++ b/jjb/xci/bifrost-verify.sh @@ -11,15 +11,13 @@ set -o errexit set -o nounset set -o pipefail -git clone https://git.openstack.org/openstack/bifrost $WORKSPACE/bifrost git clone https://gerrit.opnfv.org/gerrit/releng-xci $WORKSPACE/releng-xci -# checkout the patch -cd $CLONE_LOCATION +cd $WORKSPACE git fetch $PROJECT_REPO $GERRIT_REFSPEC && sudo git checkout FETCH_HEAD # combine opnfv and upstream scripts/playbooks -/bin/cp -rf $WORKSPACE/releng-xci/bifrost/* $WORKSPACE/bifrost/ +/bin/cp -rf $WORKSPACE/releng-xci/bifrost/* $WORKSPACE/ cd $WORKSPACE/releng-xci cat > bifrost_test.sh<<EOF @@ -43,6 +41,6 @@ esac ./xci/scripts/vm/start-new-vm.sh $VM_DISTRO -rsync -a $WORKSPACE/releng-xci ${VM_DISTRO}_xci_vm:~/bifrost +rsync -a $WORKSPACE/ ${VM_DISTRO}_xci_vm:~/bifrost ssh -F $HOME/.ssh/xci-vm-config ${VM_DISTRO}_xci_vm "cd ~/bifrost && ./bifrost_test.sh" |