Chore: Revert back to ubuntu1804-builder

[ci-management.git] / jjb / testsuite / testsuite-python-testing-utils.yaml

diff --git a/jjb/testsuite/testsuite-python-testing-utils.yaml b/jjb/testsuite/testsuite-python-testing-utils.yaml
index 5cd6815..e4983fd 100644 (file)
--- a/jjb/testsuite/testsuite-python-testing-utils.yaml
+++ b/jjb/testsuite/testsuite-python-testing-utils.yaml
@@ -2,24 +2,22 @@
 - project:
     name: testsuite-python-testing-utils
     project-name: 'testsuite-python-testing-utils'
-    python-version: python2
+    python-version: python3
     jobs:
       - '{project-name}-{subproject}-python-staging-{stream}'
       - '{project-name}-{subproject}-python-release-{stream}'
     project: 'testsuite/python-testing-utils'
     subproject:
       - 'robotframework-onap':
-          tox-dir: robotframework-onap/
-          tox-envs: ''
+          tox-dir: './robotframework-onap/'
+          tox-envs: 'py3'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'testsuite-python-testing-utils-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-builder-4c-4g'
+    build-node: 'ubuntu1804-builder-4c-4g'
 
 - project:
     name: testsuite-python-testing-utils-verify
@@ -28,10 +26,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'testsuite-python-testing-utils-settings'
-    build-node: 'ubuntu1604-builder-4c-4g'
+    build-node: 'ubuntu1804-builder-4c-4g'
     subproject:
       - 'robotframework-onap':
           path: 'robotframework-onap'
@@ -39,23 +35,11 @@
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-python'
 
-- project:
-    name: testsuite-python-testing-utils-master-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: testsuite/python-testing-utils
-    project-name: 'testsuite-python-testing-utils'
-    build-node: 'ubuntu1604-builder-4c-4g'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'testsuite-python-testing-utils-settings'
-
 - project:
     name: testsuite-python-testing-utils-info
     project-name: testsuite-python-testing-utils
     jobs:
       - gerrit-info-yaml-verify
+    build-node: ubuntu1804-builder-4c-4g
     project: testsuite/python-testing-utils
     branch: master