Merge "Use integrated repo scenario for Calico job"

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

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

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