summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
Diffstat (limited to 'ci')
-rw-r--r--ci/PR_revision.log8
-rwxr-xr-xci/clean.sh2
-rwxr-xr-xci/dev_dep_check.sh3
3 files changed, 8 insertions, 5 deletions
diff --git a/ci/PR_revision.log b/ci/PR_revision.log
index 3d7cc2de..ad444013 100644
--- a/ci/PR_revision.log
+++ b/ci/PR_revision.log
@@ -1,4 +1,6 @@
-#Dummy file used to store history of PRs
+#Dummy file used to store history of commits to apex 3rd party projects
#Note this is only needed for triggering commits with no code change in
-#Apex, but changes do occur in opnfv-tht
-#PR number, PR Title
+#Apex, but changes do occur in 3rd party projects
+#3rd party project, Change ID
+apex-tripleo-heat-templates, Ie108ab75cce0cb7d89e72637c600e30fc241d186
+apex-puppet-tripleo, Ic9a955a1c2afc040b2f9c6fb86573c04a60f9f31
diff --git a/ci/clean.sh b/ci/clean.sh
index bd48c0d1..fba1f126 100755
--- a/ci/clean.sh
+++ b/ci/clean.sh
@@ -89,7 +89,7 @@ fi
# Clean off instack/undercloud VM
for vm in instack undercloud; do
virsh destroy $vm 2> /dev/null | xargs echo -n
- virsh undefine $vm 2> /dev/null | xargs echo -n
+ virsh undefine --nvram $vm 2> /dev/null | xargs echo -n
/usr/bin/touch /var/lib/libvirt/images/${vm}.qcow2
virsh vol-delete ${vm}.qcow2 --pool default 2> /dev/null | xargs echo -n
rm -f /var/lib/libvirt/images/${vm}.qcow2 2> /dev/null
diff --git a/ci/dev_dep_check.sh b/ci/dev_dep_check.sh
index fe4976a1..7a14563c 100755
--- a/ci/dev_dep_check.sh
+++ b/ci/dev_dep_check.sh
@@ -35,7 +35,8 @@ fi
for i in epel-release python34-PyYAML openvswitch libguestfs \
libguestfs-tools-c libvirt-python python2-oslo-config \
python2-debtcollector python34-devel libxslt-devel \
- libxml2-devel python-virtualbmc python34-jinja2 python34-pip; do
+ libxml2-devel python-virtualbmc python34-jinja2 python34-pip \
+ rpm-build wget libvirt ntpdate; do
# Make sure deploy deps are installed
if ! rpm -q $i > /dev/null; then
if ! sudo yum install -y $i; then