Verify ric-plt/a1 code with tox, not Docker

[ci-management.git] / jjb / ric-plt-a1 / ric-plt-a1.yaml

diff --git a/jjb/ric-plt-a1/ric-plt-a1.yaml b/jjb/ric-plt-a1/ric-plt-a1.yaml
index 00ef210..e8e5fec 100644 (file)
--- a/jjb/ric-plt-a1/ric-plt-a1.yaml
+++ b/jjb/ric-plt-a1/ric-plt-a1.yaml
@@ -32,35 +32,28 @@
     container-tag-method: yaml-file
     # use host network to clone from our gerrit
     docker-build-args: '--network=host'
+    # 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
+    python-version: python3
     stream:
       - master:
           branch: master
     jobs:
-      - gerrit-python-xc-clm
+      - gerrit-tox-verify
       - '{project-name}-gerrit-docker-jobs'
-
-# runs unit tests on verify only
-- project:
-    <<: *a1_docker_common
-    name: ric-plt-a1-test
-    project-name: ric-plt-a1-test
-    # image name, but is never pushed
-    docker-name: '{name}'
-    # source of docker tag
-    container-tag-method: latest
-    # running without network = host led to repeated and numerous timeouts.
-    docker-build-args: '--network=host -f Dockerfile-Unit-Test'
-    build-timeout: 10
-    stream:
-      - master:
-          branch: master
-    jobs:
-      - gerrit-docker-verify
+      - gerrit-python-xc-clm
 
 - project:
     <<: *a1_docker_common
     name: ric-plt-a1-sonar
     branch: master
+    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-project-key: o-ran-sc_ric-plt-a1
     sonarcloud-project-organization: o-ran-sc