Merge "Auto Update CSIT Jobs to run for aluminium"

diff --git a/docs/cloud-images.rst b/docs/cloud-images.rst
index 81492b45049f4fe3243bf50f348911b1e7d86e57..15b967269f509f302f250b54197a9a54c510fbc7 100644 (file)
--- a/docs/cloud-images.rst
+++ b/docs/cloud-images.rst
@@ -37,6 +37,7 @@ Following are the list of published images available to Jenkins jobs.
 * ZZCI - CentOS 7 - devstack-rocky - x86_64 - 20191002-183226.559
 * ZZCI - CentOS 7 - devstack-rocky - x86_64 - 20200801-000156.903
 * ZZCI - CentOS 7 - devstack-rocky - x86_64 - 20200811-042113.395
+* ZZCI - CentOS 7 - devstack-rocky - x86_64 - 20200813-042753.841
 * ZZCI - CentOS 7 - devstack-stein - x86_64 - 20200101-010206.159
 * ZZCI - CentOS 7 - devstack-stein - x86_64 - 20200112-040429.851
 * ZZCI - CentOS 7 - devstack-stein - x86_64 - 20200501-010133.750

diff --git a/jjb/integration/csit-jobs-magnesium.lst b/jjb/integration/csit-jobs-magnesium.lst
index b120a70b0928ef66cf10fc68c1335aab407b3bb4..211ff12a40a9c6149c7280c89936618396fbb962 100644 (file)
--- a/jjb/integration/csit-jobs-magnesium.lst
+++ b/jjb/integration/csit-jobs-magnesium.lst
@@ -27,7 +27,6 @@ netconf-csit-1node-userfeatures-all-magnesium,
 netconf-csit-1node-userfeatures-rfc8040-all-magnesium,
 netconf-csit-3node-clustering-only-magnesium,
 netconf-csit-3node-clustering-scale-only-magnesium,
-netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-upstream-snat-conntrack-magnesium,
 netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-stein-dcgw-magnesium,
 netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-stein-upgrade-magnesium,
 netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-stein-upgrade-snat-conntrack-magnesium,

diff --git a/jjb/integration/csit-jobs-sodium.lst b/jjb/integration/csit-jobs-sodium.lst
index 7b44c748b92fab974864d6f19c56f9ee34917682..81a3406a33efa75a85b8d71cfe6ad437ed276272 100644 (file)
--- a/jjb/integration/csit-jobs-sodium.lst
+++ b/jjb/integration/csit-jobs-sodium.lst
@@ -26,7 +26,6 @@ netconf-csit-1node-userfeatures-all-sodium,
 netconf-csit-1node-userfeatures-rfc8040-all-sodium,
 netconf-csit-3node-clustering-only-sodium,
 netconf-csit-3node-clustering-scale-only-sodium,
-netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-upstream-snat-conntrack-sodium,
 netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-dcgw-sodium,
 netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-itm-direct-tunnels-sodium,
 netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-snat-conntrack-sodium,

diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml
index df07cc90d045bc2a33c8124776d49fb3ee3c944e..752389d76710229db6b5c80746bdac8ca1af4070 100644 (file)
--- a/jjb/netconf/netconf-userfeatures.yaml
+++ b/jjb/netconf/netconf-userfeatures.yaml
@@ -34,7 +34,7 @@
       - all:
           scope: "all"
 
-    tools_system_image: ZZCI - Ubuntu 16.04 - docker - x86_64 - 20200301-170125.878
+    tools_system_image: ZZCI - Ubuntu 18.04 - mininet-ovs-28 - x86_64 - 20200731-200431.555
 
     # Features to install
     install-features: >