Merge "Update gerrit-maven-docker-stage job"

diff --git a/global-jjb b/global-jjb
index a09b8ba..3c627cc 160000 (submodule)
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit a09b8bab2c37f67f0f5e9ef36f9e93b330fdd571
+Subproject commit 3c627ccf046b02f12767aa45d9ac4bf515352f2f

diff --git a/jjb/integration/include-raw-integration-robotframework.sh b/jjb/integration/include-raw-integration-robotframework.sh
new file mode 100644 (file)
index 0000000..7f4ed49
--- /dev/null
+++ b/jjb/integration/include-raw-integration-robotframework.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+##############################################################################
+# Copyright (c) 2016 The Linux Foundation and others.
+##############################################################################
+
+ROBOT3_VENV=$(mktemp -d --suffix=robot3_venv)
+echo "ROBOT3_VENV=${ROBOT3_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.
+virtualenv --system-site-packages "${ROBOT3_VENV}"
+source "${ROBOT3_VENV}/bin/activate"
+
+set -exu
+
+# Make sure pip itself us up-to-date.
+pip3 install --upgrade pip
+
+pip3 install --no-binary pycparser cffi setuptools-rust
+pip3 install pyOpenSSL docker-py importlib requests scapy netifaces netaddr ipaddr simplejson demjson
+pip3 install robotframework-httplibrary robotframework-requests robotframework-sshlibrary robotframework-selenium2library robotframework-xvfb
+
+pip3 install xvfbwrapper
+pip3 install PyVirtualDisplay
+
+# Print installed versions.
+pip3 freeze
+
+# Check robot module is available and working
+python3 -m robot.run --version
+
+# vim: sw=4 ts=4 sts=4 et ft=sh :

diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index c5e2e0c..61cb705 100644 (file)
--- a/jjb/sdc/sdc.yaml
+++ b/jjb/sdc/sdc.yaml
@@ -51,6 +51,7 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
+          mvn-version: 'mvn36'
           mvn-params: '-DskipTests=true -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/'
       - gerrit-maven-docker-stage:
           build-node: ubuntu1804-docker-v1-8c-8g

diff --git a/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml b/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml
index 86f3f21..60412f7 100644 (file)
--- a/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml
+++ b/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml
@@ -39,6 +39,9 @@
       - 'honolulu':
           branch: 'honolulu'
           java-version: openjdk11
+      - 'kohn':
+          branch: 'kohn'
+          java-version: openjdk11
     mvn-settings: 'so-adapters-so-etsi-sol003-adapter-settings'
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/so/so-adapters-so-nssmf-adapter.yaml b/jjb/so/so-adapters-so-nssmf-adapter.yaml
index d230d00..b311dd5 100644 (file)
--- a/jjb/so/so-adapters-so-nssmf-adapter.yaml
+++ b/jjb/so/so-adapters-so-nssmf-adapter.yaml
@@ -42,6 +42,9 @@
       - 'jakarta':
           branch: 'jakarta'
           java-version: openjdk11
+      - 'kohn':
+          branch: 'kohn'
+          java-version: openjdk11
     mvn-settings: 'so-adapters-so-nssmf-adapter-settings'
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml
index 1eb3c06..43609ca 100644 (file)
--- a/jjb/so/so.yaml
+++ b/jjb/so/so.yaml
@@ -32,6 +32,9 @@
       - 'jakarta':
           branch: 'jakarta'
           java-version: openjdk11
+      - 'kohn':
+          branch: 'kohn'
+          java-version: openjdk11
       - 'recursive-orch':
           branch: 'recursive-orch'
           java-version: openjdk11
@@ -118,3 +121,6 @@
       - 'jakarta':
           branch: 'jakarta'
           java-version: openjdk11
+      - 'kohn':
+          branch: 'kohn'
+          java-version: openjdk11