Browse Source

Remove kuryr legacy job and move the Zuulv3 one to experimental gate

As current kuryr job is not even installing networking-ovn nor kuryr,
this patch is removing it. Even if we decide to fix it [0], its value
is still unclear since we would be depending on more projects and
we would have to run kuryr's tempest tests instead of ours.

As kuryr folks are setting up a new job to their gate using OVN as
a backend [1], let's remove this job from networking-ovn gate for now
and run their Zuulv3 job to the experimental pipeline.

Closes-bug: #1748857

[0] https://review.openstack.org/#/c/543419/
[1] https://review.openstack.org/#/c/543864/

Change-Id: Iea69d16a6ae919404987643732ee3ac6582c31a7
Signed-off-by: Daniel Alvarez <dalvarez@redhat.com>
(cherry picked from commit 71a5d89975)
changes/59/601959/1
Daniel Alvarez 4 years ago
committed by Lucas Alvares Gomes
parent
commit
4bf53bbfc4
  1. 25
      devstack/devstackgatekuryrrc
  2. 15
      playbooks/legacy/install-dsvm-networking-ovn-kuryr/post.yaml
  3. 63
      playbooks/legacy/install-dsvm-networking-ovn-kuryr/run.yaml
  4. 11
      zuul.d/legacy-networking-ovn-jobs.yaml
  5. 4
      zuul.d/project.yaml

25
devstack/devstackgatekuryrrc

@ -1,25 +0,0 @@
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
#
# This script is executed in the install-dsvm-networking-ovn-kuryr
# OpenStack CI job that runs DevStack + kuryr. You can find the
# CI job configuration here:
#
# http://git.openstack.org/cgit/openstack-infra/project-config/tree/jenkins/jobs/networking-ovn.yaml
#
export OVERRIDE_ENABLED_SERVICES=kuryr,etcd-server,docker-engine,key,n-api,n-cpu,n-cond,n-sch,n-crt,n-cauth,n-obj,placement-api,g-api,g-reg,c-sch,c-api,c-vol,rabbit,tempest,mysql,dstat,ovn-northd,ovn-controller,q-svc
export PROJECTS="openstack/networking-ovn openstack/kuryr $PROJECTS"
export DEVSTACK_LOCAL_CONFIG="enable_plugin networking-ovn git://git.openstack.org/openstack/networking-ovn"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin kuryr http://git.openstack.org/openstack/kuryr"

15
playbooks/legacy/install-dsvm-networking-ovn-kuryr/post.yaml

@ -1,15 +0,0 @@
- hosts: primary
tasks:
- name: Copy files from {{ ansible_user_dir }}/workspace/ on node
synchronize:
src: '{{ ansible_user_dir }}/workspace/'
dest: '{{ zuul.executor.log_root }}'
mode: pull
copy_links: true
verify_host: true
rsync_opts:
- --include=/logs/**
- --include=*/
- --exclude=*
- --prune-empty-dirs

63
playbooks/legacy/install-dsvm-networking-ovn-kuryr/run.yaml

@ -1,63 +0,0 @@
- hosts: all
name: Autoconverted job legacy-install-dsvm-networking-ovn-kuryr from old job gate-install-dsvm-networking-ovn-kuryr
tasks:
- name: Ensure legacy workspace directory
file:
path: '{{ ansible_user_dir }}/workspace'
state: directory
- shell:
cmd: |
set -e
set -x
cat > clonemap.yaml << EOF
clonemap:
- name: openstack-infra/devstack-gate
dest: devstack-gate
EOF
/usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
git://git.openstack.org \
openstack-infra/devstack-gate
executable: /bin/bash
chdir: '{{ ansible_user_dir }}/workspace'
environment: '{{ zuul | zuul_legacy_vars }}'
- shell:
cmd: |
set -e
set -x
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_NEUTRON=1
export DEVSTACK_GATE_TEMPEST=0
export BRANCH_OVERRIDE=default
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi
# Keep localrc to be able to set some vars in pre_test_hook
export KEEP_LOCALRC=1
function pre_test_hook {
if [ -f $BASE/new/networking-ovn/devstack/pre_test_hook.sh ] ; then
. $BASE/new/networking-ovn/devstack/pre_test_hook.sh
fi
}
export -f pre_test_hook
function post_test_hook {
if [ -f $BASE/new/networking-ovn/devstack/post_test_hook.sh ] ; then
. $BASE/new/networking-ovn/devstack/post_test_hook.sh
fi
}
export -f post_test_hook
export DEVSTACK_GATE_SETTINGS=/opt/stack/new/networking-ovn/devstack/devstackgatekuryrrc
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
./safe-devstack-vm-gate-wrap.sh
executable: /bin/bash
chdir: '{{ ansible_user_dir }}/workspace'
environment: '{{ zuul | zuul_legacy_vars }}'

11
zuul.d/legacy-networking-ovn-jobs.yaml

@ -45,17 +45,6 @@
- openstack-infra/devstack-gate
- openstack/networking-ovn
- job:
name: networking-ovn-install-dsvm-kuryr
parent: legacy-networking-ovn-dsvm-base
run: playbooks/legacy/install-dsvm-networking-ovn-kuryr/run.yaml
post-run: playbooks/legacy/install-dsvm-networking-ovn-kuryr/post.yaml
timeout: 7500
required-projects:
- openstack-infra/devstack-gate
- openstack/kuryr
- openstack/networking-ovn
- job:
name: networking-ovn-dsvm-functional
parent: legacy-networking-ovn-dsvm-base

4
zuul.d/project.yaml

@ -14,7 +14,6 @@
- networking-ovn-dsvm-functional
- networking-ovn-dsvm-functional-py35:
branches: ^(?!stable/newton).*$
- networking-ovn-install-dsvm-kuryr
- networking-ovn-tempest-dsvm-neutron-api-scenario-ovs-release:
voting: false
# TripleO jobs that deploy OVN.
@ -38,7 +37,6 @@
- networking-ovn-dsvm-functional
- networking-ovn-dsvm-functional-py35:
branches: ^(?!stable/newton).*$
- networking-ovn-install-dsvm-kuryr
- tripleo-ci-centos-7-scenario007-multinode-oooq
- tripleo-ci-centos-7-scenario007-multinode-oooq-container
experimental:
@ -51,9 +49,9 @@
- networking-ovn-tempest-dsvm-multinode:
voting: false
branches: ^(?!stable/newton).*$
- kuryr-kubernetes-tempest-ovn
periodic:
jobs:
- openstack-tox-py35-with-ovsdbapp-master:
required-projects:
- openstack/neutron
Loading…
Cancel
Save