From 1edf6d36019fcd644bb1efc665a0387e5c64c6a3 Mon Sep 17 00:00:00 2001 From: Fatih Degirmenci Date: Tue, 25 Aug 2015 14:20:41 +0200 Subject: Reconfigure functest jobs for lab reconfig and arno branches - Rename and reconfigure set-functest-env, functest, and clean-functest-env jobs after installers given that there is only one POD. - Create jobs specific to master and stable/arno branches as a preparation to Arno SR1. - Leave Orange jobs as they are, named/configured after Orange POD. we have only one POD left. - Standalone test jobs bench, smoke, odl, vims, and vping job are not reconfigured and perhaps need to be reevaluated. - Reconfigure foreman and fuel master and stable/arno jobs to use new functest jobs. JIRA: RELENG-23 Change-Id: I2abd20d21c590baa82848f1e03d81315501ac056 Signed-off-by: Fatih Degirmenci --- jjb/functest/functest.yml | 123 ++++++++++++++++++++++++++++++++++++++-- jjb/genesis/genesis-foreman.yml | 2 +- jjb/genesis/genesis-fuel.yml | 2 +- 3 files changed, 120 insertions(+), 7 deletions(-) (limited to 'jjb') diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml index f0193e16b..bf824b642 100644 --- a/jjb/functest/functest.yml +++ b/jjb/functest/functest.yml @@ -3,23 +3,29 @@ ################################### - project: name: functest - pod: - - opnfv-jump-1: - node: 'opnfv-jump-1' + + installer: + - fuel: + node: 'opnfv-jump-2' installer_type: 'fuel' installer_ip: '10.20.0.2' - - opnfv-jump-2: + - foreman: node: 'opnfv-jump-2' installer_type: 'foreman' installer_ip: '172.30.10.73' + pod: - orange-build: node: 'orange-build' installer_type: 'foreman' installer_ip: '172.30.10.73' + jobs: - - 'functest-{pod}' - 'set-functest-env-{pod}' + - 'functest-{pod}' - 'clean-functest-env-{pod}' + - 'set-functest-env-{installer}-{stream}' + - 'functest-{installer}-{stream}' + - 'clean-functest-env-{installer}-{stream}' - 'functest-openstack-bench-test-{pod}' - 'functest-openstack-tempest-smoke-test-{pod}' - 'functest-odl-test-{pod}' @@ -110,6 +116,72 @@ # cleanup python $WORKSPACE/testcases/config_functest.py --debug --force $WORKSPACE/ clean +- job-template: + name: set-functest-env-{installer}-{stream} + + project-type: freestyle + + node: '{node}' + + logrotate: + daysToKeep: 30 + numToKeep: 10 + artifactDaysToKeep: -1 + artifactNumToKeep: -1 + + builders: + - shell: | + #!/bin/bash + set +e + + echo "Functest: prepare Functest environment" + mkdir -p $HOME/functest/ + # source openstack vars + if [[ ! -f $HOME/opnfv-openrc.sh ]]; then + echo "Unable to access file $HOME/opnfv-openrc.sh" + exit 1 + fi + source $HOME/opnfv-openrc.sh + + # WORKSPACE is the root of the functest repo + # go into WORKSPACE where the functest repo is cloned + cd $WORKSPACE + + # prepare + echo "Functest: prepare Functest environment" + python $WORKSPACE/testcases/config_functest.py --debug $WORKSPACE/ start + +- job-template: + name: clean-functest-env-{installer}-{stream} + + project-type: freestyle + + node: '{node}' + + logrotate: + daysToKeep: 30 + numToKeep: 10 + artifactDaysToKeep: -1 + artifactNumToKeep: -1 + + builders: + - shell: | + #!/bin/bash + set +e + + # collect results + echo "Functest: copy results and clean Functest environment" + mkdir -p $HOME/functest/results + + # save ODL results + cp -Rf $WORSPACE/testcases/Controllers/ODL/CI/logs $HOME/functest/results/ODL + + # save tempest.conf for further troubleshooting + cp $HOME/.rally/tempest/for-deployment-*/tempest.conf $HOME/functest/results + + # cleanup + python $WORKSPACE/testcases/config_functest.py --debug --force $WORKSPACE/ clean + - job-template: name: functest-openstack-bench-test-{pod} @@ -253,6 +325,47 @@ - 'functest-store-results' - 'functest-cleanup' +- job-template: + name: functest-{installer}-{stream} + + project-type: freestyle + + node: '{node}' + + parameters: + - project-parameter: + project: '{project}' + - string: + name: INSTALLER_TYPE + default: '{installer_type}' + description: "Installer name that is used for deployment." + - string: + name: INSTALLER_IP + default: '{installer_ip}' + description: "Installer IP." + - string: + name: GIT_BASE + default: ssh://gerrit.opnfv.org:29418/$PROJECT + description: "Override GIT_BASE" + + scm: + - git-scm: + credentials-id: '{ssh-credentials}' + refspec: '' + branch: master + + logrotate: + daysToKeep: 30 + numToKeep: 10 + artifactDaysToKeep: -1 + artifactNumToKeep: -1 + + builders: + - 'functest-fetch-os-creds' + - 'functest-all' + - 'functest-store-results' + - 'functest-cleanup' + - job-template: name: 'functest-daily-{stream}' diff --git a/jjb/genesis/genesis-foreman.yml b/jjb/genesis/genesis-foreman.yml index 1980a3913..bbeae8851 100644 --- a/jjb/genesis/genesis-foreman.yml +++ b/jjb/genesis/genesis-foreman.yml @@ -203,7 +203,7 @@ git-revision: true block: true - trigger-builds: - - project: 'functest-opnfv-jump-2' + - project: 'functest-foreman-{stream}' block: true - trigger-builds: - project: 'yardstick-opnfv-jump-2' diff --git a/jjb/genesis/genesis-fuel.yml b/jjb/genesis/genesis-fuel.yml index 69aa8950b..2240571f0 100644 --- a/jjb/genesis/genesis-fuel.yml +++ b/jjb/genesis/genesis-fuel.yml @@ -206,7 +206,7 @@ git-revision: true block: true - trigger-builds: - - project: 'functest-opnfv-jump-2' + - project: 'functest-fuel-{stream}' block: true - trigger-builds: - project: 'yardstick-opnfv-jump-2' -- cgit 1.2.3-korg