From b164b078cbe24ffdd2b2dba6f005edb124f0ef07 Mon Sep 17 00:00:00 2001 From: Anthony PERARD Date: Wed, 13 Apr 2016 09:01:41 +0000 Subject: [PATCH] jenkins: new jobs dsvm-tempest-xen-testing with pipeline experimental --- jenkins/jobs/jobs.yaml | 68 ++++++++++++++++++++++++++++++++++++++ jenkins/jobs/projects.yaml | 2 ++ zuul/layout.yaml | 10 ++++++ 3 files changed, 80 insertions(+) diff --git a/jenkins/jobs/jobs.yaml b/jenkins/jobs/jobs.yaml index b15eb49..5f674cb 100644 --- a/jenkins/jobs/jobs.yaml +++ b/jenkins/jobs/jobs.yaml @@ -55,3 +55,71 @@ publishers: - osci-swift-upload-logs-with-console: upload_source: 'logs' + +- job-template: + name: 'dsvm-tempest-xen-testing' + node: '{node}' + + wrappers: + - timeout: + timeout: 185 # Timeout in *minutes* + fail: true # A job run that exceeds the timeout will cause a failure + - timestamps + + builders: + - net-info + - devstack-checkout + - shell: | + #!/bin/bash -xe + + function pre_test_hook {{ + echo "Install thirdparty libraries" + + # Install libvirt here to ensure it is + # not replaced devstack + sudo dpkg -i /opt/nodepool-scripts/*.deb + sudo apt-get install -y -f --fix-missing + # Testing extra conf if possible + if [[ -e $BASE/new/nova/contrib/xen/vif-bridge-nova-network ]]; then + echo "Will use vif-bridge-nova-network from nova.git/contrib/xen/ as vif-bridge" + sudo cp -v $BASE/new/nova/contrib/xen/vif-bridge-nova-network /etc/xen/scripts/ + echo "Updating /etc/nova/nova.conf with xen_vif_bridge_script_path = vif-bridge-nova-network" + cat <> $BASE/new/devstack/local.conf + [[post-config|\$NOVA_CONF]] + [libvirt] + xen_vif_bridge_script_path = vif-bridge-nova-network + EOF + cat $BASE/new/devstack/local.conf + fi + }} + + function cleanup_host_hook {{ + echo "Copying custom logs" + + # Xen logs + if [ -d /var/log/xen ]; then + sudo cp -r /var/log/xen $BASE/logs/ + fi + }} + + export -f pre_test_hook + export -f cleanup_host_hook + + if [ -z $ZUUL_PROJECT ]; then + export ZUUL_PROJECT=openstack-dev/sandbox + fi + if [ -z $ZUUL_BRANCH ]; then + export ZUUL_BRANCH=master + fi + export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TEMPEST=1 + export DEVSTACK_GATE_VIRT_DRIVER=libvirt + export DEVSTACK_GATE_LIBVIRT_TYPE=xen + export DEVSTACK_GATE_TIMEOUT=180 + export DEVSTACK_GATE_TEMPEST_REGEX='(?!.*\[.*\bslow\b.*\]|.*test_volume_boot_pattern|.*test_shelve_volume_backed_instance)(^tempest\.(api|scenario|thirdparty))' + export RE_EXEC=true + # Fix bogus ZUUL_URL, for git fetch of the project to test + export ZUUL_URL=`echo $ZUUL_URL | sed -e s/jenkins-libvirt/104.130.29.226/` + cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh + ./safe-devstack-vm-gate-wrap.sh + - link-logs # In macros.yaml from os-ext-testing diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index 0d7e921..9bee24e 100644 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -8,3 +8,5 @@ - noop-check-communication - dsvm-tempest-xen: node: 'ds-xen' + - dsvm-tempest-xen-testing: + node: 'ts-xen' diff --git a/zuul/layout.yaml b/zuul/layout.yaml index b6cdf3e..c6517d8 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -51,6 +51,14 @@ pipelines: from: zuul@zuul.openstack.xenproject.org subject: 'Silent check of {change.project} {change.number},{change.patchset} failed' + - name: experimental + description: experimental job + manager: IndependentPipelineManager + trigger: + gerrit: + - event: comment-added + comment: (?i)^(Patch Set [0-9]+:)?( [\w\\+-]*)*(\n\n)?\s*xen:*\s*experimental\s*check\s*$ + jobs: - name: ^dsvm-tempest.*$ @@ -82,3 +90,5 @@ projects: - name: openstack/nova # check: # - dsvm-tempest-xen + experimental: + - dsvm-tempest-xen-testing -- 2.39.5