Change jenkins node to the 24.04 image
Signed-off-by: Joey Armstrong <jarmstrong@linuxfoundation.org>
Change-Id: I29d05962cfb27aa9618afb7ddbe813276d69c7e6
diff --git a/jjb/api-test.yaml b/jjb/api-test.yaml
index 40ab874..6be8d54 100644
--- a/jjb/api-test.yaml
+++ b/jjb/api-test.yaml
@@ -30,7 +30,7 @@
- string:
name: buildNode
# default: 'ubuntu18.04-basebuild-4c-8g'
- default: 'voltha-1804-micro'
+ default: 'ubuntu-basebuild-24.04-4c-15g'
description: 'Name of the Jenkins node to run the job on'
- string:
diff --git a/jjb/bbr.yaml b/jjb/bbr.yaml
index d8467cc..54ae3a5 100644
--- a/jjb/bbr.yaml
+++ b/jjb/bbr.yaml
@@ -49,7 +49,7 @@
- string:
name: buildNode
# default: 'ubuntu18.04-basebuild-4c-8g'
- default: 'voltha-1804-micro'
+ default: 'ubuntu-basebuild-24.04-4c-15g'
description: 'Name of the Jenkins node to run the job on'
# [EOF]
diff --git a/jjb/device-management.yaml b/jjb/device-management.yaml
index df53616..622a814 100644
--- a/jjb/device-management.yaml
+++ b/jjb/device-management.yaml
@@ -29,7 +29,7 @@
- string:
name: buildNode
# default: 'ubuntu18.04-basebuild-4c-8g'
- default: 'voltha-1804-micro'
+ default: 'ubuntu-basebuild-24.04-4c-15g'
description: 'Name of the Jenkins node to run the job on'
- string:
diff --git a/jjb/omec-ci.yaml b/jjb/omec-ci.yaml
index bbb678c..a251c2f 100644
--- a/jjb/omec-ci.yaml
+++ b/jjb/omec-ci.yaml
@@ -102,7 +102,7 @@
build-timeout: 30
docker-repo: 'omecproject'
# build-node: 'ubuntu18.04-basebuild-4c-8g'
- build-node: 'voltha-1804-micro'
+ build-node: 'ubuntu-basebuild-24.04-4c-15g'
- 'omec-container'
# for c3po
diff --git a/jjb/triggered-api-test.yaml b/jjb/triggered-api-test.yaml
index 38ae606..9a03d57 100644
--- a/jjb/triggered-api-test.yaml
+++ b/jjb/triggered-api-test.yaml
@@ -31,7 +31,7 @@
- string:
name: buildNode
# default: 'ubuntu18.04-basebuild-4c-8g'
- default: 'voltha-1804-micro'
+ default: 'ubuntu-basebuild-24.04-4c-15g'
description: 'Name of the Jenkins node to run the job on'
- string:
diff --git a/jjb/verify/bbsim.yaml b/jjb/verify/bbsim.yaml
index eb57ab7..61ddb43 100644
--- a/jjb/verify/bbsim.yaml
+++ b/jjb/verify/bbsim.yaml
@@ -52,7 +52,7 @@
dependency-jobs: 'verify_bbsim_licensed'
- 'make-unit-test':
# build-node: 'ubuntu18.04-basebuild-4c-8g'
- build-node: 'voltha-1804-micro'
+ build-node: 'ubuntu-basebuild-24.04-4c-15g'
dest-gopath: "github.com/opencord"
unit-test-targets: 'lint sca test'
unit-test-keep-going: 'false'
diff --git a/jjb/verify/ofagent-go.yaml b/jjb/verify/ofagent-go.yaml
index 3c912f1..3690739 100644
--- a/jjb/verify/ofagent-go.yaml
+++ b/jjb/verify/ofagent-go.yaml
@@ -33,7 +33,7 @@
dependency-jobs: 'verify_ofagent-go_licensed'
- 'make-unit-test':
# build-node: 'ubuntu18.04-basebuild-4c-8g'
- build-node: 'voltha-1804-micro'
+ build-node: 'ubuntu-basebuild-24.04-4c-15g'
dest-gopath: "github.com/opencord"
unit-test-targets: 'lint sca test'
unit-test-keep-going: 'false'
diff --git a/jjb/verify/voltha-go.yaml b/jjb/verify/voltha-go.yaml
index d95619f..2bf2bbb 100644
--- a/jjb/verify/voltha-go.yaml
+++ b/jjb/verify/voltha-go.yaml
@@ -33,7 +33,7 @@
dependency-jobs: 'verify_voltha-go_licensed'
- 'make-unit-test':
# build-node: 'ubuntu18.04-basebuild-4c-8g'
- build-node: 'voltha-1804-micro'
+ build-node: 'ubuntu-basebuild-24.04-4c-15g'
build-timeout: 20
dest-gopath: "github.com/opencord"
name-extension: "-lint"
diff --git a/jjb/verify/voltha-lib-go.yaml b/jjb/verify/voltha-lib-go.yaml
index 19f4f34..584c876 100644
--- a/jjb/verify/voltha-lib-go.yaml
+++ b/jjb/verify/voltha-lib-go.yaml
@@ -38,7 +38,7 @@
dependency-jobs: 'verify_voltha-lib-go_licensed'
- 'make-unit-test':
# build-node: 'ubuntu18.04-basebuild-4c-8g'
- build-node: 'voltha-1804-micro'
+ build-node: 'ubuntu-basebuild-24.04-4c-15g'
build-timeout: 20
dest-gopath: "github.com/opencord"
unit-test-targets: 'lint sca test'
diff --git a/jjb/verify/voltha-northbound-bbf-adapter.yaml b/jjb/verify/voltha-northbound-bbf-adapter.yaml
index 83f18c2..da95bb6 100644
--- a/jjb/verify/voltha-northbound-bbf-adapter.yaml
+++ b/jjb/verify/voltha-northbound-bbf-adapter.yaml
@@ -21,7 +21,7 @@
dependency-jobs: 'verify_voltha-northbound-bbf-adapter_licensed'
- 'make-unit-test':
# build-node: 'ubuntu18.04-basebuild-4c-8g'
- build-node: 'voltha-1804-micro'
+ build-node: 'ubuntu-basebuild-24.04-4c-15g'
dest-gopath: "github.com/opencord"
unit-test-targets: 'lint sca test'
unit-test-keep-going: 'false'
diff --git a/jjb/verify/voltha-openolt-adapter.yaml b/jjb/verify/voltha-openolt-adapter.yaml
index 5ba9728..9f6d50d 100644
--- a/jjb/verify/voltha-openolt-adapter.yaml
+++ b/jjb/verify/voltha-openolt-adapter.yaml
@@ -33,7 +33,7 @@
unit-test-targets: 'lint sca'
unit-test-keep-going: 'false'
junit-allow-empty-results: true
- build-node: 'voltha-1804-micro'
+ build-node: 'ubuntu-basebuild-24.04-4c-15g'
# build-node: 'ubuntu18.04-basebuild-4c-8g'
- 'make-unit-test':
dest-gopath: "github.com/opencord"
@@ -42,7 +42,7 @@
unit-test-keep-going: 'false'
junit-allow-empty-results: true
# build-node: 'ubuntu18.04-basebuild-2c-4g'
- build-node: 'voltha-1804-micro'
+ build-node: 'ubuntu-basebuild-24.04-4c-15g'
- job-group:
name: 'verify-voltha-openolt-adapter-jobs-master'
diff --git a/jjb/verify/voltha-openonu-adapter-go.yaml b/jjb/verify/voltha-openonu-adapter-go.yaml
index 4e9b052..db48e31 100644
--- a/jjb/verify/voltha-openonu-adapter-go.yaml
+++ b/jjb/verify/voltha-openonu-adapter-go.yaml
@@ -37,7 +37,7 @@
unit-test-keep-going: 'false'
junit-allow-empty-results: true
# build-node: 'ubuntu18.04-basebuild-4c-8g'
- build-node: 'voltha-1804-micro'
+ build-node: 'ubuntu-basebuild-24.04-4c-15g'
- 'make-unit-test':
dest-gopath: "github.com/opencord"
name-extension: "-tests"
diff --git a/jjb/verify/voltha-protos.yaml b/jjb/verify/voltha-protos.yaml
index b40508d..229fbc7 100644
--- a/jjb/verify/voltha-protos.yaml
+++ b/jjb/verify/voltha-protos.yaml
@@ -20,7 +20,7 @@
- 'tag-collision-reject':
- 'make-unit-test':
# build-node: 'ubuntu18.04-basebuild-2c-4g'
- build-node: 'voltha-1804-micro'
+ build-node: 'ubuntu-basebuild-24.04-4c-15g'
build-timeout: 20
unit-test-targets: 'test'
unit-test-keep-going: 'false'
diff --git a/jjb/verify/voltha-system-tests.yaml b/jjb/verify/voltha-system-tests.yaml
index bdbd256..d1e3db6 100644
--- a/jjb/verify/voltha-system-tests.yaml
+++ b/jjb/verify/voltha-system-tests.yaml
@@ -8,21 +8,21 @@
jobs:
- 'verify-voltha-system-tests-jobs':
# build-node: 'ubuntu18.04-basebuild-4c-8g'
- build-node: 'voltha-1804-micro'
+ build-node: 'ubuntu-basebuild-24.04-4c-15g'
branch-regexp: '{all-branches-regexp}'
- 'verify-voltha-system-tests-jobs-master':
# build-node: 'ubuntu18.04-basebuild-4c-8g'
- build-node: 'voltha-1804-micro'
+ build-node: 'ubuntu-basebuild-24.04-4c-15g'
branch-regexp: '^master$'
- 'verify-voltha-system-tests-jobs-voltha-2.12':
# build-node: 'ubuntu18.04-basebuild-4c-8g'
- build-node: 'voltha-1804-micro'
+ build-node: 'ubuntu-basebuild-24.04-4c-15g'
name-extension: '-voltha-2.12'
override-branch: 'voltha-2.12'
branch-regexp: '^voltha-2.12$'
- 'verify-voltha-system-tests-jobs-voltha-2.11':
# build-node: 'ubuntu18.04-basebuild-4c-8g'
- build-node: 'voltha-1804-micro'
+ build-node: 'ubuntu-basebuild-24.04-4c-15g'
name-extension: '-voltha-2.11'
override-branch: 'voltha-2.11'
branch-regexp: '^voltha-2.11$'
diff --git a/jjb/verify/xos.yaml b/jjb/verify/xos.yaml
index eb76ede..75525c5 100644
--- a/jjb/verify/xos.yaml
+++ b/jjb/verify/xos.yaml
@@ -52,7 +52,7 @@
- 'python-unit-test':
build-timeout: 45
# build-node: 'ubuntu18.04-basebuild-2c-4g'
- build-node: 'voltha-1804-micro'
+ build-node: 'ubuntu-basebuild-24.04-4c-15g'
- 'api-test':
pipeline-script: 'xos-core.groovy'
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index c0a48f7..87383fc 100755
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -1808,7 +1808,7 @@
- 'voltha-periodic-test':
name: 'periodic-voltha-etcd-test'
# build-node: 'ubuntu18.04-basebuild-4c-8g'
- build-node: 'voltha-1804-micro'
+ build-node: 'ubuntu-basebuild-24.04-4c-15g'
code-branch: 'master'
extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set onu=2,pon=2'
time-trigger: "H H/12 * * *"
@@ -1838,7 +1838,7 @@
pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
pipeline-branch: 'voltha-2.11'
# build-node: 'ubuntu18.04-basebuild-4c-8g'
- build-node: 'voltha-1804-micro'
+ build-node: 'ubuntu-basebuild-24.04-4c-15g'
code-branch: 'voltha-2.11'
extraHelmFlags: '--set onu=2,pon=2'
time-trigger: "H H/23 * * *"
@@ -1854,7 +1854,7 @@
pipeline-script: 'voltha/bbsim-tests.groovy'
pipeline-branch: 'voltha-2.12'
# build-node: 'ubuntu18.04-basebuild-4c-8g'
- build-node: 'voltha-1804-micro'
+ build-node: 'ubuntu-basebuild-24.04-4c-15g'
code-branch: 'voltha-2.12'
extraHelmFlags: '--set onu=2,pon=2'
time-trigger: "H H/23 * * *"
@@ -1965,7 +1965,7 @@
- 'voltha-periodic-test':
name: 'periodic-voltha-memory-leak-test-bbsim'
# build-node: 'ubuntu18.04-basebuild-4c-8g'
- build-node: 'voltha-1804-micro'
+ build-node: 'ubuntu-basebuild-24.04-4c-15g'
code-branch: 'master'
time-trigger: "H H/23 * * *"
extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set onu=2,controlledActivation=only-onu'
@@ -1984,7 +1984,7 @@
- 'voltha-periodic-test':
name: 'periodic-voltha-memory-leak-test-bbsim-2.12'
# build-node: 'ubuntu18.04-basebuild-4c-8g'
- build-node: 'voltha-1804-micro'
+ build-node: 'ubuntu-basebuild-24.04-4c-15g'
pipeline-script: 'voltha/bbsim-tests.groovy'
pipeline-branch: 'voltha-2.12'
code-branch: 'voltha-2.12'
@@ -2002,7 +2002,7 @@
- 'voltha-periodic-test':
name: 'periodic-voltha-memory-leak-test-bbsim-2.11'
# build-node: 'ubuntu18.04-basebuild-4c-8g'
- build-node: 'voltha-1804-micro'
+ build-node: 'ubuntu-basebuild-24.04-4c-15g'
pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
pipeline-branch: 'voltha-2.11'
code-branch: 'voltha-2.11'
@@ -2299,7 +2299,7 @@
id: 'voltha-patch-test'
name: 'verify_{project}_sanity-test{name-extension}'
#build-node: 'ubuntu18.04-basebuild-4c-8g'
- build-node: 'voltha-1804-micro'
+ build-node: 'ubuntu-basebuild-24.04-4c-15g'
pipeline-script: 'voltha/bbsim-tests.groovy'
pipeline-branch: 'master'
override-branch: '$GERRIT_BRANCH'
diff --git a/jjb/voltha-e2e/master.yaml b/jjb/voltha-e2e/master.yaml
index 2134d46..6d9639f 100644
--- a/jjb/voltha-e2e/master.yaml
+++ b/jjb/voltha-e2e/master.yaml
@@ -154,7 +154,7 @@
- 'voltha-periodic-test':
name: 'periodic-voltha-dt-test-bbsim-master'
# build-node: 'ubuntu18.04-basebuild-4c-8g'
- build-node: 'voltha-1804-micro'
+ build-node: 'ubuntu-basebuild-24.04-4c-15g'
pipeline-script: 'voltha/bbsim-tests.groovy'
pipeline-branch: 'master'
code-branch: 'master'
@@ -177,7 +177,7 @@
- 'voltha-periodic-test':
name: 'periodic-voltha-dt-fttb-test-bbsim-master'
# build-node: 'ubuntu18.04-basebuild-4c-8g'
- build-node: 'voltha-1804-micro'
+ build-node: 'ubuntu-basebuild-24.04-4c-15g'
code-branch: 'master'
time-trigger: "H H/23 * * *"
extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF --set onu=2'
diff --git a/jjb/voltha-e2e/voltha-2.11.yaml b/jjb/voltha-e2e/voltha-2.11.yaml
index 61105c8..622334b 100644
--- a/jjb/voltha-e2e/voltha-2.11.yaml
+++ b/jjb/voltha-e2e/voltha-2.11.yaml
@@ -146,7 +146,7 @@
- 'voltha-periodic-test':
name: 'periodic-voltha-dt-test-bbsim-2.11'
# build-node: 'ubuntu18.04-basebuild-4c-8g'
- build-node: 'voltha-1804-micro'
+ build-node: 'ubuntu-basebuild-24.04-4c-15g'
pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
pipeline-branch: 'voltha-2.11'
code-branch: 'master'
diff --git a/jjb/voltha-e2e/voltha-2.12.yaml b/jjb/voltha-e2e/voltha-2.12.yaml
index e223028..db041a7 100644
--- a/jjb/voltha-e2e/voltha-2.12.yaml
+++ b/jjb/voltha-e2e/voltha-2.12.yaml
@@ -155,7 +155,7 @@
- 'voltha-periodic-test':
name: 'periodic-voltha-dt-test-bbsim-2.12'
# build-node: 'ubuntu18.04-basebuild-4c-8g'
- build-node: 'voltha-1804-micro'
+ build-node: 'ubuntu-basebuild-24.04-4c-15g'
pipeline-script: 'voltha/bbsim-tests.groovy'
pipeline-branch: 'voltha-2.12'
code-branch: 'voltha-2.12'
@@ -186,7 +186,7 @@
- 'voltha-periodic-test':
name: 'periodic-voltha-dt-fttb-test-bbsim-2.12'
# build-node: 'ubuntu18.04-basebuild-4c-8g'
- build-node: 'voltha-1804-micro'
+ build-node: 'ubuntu-basebuild-24.04-4c-15g'
code-branch: 'VOLTHA-2.12'
time-trigger: "H H/23 * * *"
extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF --set onu=2'
diff --git a/jjb/voltha-unit-test.yaml b/jjb/voltha-unit-test.yaml
index c298cec..e759d0e 100644
--- a/jjb/voltha-unit-test.yaml
+++ b/jjb/voltha-unit-test.yaml
@@ -39,7 +39,7 @@
jenkins-ssh-credential: '{jenkins-ssh-credential}'
# node: 'ubuntu18.04-basebuild-4c-8g'
- node: 'voltha-1804-micro'
+ node: 'ubuntu-basebuild-24.04-4c-15g'
project-type: freestyle
concurrent: true
diff --git a/jjb/xos-auth.yaml b/jjb/xos-auth.yaml
index ea53b11..e6ff876 100644
--- a/jjb/xos-auth.yaml
+++ b/jjb/xos-auth.yaml
@@ -33,7 +33,7 @@
destination-dir: 'cord'
# node: 'ubuntu18.04-basebuild-4c-8g'
- node: 'voltha-1804-micro'
+ node: 'ubuntu-basebuild-24.04-4c-15g'
project-type: freestyle
concurrent: true
diff --git a/jjb/xos-integration-tests.yaml b/jjb/xos-integration-tests.yaml
index 0772e69..e5f3109 100644
--- a/jjb/xos-integration-tests.yaml
+++ b/jjb/xos-integration-tests.yaml
@@ -36,7 +36,7 @@
- string:
name: buildNode
# default: 'ubuntu18.04-basebuild-4c-8g'
- default: 'voltha-1804-micro'
+ default: 'ubuntu-basebuild-24.04-4c-15g'
description: 'Name of the Jenkins node to run the job on'
- string:
@@ -91,7 +91,7 @@
- string:
name: buildNode
# default: 'ubuntu18.04-basebuild-4c-8g'
- default: 'voltha-1804-micro'
+ default: 'ubuntu-basebuild-24.04-4c-15g'
description: 'Name of the Jenkins node to run the job on'
- string:
@@ -146,7 +146,7 @@
- string:
name: buildNode
# default: 'ubuntu18.04-basebuild-4c-8g'
- default: 'voltha-1804-micro'
+ default: 'ubuntu-basebuild-24.04-4c-15g'
description: 'Name of the Jenkins node to run the job on'
- string:
@@ -201,7 +201,7 @@
- string:
name: buildNode
# default: 'ubuntu18.04-basebuild-4c-8g'
- default: 'voltha-1804-micro'
+ default: 'ubuntu-basebuild-24.04-4c-15g'
description: 'Name of the Jenkins node to run the job on'
- string:
diff --git a/jjb/xos-synchronizer-update.yaml b/jjb/xos-synchronizer-update.yaml
index ed3d0dc..5f594e5 100644
--- a/jjb/xos-synchronizer-update.yaml
+++ b/jjb/xos-synchronizer-update.yaml
@@ -29,7 +29,7 @@
- string:
name: buildNode
# default: 'ubuntu18.04-basebuild-4c-8g'
- default: 'voltha-1804-micro'
+ default: 'ubuntu-basebuild-24.04-4c-15g'
description: 'Name of the Jenkins node to run the job on'
- string:
diff --git a/jjb/xos-upgrade.yaml b/jjb/xos-upgrade.yaml
index b426c64..4592723 100644
--- a/jjb/xos-upgrade.yaml
+++ b/jjb/xos-upgrade.yaml
@@ -30,7 +30,7 @@
- string:
name: buildNode
# default: 'ubuntu18.04-basebuild-4c-8g'
- default: 'voltha-1804-micro'
+ default: 'ubuntu-basebuild-24.04-4c-15g'
description: 'Name of the Jenkins node to run the job on'
- string: