diff options
Diffstat (limited to 'jjb/dovetail')
| -rw-r--r-- | jjb/dovetail/dovetail-ci-jobs.yaml | 26 | ||||
| -rwxr-xr-x | jjb/dovetail/dovetail-run.sh | 58 | ||||
| -rw-r--r-- | jjb/dovetail/dovetail-weekly-jobs.yaml | 139 |
3 files changed, 7 insertions, 216 deletions
diff --git a/jjb/dovetail/dovetail-ci-jobs.yaml b/jjb/dovetail/dovetail-ci-jobs.yaml index d45a2eabb..3e5c052f6 100644 --- a/jjb/dovetail/dovetail-ci-jobs.yaml +++ b/jjb/dovetail/dovetail-ci-jobs.yaml @@ -61,27 +61,6 @@ SUT: fuel auto-trigger-name: 'daily-trigger-disabled' <<: *hunter - # compass CI PODs - - baremetal: - slave-label: compass-baremetal - SUT: compass - auto-trigger-name: 'daily-trigger-disabled' - <<: *master - - virtual: - slave-label: compass-virtual - SUT: compass - auto-trigger-name: 'daily-trigger-disabled' - <<: *master - - baremetal: - slave-label: compass-baremetal - SUT: compass - auto-trigger-name: 'daily-trigger-disabled' - <<: *hunter - - virtual: - slave-label: compass-virtual - SUT: compass - auto-trigger-name: 'daily-trigger-disabled' - <<: *hunter # ------------------------------- # Installers not using labels # CI PODs @@ -123,11 +102,6 @@ # ------------------------------- # None-CI PODs # ------------------------------- - - baremetal-centos: - slave-label: 'intel-pod8' - SUT: compass - auto-trigger-name: 'daily-trigger-disabled' - <<: *master - zte-pod1: slave-label: zte-pod1 SUT: fuel diff --git a/jjb/dovetail/dovetail-run.sh b/jjb/dovetail/dovetail-run.sh index 0440c4beb..a52019e41 100755 --- a/jjb/dovetail/dovetail-run.sh +++ b/jjb/dovetail/dovetail-run.sh @@ -79,10 +79,6 @@ get_apex_cred_file() { get_cred_file_with_scripts } -get_compass_cred_file() { - get_cred_file_with_scripts -} - get_fuel_cred_file() { get_cred_file_with_scripts } @@ -101,9 +97,7 @@ change_cred_file_cacert_path() { exists=`check_file_exists ${CACERT}` if [[ $exists == 0 ]]; then echo "INFO: set ${INSTALLER_TYPE} openstack cacert file to be ${CACERT}" - if [[ ${INSTALLER_TYPE} == "compass" ]]; then - echo "export OS_CACERT=${CACERT}" >> ${OPENRC} - elif [[ ${INSTALLER_TYPE} == "fuel" ]]; then + if [[ ${INSTALLER_TYPE} == "fuel" ]]; then sed -i "s#/etc/ssl/certs/mcp_os_cacert#${CACERT}#g" ${OPENRC} fi else @@ -127,8 +121,6 @@ change_cred_file_ext_net() { get_cred_file() { if [[ ${INSTALLER_TYPE} == 'apex' ]]; then get_apex_cred_file - elif [[ ${INSTALLER_TYPE} == 'compass' ]]; then - get_compass_cred_file elif [[ ${INSTALLER_TYPE} == 'fuel' ]]; then get_fuel_cred_file elif [[ ${INSTALLER_TYPE} == 'joid' ]]; then @@ -141,8 +133,8 @@ get_cred_file() { cat $OPENRC echo "INFO: change cacert file path in credentials file" change_cred_file_cacert_path - echo "INFO: set external network in credentials file" - change_cred_file_ext_net + #echo "INFO: set external network in credentials file" + #change_cred_file_ext_net echo "INFO: final openstack credentials file is:" cat $OPENRC else @@ -152,30 +144,6 @@ get_cred_file() { fi } -get_compass_pod_file() { - compass_repo=${WORKSPACE}/compass4nfv/ - echo "INFO: clone compass repo..." - git clone https://github.com/opnfv/compass4nfv.git ${compass_repo} >/dev/null - scenario_file=${compass_repo}/deploy/conf/hardware_environment/$NODE_NAME/os-nosdn-nofeature-ha.yml - ipmiIp=$(cat ${scenario_file} | shyaml get-value hosts.0.ipmiIp) - ipmiPass=$(cat ${scenario_file} | shyaml get-value hosts.0.ipmiPass) - ipmiUser=root - jumpserver_ip=$(ifconfig | grep -A 5 docker0 | grep "inet addr" | cut -d ':' -f 2 | cut -d ' ' -f 1) - - cat << EOF >${POD} -nodes: -- {ip: ${jumpserver_ip}, name: node0, password: root, role: Jumpserver, user: root} -- {ip: 10.1.0.50, name: node1, password: root, role: controller, user: root, - ipmi_ip: ${ipmiIp}, ipmi_user: ${ipmiUser}, ipmi_password: ${ipmiPass}} -- {ip: 10.1.0.51, name: node2, password: root, role: controller, user: root} -- {ip: 10.1.0.52, name: node3, password: root, role: controller, user: root} -- {ip: 10.1.0.53, name: node4, password: root, role: compute, user: root} -- {ip: 10.1.0.54, name: node5, password: root, role: compute, user: root} - -EOF - -} - get_fuel_baremetal_pod_file() { fuel_ctl_ssh_options="${ssh_options} -i ${SSH_KEY}" ssh_user="ubuntu" @@ -226,9 +194,7 @@ get_pod_file_with_scripts() { sudo pip install -e ./ >/dev/null sudo pip install netaddr - if [[ ${INSTALLER_TYPE} == compass ]]; then - options="-u root -p root" - elif [[ ${INSTALLER_TYPE} == fuel ]]; then + if [[ ${INSTALLER_TYPE} == fuel ]]; then options="-u ubuntu -k /root/.ssh/id_rsa" elif [[ ${INSTALLER_TYPE} == apex ]]; then options="-u stack -k /root/.ssh/id_rsa" @@ -268,13 +234,6 @@ process_info: EOF } -change_compass_pod_file_process_info() { - cat << EOF >> ${POD} -process_info: -- {testcase_name: yardstick.ha.rabbitmq, attack_process: rabbitmq} -EOF -} - change_pod_file_process_info() { sudo chmod 666 ${POD} echo "INFO: adapt process info for $INSTALLER_TYPE ..." @@ -282,8 +241,6 @@ change_pod_file_process_info() { change_apex_pod_file_process_info elif [ "$INSTALLER_TYPE" == "fuel" ]; then change_fuel_pod_file_process_info - elif [ "$INSTALLER_TYPE" == "compass" ]; then - change_compass_pod_file_process_info fi } @@ -292,9 +249,7 @@ get_pod_file() { sudo pip install shyaml sudo yum install -y rubygems || sudo apt-get install -y ruby sudo gem install hiera-eyaml - if [[ ${INSTALLER_TYPE} == 'compass' ]]; then - get_compass_pod_file - elif [[ ${INSTALLER_TYPE} == 'fuel' && ${DEPLOY_TYPE} == 'baremetal' ]]; then + if [[ ${INSTALLER_TYPE} == 'fuel' && ${DEPLOY_TYPE} == 'baremetal' ]]; then get_fuel_baremetal_pod_file fi @@ -430,7 +385,7 @@ fi # Modify tempest_conf.yaml file tempest_conf_file=${DOVETAIL_CONFIG}/tempest_conf.yaml -if [[ ${INSTALLER_TYPE} == 'compass' || ${INSTALLER_TYPE} == 'apex' ]]; then +if [[ ${INSTALLER_TYPE} == 'apex' ]]; then volume_device='vdb' else volume_device='vdc' @@ -441,6 +396,7 @@ cat << EOF >$tempest_conf_file compute: min_compute_nodes: 2 volume_device_name: ${volume_device} + max_microversion: 2.65 EOF diff --git a/jjb/dovetail/dovetail-weekly-jobs.yaml b/jjb/dovetail/dovetail-weekly-jobs.yaml deleted file mode 100644 index 5a162bb7f..000000000 --- a/jjb/dovetail/dovetail-weekly-jobs.yaml +++ /dev/null @@ -1,139 +0,0 @@ ---- -- project: - name: dovetail-weekly-jobs - project: dovetail - # ------------------------------- - # BRANCH ANCHORS - # ------------------------------- - master: &master - stream: master - branch: '{stream}' - dovetail-branch: '{stream}' - gs-pathname: '' - docker-tag: 'latest' - danube: &danube - stream: danube - branch: 'stable/{stream}' - dovetail-branch: master - gs-pathname: '/{stream}' - docker-tag: 'latest' - - # ------------------------------- - # 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: - # - baremetal: - # slave-label: apex-baremetal - # SUT: apex - # <<: *danube - - baremetal: - slave-label: compass-baremetal - SUT: compass - <<: *danube - # - baremetal: - # slave-label: fuel-baremetal - # SUT: fuel - # <<: *danube - # - baremetal: - # slave-label: joid-baremetal - # SUT: joid - # <<: *danube - - testsuite: - - 'debug' - - 'compliance_set' - - 'proposed_tests' - - loop: - - 'weekly': - job-timeout: 180 - - jobs: - - 'dovetail-{SUT}-{pod}-{testsuite}-{loop}-{stream}' - -################################ -# job template -################################ -- job-template: - name: 'dovetail-{SUT}-{pod}-{testsuite}-{loop}-{stream}' - - disabled: true - - 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: '{job-timeout}' - abort: true - - fix-workspace-permissions - - parameters: - - project-parameter: - project: '{project}' - branch: '{dovetail-branch}' - - '{SUT}-defaults' - - '{slave-label}-defaults' - - string: - name: DEPLOY_SCENARIO - default: 'os-nosdn-nofeature-ha' - - string: - name: DOCKER_TAG - default: '{docker-tag}' - description: 'Tag to pull dovetail docker image' - - string: - name: CI_DEBUG - default: 'true' - description: "Show debug output information" - - string: - name: TESTSUITE - default: '{testsuite}' - description: "dovetail testsuite to run" - - string: - name: DOVETAIL_REPO_DIR - default: "/home/opnfv/dovetail" - description: "Directory where the dovetail repository is cloned" - - scm: - - git-scm - - builders: - - description-setter: - description: "POD: $NODE_NAME" - - 'dovetail-cleanup' - - 'dovetail-run' - - publishers: - - archive: - artifacts: 'results/**/*' - allow-empty: true - fingerprint: true - - email-jenkins-admins-on-failure - -######################## -# builder macros -######################## -- builder: - name: dovetail-run-weekly - builders: - - shell: - !include-raw: ./dovetail-run.sh - -- builder: - name: dovetail-cleanup-weekly - builders: - - shell: - !include-raw: ./dovetail-cleanup.sh |