summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFeng Pan <fpan@redhat.com>2017-09-07 20:09:46 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-09-07 20:09:46 +0000
commit4c14519e56d9b5a77743f6f2fbc92068d996a649 (patch)
tree6f2a74c36b65becd7e334facb667ceadf7b54bc4
parentb196fa91f1b2b418a2fae558573b77e9895dccfb (diff)
parent288d6a64f9ba8cbbfc9b3bc3783d4830a01b1af8 (diff)
Merge "More cleanup for ci directory"
-rwxr-xr-xapex/tests/smoke_tests/execute_smoke_tests.sh3
-rw-r--r--apex/tests/smoke_tests/execute_tests.yml11
-rw-r--r--apex/tests/smoke_tests/prepare_undercloud.yml9
-rw-r--r--apex/tests/smoke_tests/smoke_tests.yml3
-rwxr-xr-xci/run_smoke_tests.sh13
-rwxr-xr-xci/test.sh31
-rwxr-xr-xcontrib/dev_dep_check.sh (renamed from ci/dev_dep_check.sh)0
7 files changed, 0 insertions, 70 deletions
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/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/ci/dev_dep_check.sh b/contrib/dev_dep_check.sh
index 33f1319f..33f1319f 100755
--- a/ci/dev_dep_check.sh
+++ b/contrib/dev_dep_check.sh