From c13f558f8e46b125b1821c103bc5969b1cb18668 Mon Sep 17 00:00:00 2001 From: Vitaly Gridnev Date: Tue, 30 Aug 2016 13:03:12 +0300 Subject: [PATCH] remove tempest job now we have monolithic tempest plugin which we are testing as part of OpenStack infrastructure tests. Change-Id: Ifb58d08cf13f5738d54f7b55ac9ac97c3655f77d --- config/nodepool/scripts/prepare_node.sh | 1 - config/zuul/layout.yaml | 8 --- jenkins_job_builder/sahara.yaml | 24 ------- slave-scripts/integration-cleanup.sh | 2 - slave-scripts/tempest.sh | 93 ------------------------- 5 files changed, 128 deletions(-) delete mode 100755 slave-scripts/tempest.sh diff --git a/config/nodepool/scripts/prepare_node.sh b/config/nodepool/scripts/prepare_node.sh index 0d155171..94cea1ac 100755 --- a/config/nodepool/scripts/prepare_node.sh +++ b/config/nodepool/scripts/prepare_node.sh @@ -68,7 +68,6 @@ sudo useradd -d /home/jenkins -G sudo -s /bin/bash -m jenkins echo "jenkins ALL=(ALL) NOPASSWD:ALL" | sudo tee /etc/sudoers.d/jenkins sudo mkdir /home/jenkins/.ssh -sudo git clone https://git.openstack.org/openstack/tempest /home/jenkins/tempest sudo chown -R jenkins:jenkins /home/jenkins # create simple openrc file diff --git a/config/zuul/layout.yaml b/config/zuul/layout.yaml index 223cfbc8..5064b7cc 100644 --- a/config/zuul/layout.yaml +++ b/config/zuul/layout.yaml @@ -83,7 +83,6 @@ projects: - gate-sahara-ambari_2.4-c7 - gate-sahara-ambari_2.4-u14 - gate-sahara-pep8-trunk - - tempest-sahara-tests - name: openstack/sahara-tests check: @@ -122,7 +121,6 @@ projects: - name: openstack/python-saharaclient check: - gate-sahara-pep8-trunk - - tempest-saharaclient-tests - name: openstack/sahara-image-elements check: @@ -165,12 +163,6 @@ jobs: - ^doc/.*$ - ^.*\.rst$ - ^.*unit/.* - - name: ^tempest-sahara.*$ - branch: ^(master|stable/liberty|stable/mitaka)$ - skip-if: - - all-files-match-any: - - ^doc/.*$ - - ^.*\.rst$ - name: ^(?!nightly).*-mapr_5.1.*$ branch: ^(master|stable/mitaka)$ files: diff --git a/jenkins_job_builder/sahara.yaml b/jenkins_job_builder/sahara.yaml index a0f6c187..82a2f8da 100644 --- a/jenkins_job_builder/sahara.yaml +++ b/jenkins_job_builder/sahara.yaml @@ -1,21 +1,3 @@ -- job-template: - name: 'tempest-{name}-tests' - defaults: global - builders: - - gerrit-git-prep - - ci-config-prep - - shell: "FUNCTION_PATH=$WORKSPACE/sahara-ci-config/slave-scripts $WORKSPACE/sahara-ci-config/slave-scripts/tempest.sh" - properties: - - zeromq-event - - build-blocker: - blocking-jobs: - - "tempest-.*-tests" - publishers: - - sahara-logs - - console-log - - trigger-cleanup - node: trusty-42 || trusty-43 - - job-template: name: '{pipeline}-{project_name}-{plugin}-{os}' defaults: global @@ -95,7 +77,6 @@ - '{pipeline}-{project_name}-{plugin}-{os}': plugin: - ambari_2.4 - - 'tempest-{name}-tests' - '{pipeline}-sahara_tests-{plugin}-{os}-{release}': plugin: - vanilla_2.7.1 @@ -181,11 +162,6 @@ os: c7 release: mitaka -- project: - name: saharaclient - jobs: - - 'tempest-{name}-tests' - - job: name: gate-sahara-pep8-trunk project-type: freestyle diff --git a/slave-scripts/integration-cleanup.sh b/slave-scripts/integration-cleanup.sh index f5935005..393f1b71 100755 --- a/slave-scripts/integration-cleanup.sh +++ b/slave-scripts/integration-cleanup.sh @@ -20,8 +20,6 @@ else fi if [[ $(echo $PREV_JOB | awk -F '-' '{ print $2 }') =~ ui ]]; then python cleanup.py cleanup .*$PREV_BUILD-selenium.* -elif [ "$job_type" == "tempest" ]; then - python cleanup.py cleanup .*sahara-cluster.* else python cleanup.py cleanup-heat .*$host-$CHANGE_NUMBER-$CLUSTER_HASH.* fi diff --git a/slave-scripts/tempest.sh b/slave-scripts/tempest.sh deleted file mode 100755 index 28667021..00000000 --- a/slave-scripts/tempest.sh +++ /dev/null @@ -1,93 +0,0 @@ -#!/bin/bash -xe - -# source CI credentials -. /home/jenkins/ci_openrc -# source main functions -. $FUNCTION_PATH/functions-common.sh - -project=$(echo $JOB_NAME | awk -F '-' '{ print $2 }') -image_id=$(openstack image list | grep ubuntu-test-image | awk '{print $2}') - -SAHARATESTS_REPO=https://git.openstack.org/openstack/sahara-tests -if [ "$project" == "sahara" ]; then - SAHARA_PATH="$WORKSPACE" - SAHARACLIENT_PATH=/tmp/saharaclient - git clone https://git.openstack.org/openstack/python-saharaclient $SAHARACLIENT_PATH -b $ZUUL_BRANCH -else - SAHARA_PATH=/tmp/sahara - SAHARACLIENT_PATH="$WORKSPACE" - git clone https://git.openstack.org/openstack/sahara $SAHARA_PATH -b $ZUUL_BRANCH -fi -sahara_conf_path=$SAHARA_PATH/etc/sahara/sahara.conf - -# update tempest -pushd /home/jenkins/tempest/ &>/dev/null -git pull -git log --pretty=oneline -n 1 -popd &>/dev/null - -cd /home/jenkins - -TEMPESTPLUGIN_TESTS=0 -if [ -f "$SAHARA_PATH/sahara/tests/tempest/scenario/data_processing/plugin.py" ]; then - # if the file exists, scenario tests are exposed as plugin for tempest - TEMPESTPLUGIN_TESTS=1 -else - cp -r $SAHARA_PATH/sahara/tests/tempest tempest/ -fi - -cd tempest -# create tempest conf file -insert_config_value etc/tempest.conf DEFAULT lock_path /tmp -insert_config_value etc/tempest.conf identity admin_password $OS_PASSWORD -insert_config_value etc/tempest.conf identity admin_tenant_name $OS_TENANT_NAME -insert_config_value etc/tempest.conf identity admin_username $OS_USERNAME -insert_config_value etc/tempest.conf identity password $OS_PASSWORD -insert_config_value etc/tempest.conf identity tenant_name $OS_TENANT_NAME -insert_config_value etc/tempest.conf identity username $OS_USERNAME -insert_config_value etc/tempest.conf identity uri "http://$OPENSTACK_HOST:5000/v2.0/" -insert_config_value etc/tempest.conf identity uri_v3 "http://$OPENSTACK_HOST:5000/v3/" -insert_config_value etc/tempest.conf service_available neutron true -insert_config_value etc/tempest.conf service_available sahara true -insert_config_value etc/tempest.conf data-processing-feature-enabled plugins "fake,vanilla" -public_network_id=$(neutron net-show "public" -f value -c id) -insert_config_value etc/tempest.conf network public_network_id $public_network_id - -if [ "$TEMPESTPLUGIN_TESTS" == "0" ]; then - # create tests file - insert_config_value tempest/scenario/data_processing/etc/sahara_tests.conf data_processing flavor_id 2 - insert_config_value tempest/scenario/data_processing/etc/sahara_tests.conf data_processing ssh_username ubuntu - insert_config_value tempest/scenario/data_processing/etc/sahara_tests.conf data_processing floating_ip_pool public - insert_config_value tempest/scenario/data_processing/etc/sahara_tests.conf data_processing private_network private - insert_config_value tempest/scenario/data_processing/etc/sahara_tests.conf data_processing fake_image_id $image_id -else - insert_config_value etc/tempest.conf compute flavor_ref 2 - insert_config_value etc/tempest.conf scenario ssh_user ubuntu - insert_config_value etc/tempest.conf network floating_network_name public - insert_config_value etc/tempest.conf compute fixed_network_name private - insert_config_value etc/tempest.conf data-processing fake_image_id $image_id -fi - -enable_pypi -sudo pip install $SAHARA_PATH/. --no-cache-dir -write_sahara_main_conf $sahara_conf_path "fake,vanilla" -start_sahara $sahara_conf_path - -# Prepare env and install saharaclient -if [ "$TEMPESTPLUGIN_TESTS" == "0" ]; then - TOXENV="all" -else - TOXENV="all-plugin" -fi -export OS_TEST_TIMEOUT=5400 -tox -e $TOXENV --notest -.tox/$TOXENV/bin/pip install $SAHARACLIENT_PATH/. -.tox/$TOXENV/bin/pip install git+$SAHARATESTS_REPO -# Temporary use additional log file, due to wrong status code from tox scenario tests -# tox -e $TOXENV -- tempest.scenario.data_processing.client_tests || failure "Tempest tests are failed" -tox -e $TOXENV -- '.*sahara.*' | tee tox.log -STATUS=$(grep "\ -\ Failed" tox.log | awk '{print $3}') -if [ "$STATUS" != "0" ]; then failure "Tempest tests have failed"; fi -.tox/$TOXENV/bin/pip freeze > $WORKSPACE/logs/python-tempest-env.txt -unset OS_TEST_TIMEOUT -print_python_env