From ef89690c70e6bd0671ead70d31f2c94bc10edcc3 Mon Sep 17 00:00:00 2001
From: Markos Chandras <mchandras@suse.de>
Date: Thu, 30 Nov 2017 14:11:51 +0000
Subject: 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>
---
 jjb/xci/bifrost-verify-jobs.yml | 5 ++---
 jjb/xci/bifrost-verify.sh       | 8 +++-----
 2 files changed, 5 insertions(+), 8 deletions(-)

(limited to 'jjb')

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,16 +70,15 @@
       - build-blocker:
           use-build-blocker: true
           blocking-jobs:
+            - 'xci-verify-{distro}-.*'
             - '.*-bifrost-verify.*-{type}'
+
           block-level: 'NODE'
 
     parameters:
       - string:
           name: PROJECT_REPO
           default: 'https://git.openstack.org/openstack/bifrost'
-      - string:
-          name: CLONE_LOCATION
-          default: '$WORKSPACE/bifrost'
       - string:
           name: DISTRO
           default: '{distro}'
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"
-- 
cgit 1.2.3-korg