From fdd2fb35cb04b1a4200b721aa64efa1af1317ee8 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Mon, 25 Mar 2019 10:30:56 +0000 Subject: Remove unused scripts Removed various scripts which were part of previous CI configurations. Change-Id: I674c3bb89e049638926fcb2ad6577123117b5d32 --- tools/deploy_aio.sh | 48 ------------------------------- tools/publisher.sh | 64 ----------------------------------------- tox.ini | 83 ----------------------------------------------------- 3 files changed, 195 deletions(-) delete mode 100755 tools/deploy_aio.sh delete mode 100755 tools/publisher.sh diff --git a/tools/deploy_aio.sh b/tools/deploy_aio.sh deleted file mode 100755 index 830e7a7d0..000000000 --- a/tools/deploy_aio.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/bash - -set -o xtrace -set -o errexit - -export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" - -export KOLLA_BASE=$1 -export KOLLA_TYPE=$2 -export KOLLA_ANSIBLE_DIR=$(mktemp -d) - -cat > /tmp/clonemap < /tmp/logs/ansible/get-logs -} - -# Copy configs -sudo cp -a etc/kolla /etc/ -# Generate passwords -export INVENTORY=/tmp/kolla/inventory - -sudo ansible-playbook -i ${INVENTORY} --become tests/ansible_generate_inventory.yml -sudo ansible-playbook -i ${INVENTORY} --become -e action="deploy" -e type=$KOLLA_TYPE -e base=$KOLLA_BASE tests/ansible_generate_config.yml > /tmp/logs/ansible/generate_config - -trap get_logs EXIT - -sudo ip l a fake_interface type dummy - -sudo tools/generate_passwords.py -sudo chmod -R 777 /etc/kolla -sudo tools/kolla-ansible -i ${INVENTORY} -vvv prechecks > /tmp/logs/ansible/prechecks -sudo tools/kolla-ansible -i ${INVENTORY} -vvv deploy > /tmp/logs/ansible/deploy -sudo tools/kolla-ansible -i ${INVENTORY} -vvv post-deploy > /tmp/logs/ansible/post-deploy - -get_logs - -popd diff --git a/tools/publisher.sh b/tools/publisher.sh deleted file mode 100755 index 9ac7d812b..000000000 --- a/tools/publisher.sh +++ /dev/null @@ -1,64 +0,0 @@ -# Script which is run in dockerhub publisher pipeline -# It will organize build/deploy gates and then publish images to final place - -export ZUUL_REF=$ZUUL_REF -export BRANCH=$(echo "$ZUUL_BRANCH" | cut -d/ -f2) -export TMP_REGISTRY="opt/" -export PUBLISHER=1 -export SIGNOFF_FILENAME=${BASE_DISTRO}-${INSTALL_TYPE}-registry-${BRANCH}.txt -export FILENAME=${BASE_DISTRO}-${INSTALL_TYPE}-registry-${BRANCH}.tar.gz - -# Ansible deployment gate to test out images -function deploy_ansible { - export KOLLA_ANSIBLE_DIR=$(mktemp -d) - cat > /tmp/clonemap <> images/$SIGNOFF_FILENAME -} - -# Building images that are supposed to be tested later -if [[ $ACTION == "build" ]]; then - tools/gate_run.sh - sudo touch images/$SIGNOFF_FILENAME - sudo chmod 777 images/$SIGNOFF_FILENAME - - echo http://logs.openstack.org/$LOG_PATH >> images/$SIGNOFF_FILENAME - exit 0 -fi -if [[ $ACTION == "deploy-multinode" ]]; then - if [[ $ORCH_ENGINE == "ansible" ]]; then - deploy_ansible - signoff - exit 0 - fi -fi - -# After all tests pass, move images from temp to final dir on tarballs.o.o -if [[ $ACTION == "save" ]]; then - mkdir -p images/ - wget -q -c -O "/tmp/$FILENAME" \ - "http://tarballs.openstack.org/kolla/images/tmp/$FILENAME" - curl -o /tmp/$SIGNOFF_FILENAME http://tarballs.openstack.org/kolla/images/tmp/$SIGNOFF_FILENAME - gunzip /tmp/$FILENAME - tar -rf /tmp/${BASE_DISTRO}-${INSTALL_TYPE}-registry-${BRANCH}.tar /tmp/$SIGNOFF_FILENAME - gzip /tmp/${BASE_DISTRO}-${INSTALL_TYPE}-registry-${BRANCH}.tar - ls -la /tmp/ - sudo mv /tmp/$FILENAME images/publisher-$FILENAME -fi - diff --git a/tox.ini b/tox.ini index 40848d9e6..e12e28ffa 100644 --- a/tox.ini +++ b/tox.ini @@ -168,89 +168,6 @@ commands = stestr run test_build.BuildTestOracleLinuxSource {toxinidir}/tools/dump_info.sh -[testenv:deploy-centos-binary] -whitelist_externals = find - bash -setenv = - DOCKER_BUILD_TEST=1 -commands = - find . -type f -name "*.py[c|o]" -delete -o -type l -name "*.py[c|o]" -delete - bash -c "if [ ! -d .stestr ]; then stestr init; fi" - stestr run test_build.DeployTestCentosBinary - {toxinidir}/tools/deploy_aio.sh centos binary - {toxinidir}/tools/dump_info.sh - -[testenv:deploy-centos-source] -whitelist_externals = find - bash -setenv = - DOCKER_BUILD_TEST=1 -commands = - find . -type f -name "*.py[c|o]" -delete -o -type l -name "*.py[c|o]" -delete - bash -c "if [ ! -d .stestr ]; then stestr init; fi" - stestr run test_build.DeployTestCentosSource - {toxinidir}/tools/deploy_aio.sh centos source - {toxinidir}/tools/dump_info.sh - -[testenv:deploy-oraclelinux-binary] -whitelist_externals = find - bash -setenv = - DOCKER_BUILD_TEST=1 -commands = - find . -type f -name "*.py[c|o]" -delete -o -type l -name "*.py[c|o]" -delete - bash -c "if [ ! -d .stestr ]; then stestr init; fi" - stestr run test_build.DeployTestOracleLinuxBinary - {toxinidir}/tools/deploy_aio.sh oraclelinux binary - {toxinidir}/tools/dump_info.sh - -[testenv:deploy-oraclelinux-source] -whitelist_externals = find - bash -setenv = - DOCKER_BUILD_TEST=1 -commands = - find . -type f -name "*.py[c|o]" -delete -o -type l -name "*.py[c|o]" -delete - bash -c "if [ ! -d .stestr ]; then stestr init; fi" - stestr run test_build.DeployTestOracleLinuxSource - {toxinidir}/tools/deploy_aio.sh oraclelinux source - {toxinidir}/tools/dump_info.sh - -[testenv:deploy-ubuntu-binary] -whitelist_externals = find - bash -setenv = - DOCKER_BUILD_TEST=1 -commands = - find . -type f -name "*.py[c|o]" -delete -o -type l -name "*.py[c|o]" -delete - bash -c "if [ ! -d .stestr ]; then stestr init; fi" - stestr run test_build.DeployTestUbuntuBinary - {toxinidir}/tools/deploy_aio.sh ubuntu binary - {toxinidir}/tools/dump_info.sh - -[testenv:deploy-ubuntu-source] -whitelist_externals = find - bash -setenv = - DOCKER_BUILD_TEST=1 -commands = - find . -type f -name "*.py[c|o]" -delete -o -type l -name "*.py[c|o]" -delete - bash -c "if [ ! -d .stestr ]; then stestr init; fi" - stestr run test_build.DeployTestUbuntuSource - {toxinidir}/tools/deploy_aio.sh ubuntu source - {toxinidir}/tools/dump_info.sh - -[testenv:deploy-multinode-ubuntu-source] -whitelist_externals = find - bash -setenv = - DOCKER_BUILD_TEST=1 -commands = - find . -type f -name "*.py[c|o]" -delete -o -type l -name "*.py[c|o]" -delete - bash -c "if [ ! -d .stestr ]; then stestr init; fi" - stestr run test_build.BuildTestUbuntuSource - {toxinidir}/tools/dump_info.sh - [testenv:genconfig] whitelist_externals = which commands= -- cgit v1.2.3