summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorDan Radez <dradez@redhat.com>2017-03-30 23:03:43 -0400
committerDan Radez <dradez@redhat.com>2017-05-09 15:09:42 -0400
commitac3a86983e4c049a3115c7bd77eeacaeb19d0ca3 (patch)
treeed0c27aa4853848b0e47e3ce3de25dfb23bfc8df /ci
parentef3dc1ce0323fa0881e416cd4b9028fb4250b719 (diff)
Updating Apex to OpenStack Ocata
- power management updated to virtualbmc, pxe_ssh is deprecated - removing custom tacker build - removing custom congress build - disabling yum update in undercloud on the cli instead of in a patch - Undercloud is direct kernel booted now, there are no kernel and initrd in the disk image from upstream - remove OpenDaylight previous to Carbon JIRA: APEX-433 JIRA: APEX-432 JIRA: APEX-431 Change-Id: I6963f16e65eacade5607a3082b58b6150331406c Signed-off-by: Dan Radez <dradez@redhat.com>
Diffstat (limited to 'ci')
-rw-r--r--ci/PR_revision.log14
-rwxr-xr-xci/build.sh7
-rwxr-xr-xci/clean.sh2
-rwxr-xr-xci/dev_dep_check.sh10
-rwxr-xr-xci/test.sh2
5 files changed, 12 insertions, 23 deletions
diff --git a/ci/PR_revision.log b/ci/PR_revision.log
index 58f3eda..3d7cc2d 100644
--- a/ci/PR_revision.log
+++ b/ci/PR_revision.log
@@ -2,17 +2,3 @@
#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
-96,Add etcd service
-98,Tacker support
-107,Enable ODL clustering
-110,Adding endpoint url definitions for tacker
-109,Adding endpoint url definitions to congress
-115,Increases mariadb open files limit for noha deployments
-116,Adding notifier topic to ceilometer
-114,Use networking-odl v1 driver in bgpvpn
-119,Fixes missing ':' with setting hieradata for mariadb limit
-19,opnfv-puppet-tripleo, Only increases mariadb limit with noha deployments
-120,Add old openflow port (6633) and karaf ssh port (8101)
-123,Disable L3 HA for ODL/FDIO scenarios
-124,setting keystone region for tacker and congress
-111,Backporting OVN fixes
diff --git a/ci/build.sh b/ci/build.sh
index 3531a65..31d7ba6 100755
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -35,7 +35,7 @@ CACHE_DEST=""
CACHE_DIR="${APEX_ROOT}/.cache"
CACHE_NAME="apex-cache"
MAKE_TARGETS="images"
-REQUIRED_PKGS="rpm-build python-docutils"
+REQUIRED_PKGS="rpm-build python-docutils python2-virtualbmc"
RELEASE_RPM=""
parse_cmdline() {
@@ -129,7 +129,10 @@ if [[ -n "$CACHE_DEST" && -n "$MAKE_TARGETS" ]]; then
rm -rf $CACHE_DIR
mkdir $CACHE_DIR
echo "Unpacking Cache to ${CACHE_DIR}"
- tar -xvzf ${CACHE_DEST}/${CACHE_NAME}.tgz -C ${CACHE_DIR}
+ tar -xvzf ${CACHE_DEST}/${CACHE_NAME}.tgz -C ${CACHE_DIR} || {
+ rm ${CACHE_DEST}/${CACHE_NAME}.tgz
+ echo "Cache unpack failed, Will rebuild."
+ }
echo "Cache contents after unpack:"
ls -al ${CACHE_DIR}
else
diff --git a/ci/clean.sh b/ci/clean.sh
index 4335b82..bd48c0d 100755
--- a/ci/clean.sh
+++ b/ci/clean.sh
@@ -102,6 +102,7 @@ for i in $(seq 0 $vm_index); do
/usr/bin/touch /var/lib/libvirt/images/baremetal${i}.qcow2
virsh vol-delete baremetal${i}.qcow2 --pool default 2> /dev/null | xargs echo -n
rm -f /var/lib/libvirt/images/baremetal${i}.qcow2 2> /dev/null
+ if [ -e /root/.vbmc/baremetal$i ]; then vbmc delete baremetal$i; fi
done
for network in ${OPNFV_NETWORK_TYPES}; do
@@ -119,7 +120,6 @@ done
# clean pub keys from root's auth keys
sed -i '/stack@undercloud.localdomain/d' /root/.ssh/authorized_keys
-sed -i '/virtual-power-key/d' /root/.ssh/authorized_keys
# force storage cleanup
diff --git a/ci/dev_dep_check.sh b/ci/dev_dep_check.sh
index 6d0aa11..71cea22 100755
--- a/ci/dev_dep_check.sh
+++ b/ci/dev_dep_check.sh
@@ -32,8 +32,11 @@ if ! sudo yum update -y ipxe-roms-qemu; then
fi
# check for other packages
-for i in epel-release python34-PyYAML openvswitch openstack-tripleo libguestfs libguestfs-tools-c libvirt-python python2-oslo-config python2-debtcollector python34-devel libxslt-devel libxml2-devel; do
-# Make sure deploy deps are installed
+for i in epel-release python34-PyYAML openvswitch openstack-tripleo libguestfs \
+ libguestfs-tools-c libvirt-python python2-oslo-config \
+ python2-debtcollector python34-devel libxslt-devel \
+ libxml2-devel python-virtualbmc; do
+ # Make sure deploy deps are installed
if ! rpm -q $i > /dev/null; then
if ! sudo yum install -y $i; then
echo "Failed to install $i package..."
@@ -49,9 +52,6 @@ sudo pip3 install python-ipmi
# Make sure jinja2 is installed
easy_install-3.4 jinja2
-# TODO(cgoncalves): remove once congress RPM is downloaded from upstream
-easy_install-3.4 tox
-
# Required packages to redirect stdin with virt-customize
if ! sudo yum -y install libguestfs libguestfs-tools libguestfs-tools-c supermin supermin5 supermin-helper perl-Sys-Guestfs python-libguestfs; then
echo "Failed to install supermin/libguestfs packages..."
diff --git a/ci/test.sh b/ci/test.sh
index 4f8a042..3e538ff 100755
--- a/ci/test.sh
+++ b/ci/test.sh
@@ -11,7 +11,7 @@
set -e
# Make sure python dependencies are installed
-for pkg in epel-release python34-devel python34-nose python-pep8; do
+for pkg in iproute epel-release python34-devel python34-nose python34-PyYAML python-pep8 python34-mock; do
if ! rpm -q ${pkg} > /dev/null; then
if ! sudo yum install -y ${pkg}; then
echo "Failed to install ${pkg} package..."