diff options
| -rw-r--r-- | jjb/dovetail/dovetail-weekly-jobs.yml | 136 | ||||
| -rw-r--r-- | jjb/global/releng-macros.yml | 5 | ||||
| -rw-r--r-- | jjb/joid/joid-deploy.sh | 23 | ||||
| -rw-r--r-- | jjb/yardstick/yardstick-project-jobs.yml | 1 |
4 files changed, 157 insertions, 8 deletions
diff --git a/jjb/dovetail/dovetail-weekly-jobs.yml b/jjb/dovetail/dovetail-weekly-jobs.yml new file mode 100644 index 000000000..c6b3774d4 --- /dev/null +++ b/jjb/dovetail/dovetail-weekly-jobs.yml @@ -0,0 +1,136 @@ +- project: + name: dovetail-weekly-jobs + project: dovetail +#-------------------------------- +# BRANCH ANCHORS +#-------------------------------- + master: &master + stream: master + branch: '{stream}' + dovetail-branch: '{stream}' + gs-pathname: '' + docker-tag: 'latest' + colorado: &colorado + stream: colorado + 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 +# <<: *colorado + - baremetal: + slave-label: compass-baremetal + sut: compass + <<: *colorado +# - baremetal: +# slave-label: fuel-baremetal +# sut: fuel +# <<: *master +# - baremetal: +# slave-label: joid-baremetal +# sut: joid +# <<: *colorado + + testsuite: + - 'debug' + - 'proposed_tests' + - 'compliance_set' + + loop: + - 'weekly': + job-timeout: 60 + + jobs: + - 'dovetail-{sut}-{pod}-{testsuite}-{loop}-{stream}' + +################################ +# job template +################################ +- job-template: + name: 'dovetail-{sut}-{pod}-{testsuite}-{loop}-{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: '{job-timeout}' + abort: true + + parameters: + - project-parameter: + project: '{project}' + - gerrit-parameter: + branch: '{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 + +######################## +# 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 diff --git a/jjb/global/releng-macros.yml b/jjb/global/releng-macros.yml index d43bed77a..89909b009 100644 --- a/jjb/global/releng-macros.yml +++ b/jjb/global/releng-macros.yml @@ -67,6 +67,11 @@ triggers: - timed: '' +- trigger: + name: 'weekly-trigger-disabled' + triggers: + - timed: '' + # NOTE: unused macro, but we may use this for some jobs. - trigger: name: gerrit-trigger-patch-submitted diff --git a/jjb/joid/joid-deploy.sh b/jjb/joid/joid-deploy.sh index 88dbe2214..da5dcf043 100644 --- a/jjb/joid/joid-deploy.sh +++ b/jjb/joid/joid-deploy.sh @@ -45,17 +45,24 @@ export POD_NAME=${POD/-} ## cd $WORKSPACE/ci -if [ -e "$LAB_CONFIG/environments.yaml" ] && [ "$MAAS_REINSTALL" == "false" ]; then + +if [ -e "$LAB_CONFIG/deployconfig.yaml" ] && [ "$MAAS_REINSTALL" == "false" ]; then echo "------ Recover Juju environment to use MAAS ------" - cp $LAB_CONFIG/environments.yaml . - cp $LAB_CONFIG/deployment.yaml . - if [ -e $LAB_CONFIG/deployconfig.yaml ]; then + if [ -e deployconfig.yaml ]; then cp $LAB_CONFIG/deployconfig.yaml . + cp $LAB_CONFIG/deployment.yaml . + cp $LAB_CONFIG/labconfig.yaml . fi else - echo "------ Redeploy MAAS ------" - ./00-maasdeploy.sh $POD_NAME - exit_on_error $? "MAAS Deploy FAILED" + if ["$NODE_NAME" == "default" ]; then + echo "------ Redeploy MAAS ------" + ./03-maasdeploy.sh default + exit_on_error $? "MAAS Deploy FAILED" + else + echo "------ Redeploy MAAS ------" + ./03-maasdeploy.sh custom $LAB_CONFIG/labconfig.yaml + exit_on_error $? "MAAS Deploy FAILED" + fi fi ## @@ -142,7 +149,7 @@ if [ "$JOID_MODEL" == 'os' ]; then # export the openrc file by getting the one generated by joid and add SDN # controller for Functest - cp ./cloud/admin-openrc $JOID_ADMIN_OPENRC + # cp ./cloud/admin-openrc $JOID_ADMIN_OPENRC cat << EOF >> $JOID_ADMIN_OPENRC export SDN_CONTROLLER=$SDN_CONTROLLER_IP export SDN_PASSWORD=$SDN_PASSWORD diff --git a/jjb/yardstick/yardstick-project-jobs.yml b/jjb/yardstick/yardstick-project-jobs.yml index 1da4f3134..f32816495 100644 --- a/jjb/yardstick/yardstick-project-jobs.yml +++ b/jjb/yardstick/yardstick-project-jobs.yml @@ -116,6 +116,7 @@ source $WORKSPACE/yardstick_venv/bin/activate # install python packages + sudo apt-get install -y build-essential python-dev python-pip python-pkg-resources easy_install -U setuptools==33.1.1 easy_install -U pip pip install -r requirements.txt || pip install -r tests/ci/requirements.txt |