Merge "Update cloud image CentOS7 builder x86_64"

diff --git a/global-jjb b/global-jjb
index d233be84b81a56b80356ac0f20a1658c9a93a5dd..74a4defcfba1d8d39bf1db6889909afcc1ab1a83 160000 (submodule)
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit d233be84b81a56b80356ac0f20a1658c9a93a5dd
+Subproject commit 74a4defcfba1d8d39bf1db6889909afcc1ab1a83

diff --git a/jjb/integration/csit-jobs-chlorine.lst b/jjb/integration/csit-jobs-chlorine.lst
index df9892a308a6e8a661874e5a44411f8b9ac69843..4e99cb4090d985d781340a135182596cfb66f52c 100644 (file)
--- a/jjb/integration/csit-jobs-chlorine.lst
+++ b/jjb/integration/csit-jobs-chlorine.lst
@@ -6,7 +6,6 @@ daexim-csit-1node-basic-only-chlorine,
 daexim-csit-3node-clustering-basic-only-chlorine,
 distribution-csit-managed-chlorine,
 jsonrpc-csit-1node-basic-only-chlorine,
-odltools-csit-1node-upstream-all-chlorine,
 openflowplugin-csit-1node-cbench-only-chlorine,
 openflowplugin-csit-1node-flow-services-all-chlorine,
 openflowplugin-csit-1node-perf-bulkomatic-only-chlorine,

diff --git a/jjb/integration/csit-jobs-phosphorus.lst b/jjb/integration/csit-jobs-phosphorus.lst
index b5c7fd3e774c5d3695e6ced05e9acf3df4dab5be..07f041b9dd55582b7c6210990df02c17f1db3b20 100644 (file)
--- a/jjb/integration/csit-jobs-phosphorus.lst
+++ b/jjb/integration/csit-jobs-phosphorus.lst
@@ -6,7 +6,6 @@ daexim-csit-1node-basic-only-phosphorus,
 daexim-csit-3node-clustering-basic-only-phosphorus,
 distribution-csit-managed-phosphorus,
 jsonrpc-csit-1node-basic-only-phosphorus,
-odltools-csit-1node-upstream-all-phosphorus,
 openflowplugin-csit-1node-cbench-only-phosphorus,
 openflowplugin-csit-1node-flow-services-all-phosphorus,
 openflowplugin-csit-1node-perf-bulkomatic-only-phosphorus,

diff --git a/jjb/integration/csit-jobs-sulfur.lst b/jjb/integration/csit-jobs-sulfur.lst
index 1bbb9d8ac6b26633db29f44e0b41577e19689f80..edc97c78f74e4b508e86542fb305d4c64fdce260 100644 (file)
--- a/jjb/integration/csit-jobs-sulfur.lst
+++ b/jjb/integration/csit-jobs-sulfur.lst
@@ -6,7 +6,6 @@ daexim-csit-1node-basic-only-sulfur,
 daexim-csit-3node-clustering-basic-only-sulfur,
 distribution-csit-managed-sulfur,
 jsonrpc-csit-1node-basic-only-sulfur,
-odltools-csit-1node-upstream-all-sulfur,
 openflowplugin-csit-1node-cbench-only-sulfur,
 openflowplugin-csit-1node-flow-services-all-sulfur,
 openflowplugin-csit-1node-perf-bulkomatic-only-sulfur,

diff --git a/jjb/integration/integration-install-robotframework.sh b/jjb/integration/integration-install-robotframework.sh
index 5f909177a065fa3cd094e8fedcb9b3e2a5fa7ebf..215a164227dd4cabd2e463911221a7b2624a60c2 100644 (file)
--- a/jjb/integration/integration-install-robotframework.sh
+++ b/jjb/integration/integration-install-robotframework.sh
@@ -1,4 +1,4 @@
-#!/bin/sh -l
+#!/bin/bash -l
 # SPDX-License-Identifier: EPL-1.0
 ##############################################################################
 # Copyright (c) 2015 The Linux Foundation and others.
@@ -10,20 +10,20 @@
 ##############################################################################
 # vim: sw=4 ts=4 sts=4 et ft=sh :
 
-ROBOT_VENV="/tmp/v/robot"
-echo ROBOT_VENV="${ROBOT_VENV}" >> "${WORKSPACE}/env.properties"
-
-# The --system-site-packages parameter allows us to pick up system level
-# installed packages. This allows us to bake matplotlib which takes very long
-# to install into the image.
-python3 -m venv "${ROBOT_VENV}"
 # shellcheck disable=SC1090
-. "${ROBOT_VENV}/bin/activate"
+. ~/lf-env.sh
 
-set -exu
+# Create a virtual environment for robot tests and make sure setuptools & wheel
+# are up-to-date in addition to pip
+lf-activate-venv --python python3 --venv-file "${WORKSPACE}/.robot_venv" \
+    setuptools \
+    wheel
+
+# Save the virtual environment in ROBOT_VENV
+ROBOT_VENV="$(cat "${WORKSPACE}/.robot_venv")"
+echo ROBOT_VENV="${ROBOT_VENV}" >> "${WORKSPACE}/env.properties"
 
-# Make sure pip itself us up-to-date.
-python -m pip install --upgrade pip
+set -exu
 
 echo "Installing Python Requirements"
 cat << 'EOF' > "requirements.txt"
@@ -33,6 +33,7 @@ netaddr
 netifaces
 pyhocon
 requests
+robotframework
 robotframework-httplibrary
 robotframework-requests==0.7.2
 robotframework-selenium2library
@@ -57,14 +58,7 @@ jmespath
 
 # Module for backup-restore support library
 jsonpatch
-
-# odltools for extra debugging
-odltools
 EOF
+
 python -m pip install -r requirements.txt
-# Todo: Workaround needs pinned version of odltool to the latest because of the
-# update in the dependency resolver in pip 21.3.
-# Ref: https://github.com/pypa/pip/issues/9215
-pip install odltools==0.1.34
-odltools -V
 pip freeze

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 0e99a159b3b363b5900eda020910b7d73b4a7e25..228757c52bed43e6ddf7991ac47d0f035793526a 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -412,57 +412,6 @@
     # yamllint disable-line rule:key-duplicates
     <<: *inttest_csit_1node
 
-- job-template:
-    name: "{prefix}{project}-csit-1node-{functionality}-{install}-{stream}"
-    id: inttest-csit-1node-custom
-    <<: *inttest_csit_common
-    # yamllint disable-line rule:key-duplicates
-    <<: *inttest_csit_1node
-
-    parameters:
-      - integration-csit-parameters:
-          archive-artifacts: "{archive-artifacts}"
-          branch: "{branch}"
-          os-cloud: "{os-cloud}"
-          # CSIT
-          bundle-url: "{bundle-url}"
-          repo-url: "{repo-url}"
-          robot-options: "{robot-options}"
-          # Controller
-          controller-scope: "{install}"
-          controller-max-mem: "{controller-max-mem}"
-          debug-map: "{debug-map}"
-          install-features: "{install-features}"
-          use-features-boot: "True"
-          elasticsearch-attribute: "{elasticsearch-attribute}"
-          karaf-based-controller: "{karaf-based-controller}"
-          karaf-version: "{karaf-version}"
-      - integration-stack-2-type:
-          vm_0_count: "1"
-          vm_0_flavor: "{odl_system_flavor}"
-          vm_0_image: "{odl_system_image}"
-          vm_1_count: "{tools_system_count}"
-          vm_1_flavor: "{tools_system_flavor}"
-          vm_1_image: "{tools_system_image}"
-      - integration-distribution-branch:
-          branch: "{branch}"
-      - integration-distribution-stream:
-          stream: "{stream}"
-      - integration-script-plan:
-          script-plan: "{project}.txt"
-      - integration-config-plan:
-          config-plan: "{project}.txt"
-      - integration-stream-test-plan:
-          stream-test-plan: "{project}-{functionality}-{stream}.txt"
-      - integration-test-plan:
-          test-plan: "{testplan}"
-      - integration-test-suites:
-          test-suites: "{test-suites}"
-      - integration-patch-refspec:
-          branch: "master"
-      - integration-jdk-version:
-          jdkversion: "{jre}"
-
 - job-template:
     name: "{prefix}{project}-csit-verify-3node-{functionality}"
     id: inttest-csit-verify-3node

diff --git a/jjb/odltools/odltools-csit.yaml b/jjb/odltools/odltools-csit.yaml
deleted file mode 100644 (file)
index dfb50e6..0000000
--- a/jjb/odltools/odltools-csit.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
----
-- project:
-    name: odltools-csit
-    jobs:
-      - inttest-csit-1node-custom
-      - inttest-csit-verify-1node
-
-    project: odltools
-    tools_system_count: 0
-    testplan: "{project}-basic.txt"
-
-    stream:
-      - chlorine:
-          branch: "master"
-          jre: "openjdk17"
-      - sulfur:
-          branch: "stable/sulfur"
-          jre: "openjdk11"
-      - phosphorus:
-          branch: "stable/phosphorus"
-          jre: "openjdk11"
-
-    functionality:
-      - "upstream"
-      - "gate"
-
-    install:
-      - all:
-          scope: "all"