From 1dd03598c564756b4b582152945fb8c6ef0f55c8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Ollivier?= Date: Mon, 3 Aug 2020 12:28:25 +0200 Subject: [PATCH] Remove Bottlenecks jobs MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Bottlenecks dropped [1]. https://wiki.opnfv.org/display/PROJ/Project+Directory Change-Id: I7fdca4d205c595090b7fbf7747bf317d3130d7a9 Signed-off-by: Cédric Ollivier --- jjb/bottlenecks/bottlenecks-cleanup.sh | 17 -- jjb/bottlenecks/bottlenecks-project-jobs.yaml | 222 -------------------------- jjb/bottlenecks/bottlenecks-rtd-jobs.yaml | 21 --- jjb/bottlenecks/bottlenecks-run-suite.sh | 125 --------------- 4 files changed, 385 deletions(-) delete mode 100644 jjb/bottlenecks/bottlenecks-cleanup.sh delete mode 100644 jjb/bottlenecks/bottlenecks-project-jobs.yaml delete mode 100644 jjb/bottlenecks/bottlenecks-rtd-jobs.yaml delete mode 100644 jjb/bottlenecks/bottlenecks-run-suite.sh diff --git a/jjb/bottlenecks/bottlenecks-cleanup.sh b/jjb/bottlenecks/bottlenecks-cleanup.sh deleted file mode 100644 index d0e2088c7..000000000 --- a/jjb/bottlenecks/bottlenecks-cleanup.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash -############################################################################## -# Copyright (c) 2016 Huawei Technologies Co.,Ltd 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 -############################################################################## - -#clean up correlated dockers and their images -bash $WORKSPACE/docker/docker_cleanup.sh -d bottlenecks --debug -bash $WORKSPACE/docker/docker_cleanup.sh -d Bottlenecks --debug -bash $WORKSPACE/docker/docker_cleanup.sh -d yardstick --debug -bash $WORKSPACE/docker/docker_cleanup.sh -d kibana --debug -bash $WORKSPACE/docker/docker_cleanup.sh -d elasticsearch --debug -bash $WORKSPACE/docker/docker_cleanup.sh -d influxdb --debug diff --git a/jjb/bottlenecks/bottlenecks-project-jobs.yaml b/jjb/bottlenecks/bottlenecks-project-jobs.yaml deleted file mode 100644 index 456181083..000000000 --- a/jjb/bottlenecks/bottlenecks-project-jobs.yaml +++ /dev/null @@ -1,222 +0,0 @@ ---- -################################################### -# Non-ci jobs for Bottlenecks project -# They will only be enabled on request by projects! -################################################### -- project: - name: bottlenecks-project-jobs - - project: 'bottlenecks' - - jobs: - - 'bottlenecks-verify-{stream}' - - 'bottlenecks-merge-{stream}' - - 'bottlenecks-{suite}-upload-artifacts-{stream}' - - stream: - - master: - branch: '{stream}' - # This is used for common project file storage - gs-pathname: '' - # This is used for different test suite dependent packages storage - gs-packagepath: '/{suite}' - disabled: false - - hunter: &hunter - branch: 'stable/{stream}' - gs-pathname: '/{stream}' - gs-packagepath: '/{stream}/{suite}' - disabled: false - - suite: - - 'posca_stress_traffic' - - 'posca_stress_ping' - -################################ -# job templates -################################ - -- job-template: - name: 'bottlenecks-verify-{stream}' - - disabled: '{obj:disabled}' - - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - 'opnfv-build-ubuntu-defaults' - - scm: - - git-scm-gerrit - - triggers: - - gerrit: - server-name: 'gerrit.opnfv.org' - trigger-on: - - patchset-created-event: - exclude-drafts: 'false' - exclude-trivial-rebase: 'false' - exclude-no-code-change: 'false' - - draft-published-event - - comment-added-contains-event: - comment-contains-value: 'recheck' - - comment-added-contains-event: - comment-contains-value: 'reverify' - projects: - - project-compare-type: 'ANT' - project-pattern: '{project}' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' - - builders: - - bottlenecks-unit-tests - -- job-template: - name: 'bottlenecks-merge-{stream}' - - disabled: '{obj:disabled}' - - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - 'opnfv-build-ubuntu-defaults' - - scm: - - git-scm - - triggers: - - gerrit: - server-name: 'gerrit.opnfv.org' - trigger-on: - - change-merged-event - - comment-added-contains-event: - comment-contains-value: 'remerge' - projects: - - project-compare-type: 'ANT' - project-pattern: '{project}' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' - - builders: - - bottlenecks-hello - -- job-template: - name: 'bottlenecks-{suite}-upload-artifacts-{stream}' - - - disabled: '{obj:disabled}' - - concurrent: true - - properties: - - logrotate-default - - throttle: - enabled: true - max-total: 1 - max-per-node: 1 - option: 'project' - - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - 'opnfv-build-ubuntu-defaults' - - bottlenecks-parameter: - gs-packagepath: '{gs-packagepath}' - - scm: - - git-scm - - builders: - - 'bottlenecks-builder-upload-artifact' - - 'bottlenecks-artifact-workspace-cleanup' - -#################### -# parameter macros -#################### -- parameter: - name: bottlenecks-parameter - parameters: - - string: - name: CACHE_DIR - default: $WORKSPACE/cache{gs-packagepath} - description: "the cache to store packages downloaded from public IP" - - string: - name: SUITE_URL - default: gs://artifacts.opnfv.org/bottlenecks{gs-packagepath} - description: "LF artifacts url for storage of bottlenecks packages" - - string: - name: PACKAGE_URL - default: http://205.177.226.237:9999/bottlenecks{gs-packagepath}/ - description: "the url where we store the packages used for bottlenecks\ - \ rubbos" - -#################################### -# builders for bottlenecks project -#################################### -- builder: - name: bottlenecks-builder-upload-artifact - builders: - - shell: | - #!/bin/bash - set -o errexit - - echo "Bottlenecks: upload to artifacts from the public IP" - - [[ -d $CACHE_DIR ]] || mkdir -p $CACHE_DIR - - for file in $(curl -s $PACKAGE_URL | - grep href | - sed 's/.*href="//' | - sed 's/".*//' | - grep '^[a-zA-Z].*'); do - curl --connect-timeout 10 -o $CACHE_DIR/$file $PACKAGE_URL$file -v - echo "bottlenecks: copy file $CACHE_DIR/$file to $SUITE_URL" - gsutil cp $CACHE_DIR/$file $SUITE_URL - done - -- builder: - name: bottlenecks-artifact-workspace-cleanup - builders: - - shell: | - #!/bin/bash - set -o errexit - - echo "Bottlenecks: cleanup cache used for storage downloaded packages" - - /bin/rm -rf $CACHE_DIR - -- builder: - name: bottlenecks-unit-tests - builders: - - shell: | - #!/bin/bash - set -o errexit - set -o pipefail - - echo "Running unit tests..." - cd $WORKSPACE - virtualenv $WORKSPACE/bottlenecks_venv - source $WORKSPACE/bottlenecks_venv/bin/activate - - # install python packages - easy_install -U setuptools - easy_install -U pip - pip install -r $WORKSPACE/requirements/verify.txt - - # unit tests - /bin/bash $WORKSPACE/verify.sh - - deactivate - -- builder: - name: bottlenecks-hello - builders: - - shell: | - #!/bin/bash - set -o errexit - - echo -e "Wellcome to Bottlenecks! \nMerge event is planning to support more functions! " diff --git a/jjb/bottlenecks/bottlenecks-rtd-jobs.yaml b/jjb/bottlenecks/bottlenecks-rtd-jobs.yaml deleted file mode 100644 index 57ecd802c..000000000 --- a/jjb/bottlenecks/bottlenecks-rtd-jobs.yaml +++ /dev/null @@ -1,21 +0,0 @@ ---- -- project: - name: bottlenecks-rtd - project: bottlenecks - project-name: bottlenecks - - gerrit-skip-vote: true - project-pattern: 'bottlenecks' - rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-bottlenecks/47355/' - rtd-token: '95dd0dbdde4a219b5196ffb86e15401b7b927885' - - stream: - - master: - branch: '{stream}' - disabled: false - - hunter: - branch: 'stable/{stream}' - disabled: false - - jobs: - - '{project-name}-rtd-jobs' diff --git a/jjb/bottlenecks/bottlenecks-run-suite.sh b/jjb/bottlenecks/bottlenecks-run-suite.sh deleted file mode 100644 index 2c044eaa7..000000000 --- a/jjb/bottlenecks/bottlenecks-run-suite.sh +++ /dev/null @@ -1,125 +0,0 @@ -#!/bin/bash -############################################################################## -# Copyright (c) 2017 Huawei Technologies Co.,Ltd 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 -############################################################################## - -#set -e -[[ $GERRIT_REFSPEC_DEBUG == true ]] && redirect="/dev/stdout" || redirect="/dev/null" -BOTTLENECKS_IMAGE=opnfv/bottlenecks -REPORT="True" - -RELENG_REPO=${WORKSPACE}/releng -[ -d ${RELENG_REPO} ] && rm -rf ${RELENG_REPO} -git clone https://gerrit.opnfv.org/gerrit/releng ${RELENG_REPO} >${redirect} - -YARDSTICK_REPO=${WORKSPACE}/yardstick -[ -d ${YARDSTICK_REPO} ] && rm -rf ${YARDSTICK_REPO} -git clone https://gerrit.opnfv.org/gerrit/yardstick ${YARDSTICK_REPO} >${redirect} - -OPENRC=/tmp/admin_rc.sh -OS_CACERT=/tmp/os_cacert - -BOTTLENECKS_CONFIG=/tmp -KUBESTONE_TEST_DIR=/home/opnfv/bottlenecks/testsuites/kubestone/testcases - -# Pulling Bottlenecks docker and passing environment variables -echo "INFO: pulling Bottlenecks docker ${DOCKER_TAG}" -docker pull opnfv/bottlenecks:${DOCKER_TAG} >$redirect - -opts="--privileged=true -id" -envs="-e INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} \ - -e NODE_NAME=${NODE_NAME} -e EXTERNAL_NET=${EXTERNAL_NETWORK} \ - -e BRANCH=${BRANCH} -e GERRIT_REFSPEC_DEBUG=${GERRIT_REFSPEC_DEBUG} \ - -e BOTTLENECKS_DB_TARGET=${BOTTLENECKS_DB_TARGET} -e PACKAGE_URL=${PACKAGE_URL} \ - -e DEPLOY_SCENARIO=${DEPLOY_SCENARIO} -e BUILD_TAG=${BUILD_TAG}" -docker_volume="-v /var/run/docker.sock:/var/run/docker.sock -v /tmp:/tmp" - -cmd="docker run ${opts} ${envs} --name bottlenecks-load-master ${docker_volume} opnfv/bottlenecks:${DOCKER_TAG} /bin/bash" -echo "BOTTLENECKS INFO: running docker run commond: ${cmd}" -${cmd} >$redirect -sleep 5 - -# Run test suite -if [[ $SUITE_NAME == *posca* ]]; then - POSCA_SCRIPT=/home/opnfv/bottlenecks/testsuites/posca - sudo rm -f ${OPENRC} - - if [[ -f ${OPENRC} ]]; then - echo "BOTTLENECKS INFO: openstack credentials path is ${OPENRC}" - cat ${OPENRC} - else - echo "BOTTLENECKS ERROR: couldn't find openstack rc file: ${OPENRC}, please check if the it's been properly provided." - exit 1 - fi - - # Finding and crearting POD description files from different deployments - ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" - - if [ "$INSTALLER_TYPE" == "fuel" ]; then - echo "Fetching id_rsa file from jump_server $INSTALLER_IP..." - sshpass -p r00tme sudo scp $ssh_options root@${INSTALLER_IP}:~/.ssh/id_rsa ${BOTTLENECKS_CONFIG}/id_rsa - fi - - if [ "$INSTALLER_TYPE" == "apex" ]; then - echo "Fetching id_rsa file from jump_server $INSTALLER_IP..." - sudo scp $ssh_options stack@${INSTALLER_IP}:~/.ssh/id_rsa ${BOTTLENECKS_CONFIG}/id_rsa - fi - - set +e - - sudo -H pip install virtualenv - - cd ${RELENG_REPO}/modules - sudo virtualenv venv - source venv/bin/activate - sudo -H pip install -e ./ >/dev/null - sudo -H pip install netaddr - - if [[ ${INSTALLER_TYPE} == fuel ]]; then - options="-u root -p r00tme" - elif [[ ${INSTALLER_TYPE} == apex ]]; then - options="-u stack -k /root/.ssh/id_rsa" - else - echo "Don't support to generate pod.yaml on ${INSTALLER_TYPE} currently." - fi - - deactivate - - sudo rm -rf ${RELENG_REPO}/modules/venv - sudo rm -rf ${RELENG_REPO}/modules/opnfv.egg-info - - set -e - - cd ${WORKSPACE} - - if [ -f ${BOTTLENECKS_CONFIG}/pod.yaml ]; then - echo "FILE: ${BOTTLENECKS_CONFIG}/pod.yaml:" - cat ${BOTTLENECKS_CONFIG}/pod.yaml - else - echo "ERROR: cannot find file ${BOTTLENECKS_CONFIG}/pod.yaml. Please check if it is existing." - sudo ls -al ${BOTTLENECKS_CONFIG} - fi - - # Running test cases through Bottlenecks docker - if [[ $SUITE_NAME == posca_stress_traffic ]]; then - TEST_CASE=posca_factor_system_bandwidth - elif [[ $SUITE_NAME == posca_stress_ping ]]; then - TEST_CASE=posca_factor_ping - else - TEST_CASE=$SUITE_NAME - fi - testcase_cmd="docker exec bottlenecks-load-master python ${POSCA_SCRIPT}/../run_testsuite.py testcase $TEST_CASE $REPORT" - echo "BOTTLENECKS INFO: running test case ${TEST_CASE} with report indicator: ${testcase_cmd}" - ${testcase_cmd} >$redirect -elif [[ $SUITE_NAME == *kubestone* ]]; then - if [[ $SUITE_NAME == kubestone_deployment_capacity ]]; then - TEST_CASE=${KUBESTONE_TEST_DIR}/deployment_capacity.yaml - fi - testcase_cmd="docker exec bottlenecks-load-master python ${KUBESTONE_TEST_DIR}/../stress_test.py -c $TEST_CASE" - echo "BOTTLENECKS INFO: running test case ${TEST_CASE} with report indicator: ${testcase_cmd}" - ${testcase_cmd} >$redirect -fi -- 2.16.6