From: Jamo Luhrsen <jluhrsen@gmail.com>
Date: Mon, 15 Jun 2020 17:49:06 +0000 (+0000)
Subject: Merge "Reduce Netvirt jobs costs"
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=0afff5123ee47675407db8ce810e5ac9c452f09f;hp=609871a13bfe46e41372a46beb75a362650bce4d;p=releng%2Fbuilder.git

Merge "Reduce Netvirt jobs costs"
---

diff --git a/global-jjb b/global-jjb
index 5dc3432ca..5fc616e4b 160000
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit 5dc3432cae2f13d9e5151a00a76a78ce73d92d70
+Subproject commit 5fc616e4b1231808c1f11608608415312b08aa02
diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-docker-1c-4g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-docker-1c-4g.cfg
index f7ef63c7d..5ab3289f9 100644
--- a/jenkins-config/clouds/openstack/odlvex/centos7-docker-1c-4g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-docker-1c-4g.cfg
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20200601-220134.752
+IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20191004-045622.840
 HARDWARE_ID=odl-standard-1
diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-2g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-2g.cfg
index 806e79ee7..e75e5302a 100644
--- a/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-2g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-2g.cfg
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20200601-220134.752
+IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20191004-045622.840
 HARDWARE_ID=odl-highcpu-2
diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-8g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-8g.cfg
index c69951670..4f052ef41 100644
--- a/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-8g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-8g.cfg
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20200601-220134.752
+IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20191004-045622.840
 HARDWARE_ID=odl-standard-2
diff --git a/jenkins-config/clouds/openstack/odlvex/ubuntu1604-mininet-ovs-28-1c-4g.cfg b/jenkins-config/clouds/openstack/odlvex/ubuntu1604-mininet-ovs-28-1c-4g.cfg
new file mode 100644
index 000000000..59abc8d4b
--- /dev/null
+++ b/jenkins-config/clouds/openstack/odlvex/ubuntu1604-mininet-ovs-28-1c-4g.cfg
@@ -0,0 +1,2 @@
+IMAGE_NAME=ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013
+HARDWARE_ID=odl-standard-1
diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index c28d4f55f..d607c9f05 100644
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -573,7 +573,6 @@
       - lf-update-java-alternatives:
           java-version: "{java-version}"
       - autorelease-checkout-gerrit-patch
-      - autorelease-compare-projects
       - lf-jacoco-nojava-workaround
       - shell: "./scripts/list-project-dependencies.sh"
       - autorelease-determine-merge-order
diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index d3ebc3396..aeab9b814 100644
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -87,9 +87,9 @@
     elasticsearch-attribute: 'disabled'
 
     # CSIT images configuration
-    openstack_stein_system_image: ZZCI - CentOS 7 - devstack-stein - x86_64 - 20200501-010133.750
+    openstack_stein_system_image: ZZCI - CentOS 7 - devstack-stein - x86_64 - 20200112-040429.851
     openstack_rocky_system_image: ZZCI - CentOS 7 - devstack-rocky - x86_64 - 20191002-183226.559
-    openstack_queens_system_image: ZZCI - CentOS 7 - devstack-queens - x86_64 - 20200601-190140.080
+    openstack_queens_system_image: ZZCI - CentOS 7 - devstack-queens - x86_64 - 20191004-045555.756
 
     # Default Robot framework options
     robot-options: ''
diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 1cb813769..422f3b160 100644
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -82,7 +82,7 @@
     controller-max-mem: '2048m'
     tools_system_count: '1'
     tools_system_flavor: 'odl-highcpu-2'
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
 
     #####################
     # Job configuration #
@@ -191,7 +191,7 @@
     controller-max-mem: '2048m'
     tools_system_count: '1'
     tools_system_flavor: 'odl-highcpu-2'
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
 
 
     #####################
@@ -500,7 +500,7 @@
     controller-max-mem: '2048m'
     tools_system_count: '1'
     tools_system_flavor: 'odl-highcpu-2'
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
 
     #####################
     # Job Configuration #
@@ -612,7 +612,7 @@
     controller-max-mem: '2048m'
     tools_system_count: '1'
     tools_system_flavor: 'odl-highcpu-2'
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
 
     #####################
     # Job configuration #
@@ -922,7 +922,7 @@
     controller-max-mem: '2048m'
     docker_system_count: '1'
     docker_system_flavor: 'odl-standard-1'
-    docker_system_image: 'ZZCI - CentOS 7 - docker - x86_64 - 20200601-220134.752'
+    docker_system_image: 'ZZCI - CentOS 7 - docker - x86_64 - 20191004-045622.840'
 
     #####################
     # Job Configuration #
@@ -1057,13 +1057,13 @@
     controller-max-mem: '2048m'
     openstack_system_count: 1
     openstack_system_flavor: 'odl-standard-4'
-    openstack_system_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20200601-230324.154'
+    openstack_system_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20191004-045548.485'
     openstack_system2_count: 0
     openstack_system2_flavor: 'odl-standard-1'
-    openstack_system2_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20200601-230324.154'
+    openstack_system2_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20191004-045548.485'
     tools_system_count: 1
     tools_system_flavor: 'odl-highcpu-2'
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
 
     #####################
     # Job configuration #
@@ -1485,13 +1485,13 @@
     controller-max-mem: '2048m'
     openstack_system_count: 1
     openstack_system_flavor: 'odl-standard-4'
-    openstack_system_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20200601-230324.154'
+    openstack_system_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20191004-045548.485'
     openstack_system2_count: 0
     openstack_system2_flavor: 'odl-standard-1'
-    openstack_system2_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20200601-230324.154'
+    openstack_system2_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20191004-045548.485'
     tools_system_count: 1
     tools_system_flavor: 'odl-highcpu-2'
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
 
     #####################
     # Job configuration #
diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 501df4d29..a39e02e07 100644
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -15,6 +15,7 @@
       - gerrit-tox-verify:
           branch: master
           stream: master
+          build-node: centos7-builder-2c-2g
 
     # CSIT Lists in defaults.yaml
     stream:
diff --git a/jjb/lf-infra/lf-infra-jobs.yaml b/jjb/lf-infra/lf-infra-jobs.yaml
index 20d4d6299..d27c3f5ef 100644
--- a/jjb/lf-infra/lf-infra-jobs.yaml
+++ b/jjb/lf-infra/lf-infra-jobs.yaml
@@ -154,6 +154,7 @@
     project: releng/lftools
     project-pattern: releng/lftools
     build-node: centos7-builder-2c-2g
+    build-timeout: 30
     rtd-build-url: https://readthedocs.org/api/v2/webhook/lf-releng-tools/32933/
     rtd-token: 47a135ceba9053c6f88394a7171ebf5602a9fc95
     stream: any
diff --git a/jjb/lfn/lfn.yaml b/jjb/lfn/lfn.yaml
deleted file mode 100644
index 68d539616..000000000
--- a/jjb/lfn/lfn.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
----
-- project:
-    name: lfn-process
-    jobs:
-      - '{project-name}-rtd-jobs'
-      - gerrit-tox-verify
-
-    project-name: lfn-process
-    project: lfn/process
-    project-pattern: lfn/process
-    build-node: centos7-builder-2c-1g
-    rtd-build-url: https://readthedocs.org/api/v2/webhook/lfn-process/33719/
-    rtd-token: e505b4ae2bf222dcd2b6b08d7b04384ac0459b19
-    stream: any
-    branch: '*'
-
-    git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
-    gerrit-server-name: lf-releng
-
-- project:
-    name: lfn-view
-    views:
-      - project-view
-    project-name: lfn-process
diff --git a/jjb/netconf/netconf-csit-callhome.yaml b/jjb/netconf/netconf-csit-callhome.yaml
index 574dfc2c4..8b83aebe9 100644
--- a/jjb/netconf/netconf-csit-callhome.yaml
+++ b/jjb/netconf/netconf-csit-callhome.yaml
@@ -28,7 +28,7 @@
           scope: 'only'
 
     # no mininet required
-    tools_system_image: ZZCI - Ubuntu 16.04 - docker - x86_64 - 20200401-170202.250
+    tools_system_image: ZZCI - Ubuntu 16.04 - docker - x86_64 - 20190614-042302.610
 
     # Features to install
     install-features: 'odl-netconf-callhome-ssh,odl-restconf'
diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml
index 60a8c5b9e..02f2ffbdc 100644
--- a/jjb/netconf/netconf-userfeatures.yaml
+++ b/jjb/netconf/netconf-userfeatures.yaml
@@ -29,7 +29,7 @@
       - all:
           scope: 'all'
 
-    tools_system_image: ZZCI - Ubuntu 16.04 - docker - x86_64 - 20200401-170202.250
+    tools_system_image: ZZCI - Ubuntu 16.04 - docker - x86_64 - 20190614-042302.610
 
     # Features to install
     install-features: >
diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
index b6e5ea468..de97548d5 100644
--- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
@@ -17,7 +17,7 @@
     openstack_system_flavor: odl-highcpu-8
     openstack_system2_flavor: odl-highcpu-4
     tools_system_count: 2
-    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - x86_64 - 20200601-180138.390
+    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20190521-223726.040
     os-cmb-cnt: 0
     os-ctl-cnt: 1
     os-cmp-cnt: 2
@@ -170,7 +170,7 @@
     openstack_system_flavor: odl-highcpu-8
     openstack_system2_flavor: odl-highcpu-4
     tools_system_count: 2
-    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - x86_64 - 20200601-180138.390
+    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20190521-223726.040
     os-cmb-cnt: 0
     os-ctl-cnt: 1
     os-cmp-cnt: 2
@@ -324,7 +324,7 @@
     openstack_system_flavor: odl-highcpu-8
     openstack_system2_flavor: odl-highcpu-4
     tools_system_count: 2
-    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - x86_64 - 20200601-180138.390
+    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20190521-223726.040
     os-cmb-cnt: 0
     os-ctl-cnt: 1
     os-cmp-cnt: 2
diff --git a/jjb/openci/create-ape.sh b/jjb/openci/create-ape.sh
deleted file mode 100755
index eb3c3437b..000000000
--- a/jjb/openci/create-ape.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/bash
-# SPDX-license-identifier: Apache-2.0
-##############################################################################
-# Copyright (c) 2018 Ericsson AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-set -o errexit
-set -o nounset
-set -o pipefail
-
-# workaround for https://github.com/pypa/virtualenv/issues/1029
-export PS1=${PS1:-}
-
-# This script creates ArtifactPublishedEvent (APE)
-
-git clone https://gitlab.openci.io/openci/prototypes.git
-cd prototypes/federated-cicd
-virtualenv openci_publish
-cd openci_publish
-# shellcheck disable=SC1091
-source bin/activate
-python setup.py install
-
-# generate event body
-cat <<EOF > ./json_body.txt
-{
-    "type": "$PUBLISH_EVENT_TYPE",
-    "id": "$(uuidgen)",
-    "time": "$(date -u +%Y-%m-%d_%H:%M:%SUTC)",
-    "buildUrl": "$BUILD_URL",
-    "branch": "master",
-    "origin": "$PUBLISH_EVENT_ORIGIN",
-    "artifactLocation": "$ARTIFACT_LOCATION",
-    "confidenceLevel": "$CONFIDENCE_LEVEL"
-}
-EOF
-
-echo "Constructed $PUBLISH_EVENT_TYPE"
-echo "--------------------------------------------"
-cat  ./json_body.txt
-echo "--------------------------------------------"
-
-python openci_publish -H 129.192.69.55 -U "${ACTIVEMQ_USER}" -p "${ACTIVEMQ_PASSWORD}" -n openci.prototype -B ./json_body.txt
-
-deactivate
diff --git a/jjb/openci/openci-odl-daily-jobs.yaml b/jjb/openci/openci-odl-daily-jobs.yaml
deleted file mode 100644
index 8cb06fe70..000000000
--- a/jjb/openci/openci-odl-daily-jobs.yaml
+++ /dev/null
@@ -1,99 +0,0 @@
----
-- project:
-    name: openci-odl
-
-    project: '{name}'
-
-    stream:
-      - master:
-          branch: '{stream}'
-          gs-pathname: ''
-          disabled: false
-
-    jobs:
-      - 'openci-odl-autorelease-daily-{stream}'
-      - 'openci-odl-promote-daily-{stream}'
-
-# This job gets triggered manually for the demo purposes.
-#
-# In prototype, either what this job does needs to be integrated to
-# ODL autorelease job or triggered by the upstream autorelease job.
-- job-template:
-    name: 'openci-odl-autorelease-daily-{stream}'
-
-    disabled: '{obj:disabled}'
-
-    concurrent: false
-
-    build-node: centos7-builder-2c-2g
-
-    parameters:
-      - string:
-          name: PUBLISH_EVENT_TYPE
-          default: ArtifactPublishedEvent
-          description: 'The type of the event this job publishes'
-      - string:
-          name: PUBLISH_EVENT_ORIGIN
-          default: ODL
-          description: 'Originating community'
-      - string:
-          name: ARTIFACT_LOCATION
-          default: https://url/to/artifact/on/odl/nexus/$BUILD_NUMBER
-          description: 'The location of the artifact on ODL Nexus'
-      - string:
-          name: CONFIDENCE_LEVEL
-          default: "'autorelease': 'SUCCESS'"
-          description: 'The confidence level the published artifact gained'
-
-    wrappers:
-      - credentials-binding:
-          - username-password-separated:
-              credential-id: openci-connect-activemq
-              username: ACTIVEMQ_USER
-              password: ACTIVEMQ_PASSWORD
-      - workspace-cleanup
-
-    builders:
-      # this build step in the job executes create-ape.sh to construct the
-      # ArtifactPublishedEvent (ape) and publishes it using the python utility
-      - shell:
-          !include-raw-escape: ./create-ape.sh
-
-# This job gets triggered by a ConfidenceLevelModifiedEvent published
-# by OPNFV jobs so ODL can promote the autorelease artifact even further.
-#
-# This job is created for the demo purposes and might not be there for
-# the prototype.
-- job-template:
-    name: 'openci-odl-promote-daily-{stream}'
-
-    disabled: '{obj:disabled}'
-
-    concurrent: false
-
-    build-node: centos7-builder-2c-2g
-
-    triggers:
-      - jms-messaging:
-          provider-name: openci.activemq
-          selector: >
-            JMSType = 'ConfidenceLevelModifiedEvent' and
-            JMSOrigin = 'OPNFV' and
-            JMSScenario = 'os-odl-nofeature-ha'
-
-    builders:
-      - shell: |
-          #!/bin/bash
-
-          echo
-          echo "Triggered by $type"
-          echo "----------------------------------"
-          echo $CI_MESSAGE
-          echo "----------------------------------"
-          echo " Promoted ODL Autorelease artifact as release candidate!"
-
-- project:
-    name: openci-odl-view
-    views:
-      - project-view
-    project-name: openci-odl
diff --git a/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml b/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml
index cb35b60aa..3fca0825a 100644
--- a/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml
@@ -25,7 +25,7 @@
 
     # Job images
     tools_system_count: 2
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
 
     # Features to install
     install-features: 'odl-openflowplugin-flow-services-rest'
diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
index f4f6c94ca..be28da8d5 100644
--- a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
@@ -26,7 +26,7 @@
           scope: 'only'
 
     # Job images
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
 
     # Features to install
     install-features: 'odl-openflowplugin-flow-services-rest,odl-openflowplugin-drop-test'
diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml
index 358ab1849..27007e3d0 100644
--- a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml
@@ -28,7 +28,7 @@
           scope: 'only'
 
     # Job images
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
 
     # Features to install
     install-features: 'odl-openflowplugin-flow-services-rest,odl-openflowplugin-app-bulk-o-matic'
diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml
index 38341100f..ff8f0e119 100644
--- a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml
@@ -28,7 +28,7 @@
           scope: 'only'
 
     # Job images
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
 
     # Features to install
     install-features: >
diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
index 3519fe0e8..2e25311f6 100644
--- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
@@ -28,7 +28,7 @@
           scope: 'only'
 
     # Job images
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
 
     # Features to install
     install-features: >
diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
index 0facb7884..3c0b7c641 100644
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
@@ -27,7 +27,7 @@
           install: 'all'
 
     # Job images
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
 
     # Features to install
     install-features: >
diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
index 223cdcf0f..6fe25d0fd 100644
--- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
@@ -30,7 +30,7 @@
           scope: 'only'
 
     # Job images
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
 
     # Features to install
     install-features: >
diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
index 70fdc5d74..c690cc11c 100644
--- a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
@@ -28,7 +28,7 @@
           scope: 'only'
 
     # Job images
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
 
     # Features to install
     install-features: >
diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
index 151c35999..da81f9e39 100644
--- a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
@@ -28,7 +28,7 @@
           scope: 'only'
 
     # Job images
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
 
     # Features to install
     install-features: 'odl-openflowplugin-flow-services-rest'
diff --git a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
index c0a3c9e13..4c3fdfdb2 100644
--- a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
@@ -27,7 +27,7 @@
           scope: 'only'
 
     # Job images
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
 
     # Features to install
     install-features: >
diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml
index 3db4692bf..2f15c4062 100644
--- a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml
@@ -26,7 +26,7 @@
           scope: 'only'
 
     # Job images
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
 
     # Features to install
     install-features: >
diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
index a40ab4a53..54a71fbf3 100644
--- a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
@@ -26,7 +26,7 @@
           scope: 'only'
 
     # Job images
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
 
     # Features to install
     install-features: >
diff --git a/jjb/openflowplugin/openflowplugin-csit-scale.yaml b/jjb/openflowplugin/openflowplugin-csit-scale.yaml
index 7d0ee2593..74a5ef9fc 100644
--- a/jjb/openflowplugin/openflowplugin-csit-scale.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale.yaml
@@ -28,7 +28,7 @@
           scope: 'only'
 
     # Job images
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
 
     # Features to install
     install-features: >
diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index 69d329963..a5ab4b127 100644
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -22,6 +22,7 @@
       - gerrit-tox-verify
       # Automation for docs and jobs
       - 'builder-update-image-list'
+      - gerrit-info-yaml-verify
 
     # The following values are only specified here
     # so that code blocks look similar to other projects.
diff --git a/jjb/transportpce/transportpce.yaml b/jjb/transportpce/transportpce.yaml
index 762559292..a5ed92fb2 100644
--- a/jjb/transportpce/transportpce.yaml
+++ b/jjb/transportpce/transportpce.yaml
@@ -9,7 +9,7 @@
           rtd-token: 6f37ba63226bdcc6c823ee455e62237cf68813fd
       - gerrit-tox-verify:
           build-timeout: 120
-          build-node: centos7-builder-8c-8g
+          build-node: centos7-builder-4c-16g
       - gerrit-release-merge
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
@@ -37,7 +37,7 @@
           rtd-token: 6f37ba63226bdcc6c823ee455e62237cf68813fd
       - gerrit-tox-verify:
           build-timeout: 120
-          build-node: centos7-builder-8c-8g
+          build-node: centos7-builder-4c-16g
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
@@ -64,7 +64,7 @@
           rtd-token: 6f37ba63226bdcc6c823ee455e62237cf68813fd
       - gerrit-tox-verify:
           build-timeout: 120
-          build-node: centos7-builder-8c-8g
+          build-node: centos7-builder-4c-16g
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
diff --git a/packer/provision/mininet-ovs-2.8.yaml b/packer/provision/mininet-ovs-2.8.yaml
index dbd778465..06dc8c011 100644
--- a/packer/provision/mininet-ovs-2.8.yaml
+++ b/packer/provision/mininet-ovs-2.8.yaml
@@ -134,6 +134,17 @@
       apt: name=vlan state=present
       become: true
 
+    - name: Install CSIT dependencies
+      apt:
+        name:
+          - git-review
+          - python-chardet
+          - python-ndg-httpsclient
+          - python-requests
+          - python-urllib3
+        state: present
+      become: true
+
   post_tasks:
     - name: System Reseal
       script: ../common-packer/provision/system-reseal.sh
diff --git a/scripts/.gitignore b/scripts/.gitignore
deleted file mode 100644
index c5ec4a4cb..000000000
--- a/scripts/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-# Python
-__pycache__/
-*.pyc
-
-# ODL Signer
-.sign-artifacts
-gpg-signatures
diff --git a/tox.ini b/tox.ini
index 87e40692f..9cea7543a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -32,7 +32,8 @@ basepython = python3
 deps = pre-commit
 commands =
     pre-commit install --hook-type commit-msg
-    pre-commit run --all-files
+    pre-commit run --all-files --show-diff-on-failure
+    pre-commit run gitlint --hook-stage commit-msg --commit-msg-filename .git/COMMIT_EDITMSG
 
 [testenv:prefix]
 commands = python {toxinidir}/check_prefix.py