Merge "Chore: Move to ubuntu2004-docker"

[ci-management.git] / jjb / integration / integration.yaml

diff --git a/jjb/integration/integration.yaml b/jjb/integration/integration.yaml
index 5b211d7..047b81c 100644 (file)
--- a/jjb/integration/integration.yaml
+++ b/jjb/integration/integration.yaml
@@ -10,7 +10,7 @@
     project-name: integration
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: integration
     branch: master
 
@@ -21,14 +21,15 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
     mvn-settings: 'integration-settings'
-    build-node: 'centos7-builder-4c-4g'
+    build-node: 'ubuntu2004-builder-4c-4g'
     subproject:
       - 'test-vcpe':
           path: 'test/vcpe'
           pattern: 'test/vcpe/**'
+      - 'ran-nssmf-simulator':
+          path: 'test/mocks/ran-nssmf-simulator'
+          pattern: 'test/mocks/ran-nssmf-simulator/**'
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-python'
 
@@ -46,7 +47,7 @@
     name: integration-verify-golang
     project-name: 'integration'
     project: 'integration'
-    golangver: 'golang112'
+    golangver: 'golang114'
     mvn-settings: 'integration-settings'
     archive-artifacts: ''
     jobs:
@@ -55,7 +56,7 @@
       - 'test-security-k8s':
           path: 'test/security/k8s'
           pattern: '{path}/**'
-          build-node: ubuntu1804-builder-4c-4g
+          build-node: ubuntu2004-builder-4c-4g
           script: |
               #!/bin/bash
               set -ex # Fail build if any setup step fails
@@ -64,7 +65,7 @@
       - 'test-security-sslendpoints':
           path: 'test/security/sslendpoints'
           pattern: '{path}/**'
-          build-node: ubuntu1804-docker-8c-8g
+          build-node: ubuntu2004-docker-8c-8g
           script: |
               #!/bin/bash
               set -ex # Fail build if any setup step fails