diff --git a/jenkins/jobs/kuryr.yaml b/jenkins/jobs/kuryr.yaml index eddda39d8d..cc31ed0b7b 100644 --- a/jenkins/jobs/kuryr.yaml +++ b/jenkins/jobs/kuryr.yaml @@ -317,6 +317,68 @@ - devstack-logs - console-log +- job-template: + name: '{pipeline}-kuryr-libnetwork{kuryr_lib-src}-dsvm-fullstack-py35-{node}{suffix}' + node: '{node}' + + wrappers: + - build-timeout: + timeout: 130 + - timestamps + + builders: + - print-template-name: + template-name: "{template-name}" + - link-logs + - net-info + - devstack-checkout + - local_conf: + conf: | + [[local|localrc]] + enable_plugin kuryr-libnetwork http://git.openstack.org/openstack/kuryr-libnetwork + # swift is not ready for python3 yet + disable_service s-account + disable_service s-container + disable_service s-object + disable_service s-proxy + - shell: | + #!/bin/bash -xe + export DEVSTACK_GATE_USE_PYTHON3=True + export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TEMPEST=0 + export DEVSTACK_GATE_NEUTRON=1 + export DEVSTACK_GATE_INSTALL_TESTONLY=1 + + export ENABLED_SERVICES=kuryr-libnetwork,etcd-server,docker-engine + export BRANCH_OVERRIDE={branch-override} + if [ "$BRANCH_OVERRIDE" != "default" ] ; then + export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE + fi + + export PROJECTS="openstack/kuryr-libnetwork $PROJECTS" + if [ "{kuryr_lib-src}" == "-kuryr_lib-src" ] ; then + export DEVSTACK_PROJECT_FROM_GIT="kuryr" + fi + export PROJECTS="openstack/devstack-plugin-container $PROJECTS" + + function gate_hook {{ + bash -xe $BASE/new/kuryr-libnetwork/kuryr_libnetwork/tests/contrib/gate_hook.sh fullstack + }} + export -f gate_hook + + function post_test_hook {{ + bash -xe $BASE/new/kuryr-libnetwork/kuryr_libnetwork/tests/contrib/post_test_hook.sh fullstack + }} + export -f post_test_hook + + cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh + ./safe-devstack-vm-gate-wrap.sh + + publishers: + - test-results + - devstack-logs + - console-log + - job-template: name: '{pipeline}-kuryr-libnetwork{kuryr_lib-src}-dsvm-rally-{node}{suffix}' node: '{node}' diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index fb38876952..93129300bf 100644 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -6452,6 +6452,12 @@ kuryr_lib-src: '-kuryr_lib-src' suffix: '' branch-override: default + - '{pipeline}-kuryr-libnetwork{kuryr_lib-src}-dsvm-fullstack-py35-{node}{suffix}': + pipeline: gate + node: ubuntu-xenial + kuryr_lib-src: '' + suffix: '-nv' + branch-override: default - '{pipeline}-kuryr-libnetwork{kuryr_lib-src}-dsvm-rally-{node}{suffix}': pipeline: gate node: ubuntu-xenial diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 7b7a8e6294..655ef0d113 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -11160,6 +11160,7 @@ projects: - gate-kuryr-libnetwork-kuryr_lib-src-dsvm-fullstack-ubuntu-xenial - gate-kuryr-libnetwork-dsvm-fullstack-ubuntu-xenial - gate-kuryr-libnetwork-kuryr_lib-src-dsvm-rally-ubuntu-xenial-nv + - gate-kuryr-libnetwork-dsvm-fullstack-py35-ubuntu-xenial-nv - gate-kuryr-libnetwork-dsvm-rally-ubuntu-xenial-nv gate: - gate-kuryr-libnetwork-kuryr_lib-src-dsvm-fullstack-ubuntu-xenial