Merge "Update ubuntu1804-docker base image"

diff --git a/jjb/ric-plt-xapp-frame-py/ric-plt-xapp-frame-py.yaml b/jjb/ric-plt-xapp-frame-py/ric-plt-xapp-frame-py.yaml
index 2faa2c3..5274db0 100644 (file)
--- a/jjb/ric-plt-xapp-frame-py/ric-plt-xapp-frame-py.yaml
+++ b/jjb/ric-plt-xapp-frame-py/ric-plt-xapp-frame-py.yaml
@@ -19,8 +19,11 @@
     project: ric-plt/xapp-frame-py
     # jenkins job name prefix
     project-name: ric-plt-xapp-frame-py
-    # maven settings file has credentials
-    mvn-settings: ric-plt-xapp-frame-py-settings
+    # dont run docs on verify
+    tox-envs: code,flake8
+    build-node: ubuntu1804-builder-2c-2g
+    pre-build-script: !include-raw-escape:
+      - ../shell/install-deb-nng-rmr.sh
 
 # verify distribution and publish to test.pypi.org
 - project:
@@ -36,7 +39,7 @@
 - project:
     name: ric-plt-xapp-frame-py-release
     <<: *py_common
-    # maven release requires sigul which requires centos
+    # release requires sigul which requires centos
     build-node: centos7-builder-1c-1g
     jobs:
       - '{project-name}-gerrit-pypi-release-jobs'
@@ -45,11 +48,6 @@
 - project:
     name: ric-plt-xapp-frame-py-sonar
     <<: *py_common
-    python-version: python3
-    # the install script assumes an ubuntu image
-    build-node: ubuntu1804-builder-2c-2g
-    pre-build-script: !include-raw-escape:
-      - ../shell/install-deb-nng-rmr.sh
     sonarcloud: true
     sonarcloud-api-token: '{sonarcloud_api_token}'
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'