From 288d6a64f9ba8cbbfc9b3bc3783d4830a01b1af8 Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Wed, 6 Sep 2017 18:15:08 -0400 Subject: More cleanup for ci directory Changes Include: - Moves dev_dep_check.sh to contrib dir as it is not used by our CI - Removes test.sh as it is not used by CI. tox can be invoked directly for developers. - Removes run_smoke_tests.sh which is not used anymore Change-Id: I59e39be0ce8b23234c70bf066aebf894b6d73388 Signed-off-by: Tim Rozet --- apex/tests/smoke_tests/execute_smoke_tests.sh | 3 -- apex/tests/smoke_tests/execute_tests.yml | 11 ------ apex/tests/smoke_tests/prepare_undercloud.yml | 9 ----- apex/tests/smoke_tests/smoke_tests.yml | 3 -- ci/dev_dep_check.sh | 55 --------------------------- ci/run_smoke_tests.sh | 13 ------- ci/test.sh | 31 --------------- contrib/dev_dep_check.sh | 55 +++++++++++++++++++++++++++ 8 files changed, 55 insertions(+), 125 deletions(-) delete mode 100755 apex/tests/smoke_tests/execute_smoke_tests.sh delete mode 100644 apex/tests/smoke_tests/execute_tests.yml delete mode 100644 apex/tests/smoke_tests/prepare_undercloud.yml delete mode 100644 apex/tests/smoke_tests/smoke_tests.yml delete mode 100755 ci/dev_dep_check.sh delete mode 100755 ci/run_smoke_tests.sh delete mode 100755 ci/test.sh create mode 100755 contrib/dev_dep_check.sh diff --git a/apex/tests/smoke_tests/execute_smoke_tests.sh b/apex/tests/smoke_tests/execute_smoke_tests.sh deleted file mode 100755 index 27f95251..00000000 --- a/apex/tests/smoke_tests/execute_smoke_tests.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -python ~/snaps/snaps/test_runner.py -e ~stack/overcloudrc -n external -c -a -i -f -k -l INFO &> ~stack/smoke-tests.out \ No newline at end of file diff --git a/apex/tests/smoke_tests/execute_tests.yml b/apex/tests/smoke_tests/execute_tests.yml deleted file mode 100644 index 5042d230..00000000 --- a/apex/tests/smoke_tests/execute_tests.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -- hosts: all - become: yes - become_method: sudo - become_user: root - - tasks: - - name: Copy execute_smoke_tests.sh - copy: src=execute_smoke_tests.sh dest=~/execute_smoke_tests.sh mode=0755 - - name: Execute Tests - command: sh ~/execute_smoke_tests.sh | tee ~/unit_tests.out \ No newline at end of file diff --git a/apex/tests/smoke_tests/prepare_undercloud.yml b/apex/tests/smoke_tests/prepare_undercloud.yml deleted file mode 100644 index 7ad769c0..00000000 --- a/apex/tests/smoke_tests/prepare_undercloud.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -- hosts: all - become: yes - become_method: sudo - become_user: root - - tasks: - - git: repo=https://gerrit.opnfv.org/gerrit/snaps dest=~/snaps - - command: pip install -e ~/snaps/ diff --git a/apex/tests/smoke_tests/smoke_tests.yml b/apex/tests/smoke_tests/smoke_tests.yml deleted file mode 100644 index b67c194f..00000000 --- a/apex/tests/smoke_tests/smoke_tests.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -- include: prepare_undercloud.yml -- include: execute_tests.yml \ No newline at end of file diff --git a/ci/dev_dep_check.sh b/ci/dev_dep_check.sh deleted file mode 100755 index 33f1319f..00000000 --- a/ci/dev_dep_check.sh +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/sh -############################################################################## -# Copyright (c) 2016 Dan Radez (Red Hat) and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - -# This script makes sure deploy deps are installed when not relying on RPM - -set -e - -rdo_action="update" - -# check for rdo-release -if ! rpm -q rdo-release > /dev/null; then - rdo_action="install" -fi - -# make sure rdo release -if ! sudo yum $rdo_action -y https://www.rdoproject.org/repos/rdo-release.rpm; then - echo "Failed to $rdo_action RDO Release package..." - exit 1 -fi - -# update ipxe-roms-qemu -if ! sudo yum update -y ipxe-roms-qemu; then - echo "Failed to update ipxe-roms-qemu package..." - exit 1 -fi - -# check for other packages -for i in epel-release openvswitch libguestfs \ - libguestfs-tools-c libvirt-python libxslt-devel \ - libxml2-devel ansible 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 - echo "Failed to install $i package..." - exit 1 - fi - fi -done - -# install pip dependencies -sudo pip3 install python-ipmi gitpython pygerrit2 - -# 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..." - exit 1 -fi diff --git a/ci/run_smoke_tests.sh b/ci/run_smoke_tests.sh deleted file mode 100755 index 517822ef..00000000 --- a/ci/run_smoke_tests.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash - -export ANSIBLE_HOST_KEY_CHECKING=False - -./dev_dep_check.sh - -yum install python-devel -y -yum install openssl-devel -y -easy_install pip -pip install ansible - -echo 'See ~stack/smoke-tests.out on the undercloud for result log' -ansible-playbook -i "$(get_undercloud_ip)," ../tests/smoke_tests/smoke_tests.yml diff --git a/ci/test.sh b/ci/test.sh deleted file mode 100755 index 72de24e8..00000000 --- a/ci/test.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -############################################################################## -# Copyright (c) 2016 Dan Radez (Red Hat) -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - -set -e - -# Make sure python dependencies are installed -for pkg in yamllint rpmlint iproute epel-release python34-devel python34-nose python34-PyYAML python-pep8 python34-mock python34-pip; do - if ! rpm -q ${pkg} > /dev/null; then - if ! sudo yum install -y ${pkg}; then - echo "Failed to install ${pkg} package..." - exit 1 - fi - fi -done - -# Make sure coverage is installed -if ! python3 -c "import coverage" &> /dev/null; then sudo pip3.4 coverage; fi - -pushd ../build/ > /dev/null -make rpmlint -make python-pep8-check -make yamllint -make python-tests -popd > /dev/null diff --git a/contrib/dev_dep_check.sh b/contrib/dev_dep_check.sh new file mode 100755 index 00000000..33f1319f --- /dev/null +++ b/contrib/dev_dep_check.sh @@ -0,0 +1,55 @@ +#!/bin/sh +############################################################################## +# Copyright (c) 2016 Dan Radez (Red Hat) and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +# This script makes sure deploy deps are installed when not relying on RPM + +set -e + +rdo_action="update" + +# check for rdo-release +if ! rpm -q rdo-release > /dev/null; then + rdo_action="install" +fi + +# make sure rdo release +if ! sudo yum $rdo_action -y https://www.rdoproject.org/repos/rdo-release.rpm; then + echo "Failed to $rdo_action RDO Release package..." + exit 1 +fi + +# update ipxe-roms-qemu +if ! sudo yum update -y ipxe-roms-qemu; then + echo "Failed to update ipxe-roms-qemu package..." + exit 1 +fi + +# check for other packages +for i in epel-release openvswitch libguestfs \ + libguestfs-tools-c libvirt-python libxslt-devel \ + libxml2-devel ansible 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 + echo "Failed to install $i package..." + exit 1 + fi + fi +done + +# install pip dependencies +sudo pip3 install python-ipmi gitpython pygerrit2 + +# 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..." + exit 1 +fi -- cgit 1.2.3-korg