From 9b7b6b292b33f28cdd530655df7dea12b8e88ed1 Mon Sep 17 00:00:00 2001 From: Logan V Date: Fri, 22 Mar 2019 14:39:13 -0400 Subject: [PATCH] Use integrated repo scenario for Calico job Depends-On: I9f7b046b85203da20f022b6ee959290485b6aabd Depends-On: Iaf392898c072ac4b39d878bb27654406c5ab0d8b Change-Id: I9f58b567937c4481b679e009ce88dd47f9ad1e4f --- defaults/main.yml | 4 ++-- zuul.d/jobs.yaml | 6 ++---- zuul.d/project.yaml | 4 ++-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 9bad7c5d..43fa6931 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -439,8 +439,8 @@ neutron_management_ip: 127.0.0.1 # Calico Felix agent upstream settings calico_felix_url: "https://github.com/projectcalico/felix/releases/download/{{ calico_felix_version }}/calico-felix-amd64" -calico_felix_version: v3.5.2 -calico_felix_sha256: f7901c1b9e41c74c36b0ba2119c42c02ac6227af505f5bc571cee29e37b1550a +calico_felix_version: v3.7.0 +calico_felix_sha256: ae0bed304702097cee0ad5d9b4abb07b263deeb46ac21f2bcb0118d5bf439f46 calico_felix_validate_certs: yes # OVN Defaults diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 55f270e4..ad2caf35 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -32,10 +32,8 @@ tox_env: ovn - job: - name: openstack-ansible-calico-ubuntu-bionic - parent: openstack-ansible-functional-ubuntu-bionic - vars: - tox_env: calico + name: openstack-ansible-deploy-aio_metal_calico-ubuntu-bionic + parent: openstack-ansible-deploy-aio_metal-ubuntu-bionic - job: name: openstack-ansible-opendaylight-ubuntu-bionic diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index acc88657..0c965976 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -26,8 +26,7 @@ - openstack-ansible-ovn-ubuntu-bionic - openstack-ansible-ovn-centos-7: voting: false - - openstack-ansible-calico-ubuntu-bionic: - voting: false + - openstack-ansible-deploy-aio_metal_calico-ubuntu-bionic - openstack-ansible-opendaylight-ubuntu-bionic - openstack-ansible-ovs-nsh-ubuntu-bionic - openstack-ansible-odl-sfc-ubuntu-bionic @@ -41,6 +40,7 @@ jobs: - openstack-ansible-ovs-ubuntu-bionic - openstack-ansible-ovn-ubuntu-bionic + - openstack-ansible-deploy-aio_metal_calico-ubuntu-bionic - openstack-ansible-opendaylight-ubuntu-bionic - openstack-ansible-ovs-nsh-ubuntu-bionic - openstack-ansible-odl-sfc-ubuntu-bionic