From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Mon, 3 Aug 2020 10:15:32 +0000 (+0200)
Subject: Remove YardStick jobs
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=caefddf4e9700f0eccb3f527e54861fd8d26daae;p=releng.git

Remove YardStick jobs

YardStick dropped [1].

https://wiki.opnfv.org/display/PROJ/Project+Directory

Change-Id: Iea12e3ef667d8dd031b40ab850c4681971ac1d3d
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---

diff --git a/jjb/yardstick/yardstick-cleanup.sh b/jjb/yardstick/yardstick-cleanup.sh
deleted file mode 100755
index 47bf9bd10..000000000
--- a/jjb/yardstick/yardstick-cleanup.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-[[ ${CI_DEBUG} == true ]] && redirect="/dev/stdout" || redirect="/dev/null"
-
-# Remove containers along with image opnfv/yardstick*:<none>
-dangling_images=($(docker images -f "dangling=true" | awk '/opnfv[/]yardstick/ {print $3}'))
-if [[ ${#dangling_images[@]} -eq 0 ]] ; then
-    echo "Removing opnfv/yardstick:<none> images and their containers..."
-    for image_id in "${dangling_images[@]}"; do
-        echo "      Removing image_id: $image_id and its containers"
-        containers=$(docker ps -a | awk "/${image_id}/ {print \$1}")
-        if [[ -n "$containers" ]];then
-            docker rm -f "${containers}" >${redirect}
-        fi
-        docker rmi "${image_id}" >${redirect}
-    done
-fi
-
-echo "Cleaning up docker containers/images..."
-# Remove previous running containers if exist
-if docker ps -a | grep -q opnfv/yardstick; then
-    echo "Removing existing opnfv/yardstick containers..."
-    docker ps -a | awk "/${image_id}/ {print \$1}" | xargs docker rm -f >${redirect}
-
-fi
-
-# Remove existing images if exist
-if docker images | grep -q opnfv/yardstick; then
-    echo "Docker images to remove:"
-    docker images | head -1 && docker images | grep opnfv/yardstick
-    image_ids=($(docker images | awk '/opnfv[/]yardstick/ {print $3}'))
-    for id in "${image_ids[@]}"; do
-        echo "Removing docker image id $id..."
-        docker rmi "${id}" >${redirect}
-    done
-fi
-
diff --git a/jjb/yardstick/yardstick-daily-jobs.yaml b/jjb/yardstick/yardstick-daily-jobs.yaml
deleted file mode 100644
index e12eee79f..000000000
--- a/jjb/yardstick/yardstick-daily-jobs.yaml
+++ /dev/null
@@ -1,509 +0,0 @@
----
-###################################
-# job configuration for yardstick
-###################################
-- project:
-    name: yardstick
-
-    project: '{name}'
-
-    # -------------------------------
-    # BRANCH ANCHORS
-    # -------------------------------
-    master: &master
-      stream: master
-      branch: '{stream}'
-      gs-pathname: ''
-      docker-tag: 'latest'
-    hunter: &hunter
-      stream: hunter
-      branch: 'stable/{stream}'
-      gs-pathname: '{stream}'
-      docker-tag: 'stable'
-    # -------------------------------
-    # POD, INSTALLER, AND BRANCH MAPPING
-    # -------------------------------
-    #    Installers using labels
-    #            CI PODs
-    # This section should only contain the installers
-    # that have been switched using labels for slaves
-    # -------------------------------
-    pod:
-      # apex CI PODs
-      - virtual:
-          slave-label: apex-virtual-master
-          installer: apex
-          auto-trigger-name: 'daily-trigger-disabled'
-          <<: *master
-      - baremetal:
-          slave-label: apex-baremetal-master
-          installer: apex
-          auto-trigger-name: 'daily-trigger-disabled'
-          <<: *master
-      - virtual:
-          slave-label: apex-virtual-master
-          installer: apex
-          auto-trigger-name: 'daily-trigger-disabled'
-          <<: *hunter
-      - baremetal:
-          slave-label: apex-baremetal-master
-          installer: apex
-          auto-trigger-name: 'daily-trigger-disabled'
-          <<: *hunter
-      # fuel CI PODs
-      - baremetal:
-          slave-label: fuel-baremetal
-          installer: fuel
-          auto-trigger-name: 'daily-trigger-disabled'
-          <<: *master
-      - virtual:
-          slave-label: fuel-virtual
-          installer: fuel
-          auto-trigger-name: 'daily-trigger-disabled'
-          <<: *master
-      - baremetal:
-          slave-label: fuel-baremetal
-          installer: fuel
-          auto-trigger-name: 'daily-trigger-disabled'
-          <<: *hunter
-      - virtual:
-          slave-label: fuel-virtual
-          installer: fuel
-          auto-trigger-name: 'daily-trigger-disabled'
-          <<: *hunter
-      # armband CI PODs
-      - armband-baremetal:
-          slave-label: armband-baremetal
-          installer: fuel
-          auto-trigger-name: 'daily-trigger-disabled'
-          <<: *master
-      - armband-virtual:
-          slave-label: armband-virtual
-          installer: fuel
-          auto-trigger-name: 'daily-trigger-disabled'
-          <<: *master
-      - armband-baremetal:
-          slave-label: armband-baremetal
-          installer: fuel
-          auto-trigger-name: 'daily-trigger-disabled'
-          <<: *hunter
-      - armband-virtual:
-          slave-label: armband-virtual
-          installer: fuel
-          auto-trigger-name: 'daily-trigger-disabled'
-          <<: *hunter
-      # joid CI PODs
-      - baremetal:
-          slave-label: joid-baremetal
-          installer: joid
-          auto-trigger-name: 'daily-trigger-disabled'
-          <<: *master
-      - virtual:
-          slave-label: joid-virtual
-          installer: joid
-          auto-trigger-name: 'daily-trigger-disabled'
-          <<: *master
-      - baremetal:
-          slave-label: joid-baremetal
-          installer: joid
-          auto-trigger-name: 'daily-trigger-disabled'
-          <<: *hunter
-      - virtual:
-          slave-label: joid-virtual
-          installer: joid
-          auto-trigger-name: 'daily-trigger-disabled'
-          <<: *hunter
-      # daisy CI PODs
-      - baremetal:
-          slave-label: daisy-baremetal
-          installer: daisy
-          auto-trigger-name: 'daily-trigger-disabled'
-          <<: *master
-      - baremetal:
-          slave-label: daisy-baremetal
-          installer: daisy
-          auto-trigger-name: 'daily-trigger-disabled'
-          <<: *hunter
-      - virtual:
-          slave-label: daisy-virtual
-          installer: daisy
-          auto-trigger-name: 'daily-trigger-disabled'
-          <<: *master
-      # -------------------------------
-      #        None-CI PODs
-      # -------------------------------
-      - orange-pod1:
-          slave-label: '{pod}'
-          installer: joid
-          auto-trigger-name: 'daily-trigger-disabled'
-          <<: *master
-      - itri-pod1:
-          slave-label: '{pod}'
-          installer: fuel
-          auto-trigger-name: 'daily-trigger-disabled'
-          <<: *master
-      - zte-pod1:
-          slave-label: '{pod}'
-          installer: fuel
-          auto-trigger-name: 'daily-trigger-disabled'
-          <<: *master
-      - zte-pod1:
-          slave-label: '{pod}'
-          installer: fuel
-          auto-trigger-name: 'daily-trigger-disabled'
-          <<: *hunter
-      - zte-pod2:
-          slave-label: '{pod}'
-          installer: daisy
-          auto-trigger-name: 'daily-trigger-disabled'
-          <<: *master
-      - zte-pod3:
-          slave-label: '{pod}'
-          installer: daisy
-          auto-trigger-name: 'daily-trigger-disabled'
-          <<: *master
-      - zte-pod3:
-          slave-label: '{pod}'
-          installer: daisy
-          auto-trigger-name: 'daily-trigger-disabled'
-          <<: *hunter
-      - zte-pod9:
-          slave-label: '{pod}'
-          installer: daisy
-          auto-trigger-name: 'daily-trigger-disabled'
-          <<: *master
-      - zte-pod9:
-          slave-label: '{pod}'
-          installer: daisy
-          auto-trigger-name: 'daily-trigger-disabled'
-          <<: *hunter
-      - orange-pod2:
-          slave-label: '{pod}'
-          installer: joid
-          auto-trigger-name: 'daily-trigger-disabled'
-          <<: *master
-      - flex-pod1:
-          slave-label: '{pod}'
-          installer: apex
-          auto-trigger-name: 'daily-trigger-disabled'
-          <<: *master
-    # -------------------------------
-    testsuite:
-      - 'daily'
-
-    jobs:
-      - 'yardstick-{installer}-{pod}-{testsuite}-{stream}'
-
-################################
-# job templates
-################################
-- job-template:
-    name: 'yardstick-{installer}-{pod}-{testsuite}-{stream}'
-
-    disabled: false
-
-    concurrent: true
-
-    properties:
-      - logrotate-default
-      - throttle:
-          enabled: true
-          max-per-node: 1
-          option: 'project'
-
-    wrappers:
-      - build-name:
-          name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
-      - timeout:
-          timeout: 180
-          abort: true
-
-    triggers:
-      - '{auto-trigger-name}'
-
-    parameters:
-      - project-parameter:
-          project: '{project}'
-          branch: '{branch}'
-      - '{installer}-defaults'
-      - '{slave-label}-defaults'
-      - 'yardstick-params-{slave-label}'
-      - string:
-          name: DEPLOY_SCENARIO
-          default: 'os-odl_l2-nofeature-ha'
-      - string:
-          name: DOCKER_TAG
-          default: '{docker-tag}'
-          description: 'Tag to pull docker image'
-      - string:
-          name: YARDSTICK_SCENARIO_SUITE_NAME
-          default: opnfv_${{DEPLOY_SCENARIO}}_{testsuite}.yaml
-          description: 'Path to test scenario suite'
-      - string:
-          name: CI_DEBUG
-          default: 'false'
-          description: "Show debut output information"
-
-    scm:
-      - git-scm
-
-    builders:
-      - description-setter:
-          description: "POD: $NODE_NAME"
-      - 'yardstick-cleanup'
-      - 'yardstick-fetch-creds'
-      - 'yardstick-{testsuite}'
-      - 'yardstick-store-results'
-
-    publishers:
-      - email:
-          recipients: jean.gaoliang@huawei.com limingjiang@huawei.com
-      - email-jenkins-admins-on-failure
-
-########################
-# builder macros
-########################
-- builder:
-    name: yardstick-daily
-    builders:
-      - shell:
-          !include-raw: ./yardstick-daily.sh
-
-- builder:
-    name: yardstick-fetch-creds
-    builders:
-      # yamllint disable rule:indentation
-      - conditional-step:
-          condition-kind: regex-match
-          regex: "os-.*"
-          label: '$DEPLOY_SCENARIO'
-          steps:
-            - shell:
-                !include-raw: ../../utils/fetch_os_creds.sh
-      - conditional-step:
-          condition-kind: regex-match
-          regex: "k8-.*"
-          label: '$DEPLOY_SCENARIO'
-          steps:
-            - shell:
-                !include-raw: ./yardstick-get-k8s-conf.sh
-
-- builder:
-    name: yardstick-store-results
-    builders:
-      - shell:
-          !include-raw: ../../utils/push-test-logs.sh
-
-- builder:
-    name: yardstick-cleanup
-    builders:
-      - shell:
-          !include-raw: ./yardstick-cleanup.sh
-########################
-# parameter macros
-########################
-- parameter:
-    name: 'yardstick-params-apex-virtual-master'
-    parameters:
-      - string:
-          name: YARDSTICK_DB_BACKEND
-          default: '-i 104.197.68.199:8086'
-          description: 'Arguments to use in order to choose the backend DB'
-
-- parameter:
-    name: 'yardstick-params-apex-baremetal-master'
-    parameters:
-      - string:
-          name: YARDSTICK_DB_BACKEND
-          default: '-i 104.197.68.199:8086'
-          description: 'Arguments to use in order to choose the backend DB'
-
-- parameter:
-    name: 'yardstick-params-apex-virtual-hunter'
-    parameters:
-      - string:
-          name: YARDSTICK_DB_BACKEND
-          default: '-i 104.197.68.199:8086'
-          description: 'Arguments to use in order to choose the backend DB'
-
-- parameter:
-    name: 'yardstick-params-apex-baremetal-hunter'
-    parameters:
-      - string:
-          name: YARDSTICK_DB_BACKEND
-          default: '-i 104.197.68.199:8086'
-          description: 'Arguments to use in order to choose the backend DB'
-
-- parameter:
-    name: 'yardstick-params-fuel-baremetal'
-    parameters:
-      - string:
-          name: YARDSTICK_DB_BACKEND
-          default: '-i 104.197.68.199:8086'
-          description: 'Arguments to use in order to choose the backend DB'
-
-- parameter:
-    name: 'yardstick-params-fuel-virtual'
-    parameters:
-      - string:
-          name: YARDSTICK_DB_BACKEND
-          default: '-i 104.197.68.199:8086'
-          description: 'Arguments to use in order to choose the backend DB'
-
-- parameter:
-    name: 'yardstick-params-armband-baremetal'
-    parameters:
-      - string:
-          name: YARDSTICK_DB_BACKEND
-          default: '-i 104.197.68.199:8086'
-          description: 'Arguments to use in order to choose the backend DB'
-
-- parameter:
-    name: 'yardstick-params-armband-virtual'
-    parameters:
-      - string:
-          name: YARDSTICK_DB_BACKEND
-          default: '-i 104.197.68.199:8086'
-          description: 'Arguments to use in order to choose the backend DB'
-
-- parameter:
-    name: 'yardstick-params-joid-baremetal'
-    parameters:
-      - string:
-          name: YARDSTICK_DB_BACKEND
-          default: '-i 104.197.68.199:8086'
-          description: 'Arguments to use in order to choose the backend DB'
-
-- parameter:
-    name: 'yardstick-params-joid-virtual'
-    parameters:
-      - string:
-          name: YARDSTICK_DB_BACKEND
-          default: '-i 104.197.68.199:8086'
-          description: 'Arguments to use in order to choose the backend DB'
-
-- parameter:
-    name: 'yardstick-params-intel-pod8'
-    parameters:
-      - string:
-          name: YARDSTICK_DB_BACKEND
-          default: '-i 104.197.68.199:8086'
-          description: 'Arguments to use in order to choose the backend DB'
-
-- parameter:
-    name: 'yardstick-params-daisy-baremetal'
-    parameters:
-      - string:
-          name: YARDSTICK_DB_BACKEND
-          default: '-i 104.197.68.199:8086'
-          description: 'Arguments to use in order to choose the backend DB'
-
-- parameter:
-    name: 'yardstick-params-daisy-virtual'
-    parameters:
-      - string:
-          name: YARDSTICK_DB_BACKEND
-          default: '-i 104.197.68.199:8086'
-          description: 'Arguments to use in order to choose the backend DB'
-
-- parameter:
-    name: 'yardstick-params-itri-pod1'
-    parameters:
-      - string:
-          name: YARDSTICK_DB_BACKEND
-          default: '-i 104.197.68.199:8086'
-          description: 'Arguments to use in order to choose the backend DB'
-
-- parameter:
-    name: 'yardstick-params-zte-pod1'
-    parameters:
-      - string:
-          name: YARDSTICK_DB_BACKEND
-          default: '-i 104.197.68.199:8086'
-          description: 'Arguments to use in order to choose the backend DB'
-
-- parameter:
-    name: 'yardstick-params-zte-pod2'
-    parameters:
-      - string:
-          name: YARDSTICK_DB_BACKEND
-          default: '-i 104.197.68.199:8086'
-          description: 'Arguments to use in order to choose the backend DB'
-
-- parameter:
-    name: 'yardstick-params-zte-pod3'
-    parameters:
-      - string:
-          name: YARDSTICK_DB_BACKEND
-          default: '-i 104.197.68.199:8086'
-          description: 'Arguments to use in order to choose the backend DB'
-
-- parameter:
-    name: 'yardstick-params-zte-pod9'
-    parameters:
-      - string:
-          name: YARDSTICK_DB_BACKEND
-          default: '-i 104.197.68.199:8086'
-          description: 'Arguments to use in order to choose the backend DB'
-
-- parameter:
-    name: 'yardstick-params-orange-pod1'
-    parameters:
-      - string:
-          name: YARDSTICK_DB_BACKEND
-          default: '-i 104.197.68.199:8086'
-          description: 'Arguments to use in order to choose the backend DB'
-
-- parameter:
-    name: 'yardstick-params-orange-pod2'
-    parameters:
-      - string:
-          name: YARDSTICK_DB_BACKEND
-          default: '-i 104.197.68.199:8086'
-          description: 'Arguments to use in order to choose the backend DB'
-
-- parameter:
-    name: 'yardstick-params-virtual'
-    parameters:
-      - string:
-          name: YARDSTICK_DB_BACKEND
-          default: '-i 104.197.68.199:8086'
-          description: 'Arguments to use in order to choose the backend DB'
-
-- parameter:
-    name: 'yardstick-params-huawei-pod3'
-    parameters:
-      - string:
-          name: YARDSTICK_DB_BACKEND
-          default: '-i 104.197.68.199:8086'
-          description: 'Arguments to use in order to choose the backend DB'
-
-- parameter:
-    name: 'yardstick-params-huawei-pod4'
-    parameters:
-      - string:
-          name: YARDSTICK_DB_BACKEND
-          default: '-i 104.197.68.199:8086'
-          description: 'Arguments to use in order to choose the backend DB'
-
-- parameter:
-    name: 'yardstick-params-flex-pod1'
-    parameters:
-      - string:
-          name: YARDSTICK_DB_BACKEND
-          default: '-i 104.197.68.199:8086'
-          description: 'Arguments to use in order to choose the backend DB'
-
-#######################
-## trigger macros
-#######################
-# trigger for PODs to only run yardstick test suites
-- trigger:
-    name: 'yardstick-daily-huawei-pod3-trigger'
-    triggers:
-      - timed: '0 1 * * *'
-
-- trigger:
-    name: 'yardstick-daily-huawei-pod4-trigger'
-    triggers:
-      - timed: ''
diff --git a/jjb/yardstick/yardstick-daily.sh b/jjb/yardstick/yardstick-daily.sh
deleted file mode 100755
index 91b3e8e0f..000000000
--- a/jjb/yardstick/yardstick-daily.sh
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/bin/bash
-set -e
-[[ $CI_DEBUG == true ]] && redirect="/dev/stdout" || redirect="/dev/null"
-
-rc_file_vol=""
-cacert_file_vol=""
-sshkey=""
-
-rc_file_vol="-v ${HOME}/opnfv-openrc.sh:/etc/yardstick/openstack.creds"
-
-if [[ ${INSTALLER_TYPE} == 'apex' ]]; then
-    instack_mac=$(sudo virsh domiflist undercloud | grep default | \
-                  grep -Eo "[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+")
-    INSTALLER_IP=$(/usr/sbin/arp -e | grep ${instack_mac} | awk {'print $1'})
-    sshkey="-v /root/.ssh/id_rsa:/root/.ssh/id_rsa"
-    if [[ -n $(sudo iptables -L FORWARD |grep "REJECT"|grep "reject-with icmp-port-unreachable") ]]; then
-        #note: this happens only in opnfv-lf-pod1
-        sudo iptables -D FORWARD -o virbr0 -j REJECT --reject-with icmp-port-unreachable
-        sudo iptables -D FORWARD -i virbr0 -j REJECT --reject-with icmp-port-unreachable
-    fi
-fi
-
-if [[ ${INSTALLER_TYPE} == 'joid' ]]; then
-    if [[ "${DEPLOY_SCENARIO:0:2}" == "k8" ]];then
-        rc_file_vol="-v ${HOME}/admin.conf:/etc/yardstick/admin.conf"
-    else
-        # If production lab then creds may be retrieved dynamically
-        # creds are on the jumphost, always in the same folder
-        rc_file_vol="-v $LAB_CONFIG/admin-openrc:/etc/yardstick/openstack.creds"
-        # If dev lab, credentials may not be the default ones, just provide a path to put them into docker
-        # replace the default one by the customized one provided by jenkins config
-    fi
-elif [[ ${INSTALLER_TYPE} == 'fuel' ]]; then
-    if [[ "${DEPLOY_SCENARIO:0:2}" == 'k8' ]]; then
-        rc_file_vol="-v ${HOME}/admin.conf:/etc/yardstick/admin.conf"
-    else
-        cacert_file_vol="-v ${HOME}/os_cacert:/etc/ssl/certs/mcp_os_cacert"
-    fi
-    sshkey="-v ${SSH_KEY}:/root/.ssh/mcp.rsa"
-fi
-
-opts="--privileged=true --rm"
-envs="-e INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} \
-    -e NODE_NAME=${NODE_NAME} -e EXTERNAL_NETWORK=${EXTERNAL_NETWORK} \
-    -e YARDSTICK_BRANCH=${BRANCH} -e BRANCH=${BRANCH} \
-    -e DEPLOY_SCENARIO=${DEPLOY_SCENARIO} -e CI_DEBUG=true"
-
-if [[ "${INSTALLER_TYPE}" == 'fuel' ]]; then
-    envs+=" -e SSH_KEY=/root/.ssh/mcp.rsa"
-fi
-
-# Pull the image with correct tag
-DOCKER_REPO='opnfv/yardstick'
-if [ "$(uname -m)" = 'aarch64' ]; then
-    DOCKER_REPO="${DOCKER_REPO}_$(uname -m)"
-fi
-echo "Yardstick: Pulling image ${DOCKER_REPO}:${DOCKER_TAG}"
-docker pull ${DOCKER_REPO}:$DOCKER_TAG >$redirect
-docker images
-
-# map log directory
-branch=${BRANCH##*/}
-dir_result="${HOME}/opnfv/yardstick/results/${branch}"
-mkdir -p ${dir_result}
-sudo rm -rf ${dir_result}/*
-map_log_dir="-v ${dir_result}:/tmp/yardstick"
-
-# Run docker
-cmd="sudo docker run ${opts} ${envs} ${rc_file_vol} ${cacert_file_vol} ${map_log_dir} ${sshkey} ${DOCKER_REPO}:${DOCKER_TAG} \
-exec_tests.sh ${YARDSTICK_DB_BACKEND} ${YARDSTICK_SCENARIO_SUITE_NAME}"
-
-echo "Yardstick: Running docker cmd: ${cmd}"
-${cmd}
-
-echo "Yardstick: done!"
diff --git a/jjb/yardstick/yardstick-get-k8s-conf.sh b/jjb/yardstick/yardstick-get-k8s-conf.sh
deleted file mode 100755
index 3af2dcb71..000000000
--- a/jjb/yardstick/yardstick-get-k8s-conf.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-set -e
-
-dest_path="$HOME/admin.conf"
-
-if [[ "${DEPLOY_SCENARIO:0:2}" == "k8" ]];then
-    if [[ ${INSTALLER_TYPE} == 'joid' ]];then
-        juju scp kubernetes-master/0:config "${dest_path}"
-    elif [[ ${INSTALLER_TYPE} == 'fuel' ]];then
-        echo "Getting kubernetes config ..."
-        docker cp -L fuel:/opt/kubernetes.config "${dest_path}"
-    fi
-fi
diff --git a/jjb/yardstick/yardstick-project-jobs.yaml b/jjb/yardstick/yardstick-project-jobs.yaml
deleted file mode 100644
index e4d0be6bf..000000000
--- a/jjb/yardstick/yardstick-project-jobs.yaml
+++ /dev/null
@@ -1,194 +0,0 @@
----
-###################################################
-# All the jobs except verify have been removed!
-# They will only be enabled on request by projects!
-###################################################
-- project:
-    name: yardstick-project-jobs
-
-    project: 'yardstick'
-
-    jobs:
-      - 'yardstick-verify-{stream}'
-      - 'yardstick-merge-{stream}'
-
-    stream:
-      - master:
-          branch: '{stream}'
-          gs-pathname: ''
-          disabled: false
-      - iruya: &iruya
-          branch: 'stable/{stream}'
-          gs-pathname: '/{stream}'
-          disabled: false
-
-################################
-# job templates
-################################
-
-- job-template:
-    name: 'yardstick-verify-{stream}'
-
-    disabled: '{obj:disabled}'
-
-    parameters:
-      - project-parameter:
-          project: '{project}'
-          branch: '{branch}'
-      - 'ericsson-build4-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}'
-
-    wrappers:
-      - ssh-agent-wrapper
-      - timeout:
-          timeout: 30
-          fail: true
-
-    builders:
-      - yardstick-unit-tests-python-3
-      - yardstick-functional-tests-python-3
-      - yardstick-coverage-tests
-      - yardstick-pep8-tests
-
-- job-template:
-    name: 'yardstick-merge-{stream}'
-
-    disabled: '{obj:disabled}'
-
-    parameters:
-      - project-parameter:
-          project: '{project}'
-          branch: '{branch}'
-      - 'ericsson-build4-defaults'
-      - string:
-          name: GS_URL
-          default: '$GS_BASE{gs-pathname}'
-          description: "Directory where the build artifact will be located upon\
-            \ the completion of the build."
-
-    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}'
-
-    wrappers:
-      - ssh-agent-wrapper
-      - timeout:
-          timeout: 30
-          fail: true
-
-    builders:
-      - yardstick-unit-tests-python-3
-      - yardstick-functional-tests-python-3
-      - yardstick-coverage-tests
-      - yardstick-pep8-tests
-
-################################
-# job builders
-################################
-
-- builder:
-    name: yardstick-unit-tests-python-3
-    builders:
-      - shell: |
-          #!/bin/bash
-          set -o errexit
-          set -o pipefail
-
-          sudo apt-get -y autoremove
-          sudo apt-get install -y build-essential python-dev python3-dev
-          sudo apt-get -y clean && sudo apt-get -y autoremove
-
-          echo "Running unit tests in Python 3 ..."
-          cd $WORKSPACE
-          tox -epy3
-
-- builder:
-    name: yardstick-functional-tests-python-3
-    builders:
-      - shell: |
-          #!/bin/bash
-          set -o errexit
-          set -o pipefail
-
-          sudo apt-get -y autoremove
-          sudo apt-get install -y build-essential python-dev python3-dev rabbitmq-server
-          sudo apt-get -y clean && sudo apt-get -y autoremove
-
-          echo "Configure RabbitMQ service"
-          sudo service rabbitmq-server restart
-          sudo rabbitmqctl start_app
-          if [ -z "$(sudo rabbitmqctl list_users | grep yardstick)" ]; then
-            sudo rabbitmqctl add_user yardstick yardstick
-            sudo rabbitmqctl set_permissions yardstick ".*" ".*" ".*"
-          fi
-
-          echo "Running functional tests in Python 3 ..."
-          cd $WORKSPACE
-          tox -efunctional-py3
-
-- builder:
-    name: yardstick-coverage-tests
-    builders:
-      - shell: |
-          #!/bin/bash
-          set -o errexit
-          set -o pipefail
-
-          sudo apt-get -y autoremove
-          sudo apt-get install -y build-essential python-dev python3-dev
-          sudo apt-get -y clean && sudo apt-get -y autoremove
-
-          echo "Running coverage tests ..."
-          cd $WORKSPACE
-          tox -ecoverage
-
-- builder:
-    name: yardstick-pep8-tests
-    builders:
-      - shell: |
-          #!/bin/bash
-          set -o errexit
-          set -o pipefail
-
-          sudo apt-get -y autoremove
-          sudo apt-get install -y build-essential python-dev python3-dev
-          sudo apt-get -y clean && sudo apt-get -y autoremove
-
-          echo "Running style guidelines (PEP8) tests ..."
-          cd $WORKSPACE
-          tox -epep8
diff --git a/jjb/yardstick/yardstick-rtd-jobs.yaml b/jjb/yardstick/yardstick-rtd-jobs.yaml
deleted file mode 100644
index 213ec6ac2..000000000
--- a/jjb/yardstick/yardstick-rtd-jobs.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-- project:
-    name: yardstick-rtd
-    project: yardstick
-    project-name: yardstick
-
-    project-pattern: 'yardstick'
-    rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-yardstick/47399/'
-    rtd-token: '6aa883824f3917c7db5ffa1fe9168817fb5feb68'
-
-    stream:
-      - master:
-          branch: '{stream}'
-          disabled: false
-      - hunter:
-          branch: 'stable/{stream}'
-          disabled: false
-
-    jobs:
-      - '{project-name}-rtd-jobs'