diff options
Diffstat (limited to 'jjb/yardstick')
| -rw-r--r-- | jjb/yardstick/yardstick-daily-jobs.yaml | 52 | ||||
| -rwxr-xr-x | jjb/yardstick/yardstick-daily.sh | 7 | ||||
| -rwxr-xr-x | jjb/yardstick/yardstick-get-k8s-conf.sh | 3 |
3 files changed, 0 insertions, 62 deletions
diff --git a/jjb/yardstick/yardstick-daily-jobs.yaml b/jjb/yardstick/yardstick-daily-jobs.yaml index 8c3ba85eb..e12eee79f 100644 --- a/jjb/yardstick/yardstick-daily-jobs.yaml +++ b/jjb/yardstick/yardstick-daily-jobs.yaml @@ -113,27 +113,6 @@ installer: joid auto-trigger-name: 'daily-trigger-disabled' <<: *hunter - # compass CI PODs - - baremetal: - slave-label: compass-baremetal - installer: compass - auto-trigger-name: 'daily-trigger-disabled' - <<: *master - - virtual: - slave-label: compass-virtual - installer: compass - auto-trigger-name: 'daily-trigger-disabled' - <<: *master - - baremetal: - slave-label: compass-baremetal - installer: compass - auto-trigger-name: 'daily-trigger-disabled' - <<: *hunter - - virtual: - slave-label: compass-virtual - installer: compass - auto-trigger-name: 'daily-trigger-disabled' - <<: *hunter # daisy CI PODs - baremetal: slave-label: daisy-baremetal @@ -203,21 +182,6 @@ installer: joid auto-trigger-name: 'daily-trigger-disabled' <<: *master - - huawei-pod3: - slave-label: '{pod}' - installer: compass - auto-trigger-name: 'yardstick-daily-huawei-pod3-trigger' - <<: *master - - huawei-pod4: - slave-label: '{pod}' - installer: compass - auto-trigger-name: 'yardstick-daily-huawei-pod4-trigger' - <<: *master - - baremetal-centos: - slave-label: 'intel-pod8' - installer: compass - auto-trigger-name: 'daily-trigger-disabled' - <<: *master - flex-pod1: slave-label: '{pod}' installer: apex @@ -427,14 +391,6 @@ description: 'Arguments to use in order to choose the backend DB' - parameter: - name: 'yardstick-params-compass-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-baremetal' parameters: - string: @@ -515,14 +471,6 @@ description: 'Arguments to use in order to choose the backend DB' - parameter: - name: 'yardstick-params-compass-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: diff --git a/jjb/yardstick/yardstick-daily.sh b/jjb/yardstick/yardstick-daily.sh index dfe1404f0..91b3e8e0f 100755 --- a/jjb/yardstick/yardstick-daily.sh +++ b/jjb/yardstick/yardstick-daily.sh @@ -30,13 +30,6 @@ if [[ ${INSTALLER_TYPE} == 'joid' ]]; then # 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} == 'compass' ]]; 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/yardstick/os_cacert" - echo "export OS_CACERT=/etc/yardstick/os_cacert" >> ${HOME}/opnfv-openrc.sh - fi elif [[ ${INSTALLER_TYPE} == 'fuel' ]]; then if [[ "${DEPLOY_SCENARIO:0:2}" == 'k8' ]]; then rc_file_vol="-v ${HOME}/admin.conf:/etc/yardstick/admin.conf" diff --git a/jjb/yardstick/yardstick-get-k8s-conf.sh b/jjb/yardstick/yardstick-get-k8s-conf.sh index 82744a4ee..3af2dcb71 100755 --- a/jjb/yardstick/yardstick-get-k8s-conf.sh +++ b/jjb/yardstick/yardstick-get-k8s-conf.sh @@ -6,9 +6,6 @@ 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} == 'compass' ]];then - echo "Copy admin.conf to ${dest_path}" - docker cp compass-tasks:/opt/admin.conf "${dest_path}" elif [[ ${INSTALLER_TYPE} == 'fuel' ]];then echo "Getting kubernetes config ..." docker cp -L fuel:/opt/kubernetes.config "${dest_path}" |