summaryrefslogtreecommitdiffstats
path: root/jjb/vpp
diff options
context:
space:
mode:
authorDave Wallace <dwallacelf@gmail.com>2024-08-05 22:34:48 -0400
committerDave Wallace <dwallacelf@gmail.com>2024-08-28 10:40:55 -0400
commit58f7df10360c6b95e9fa08c33cf4df7f03927bf3 (patch)
tree8f43c984b8f685f0191739a13ad83310be28f936 /jjb/vpp
parent8e4d2c22cfa7d7c0520b17a9d53df9132b57e190 (diff)
feat(docker builder): add ubuntu 24.04 support
- Update docker builder scripts to build ubuntu 24.04 executor images for ubuntu2404 jobs - Utilize python venv as much as possible to avoid using 'pip3 install --break-system-packages' option unless absolutely necessary. - Install python3-virtualenv package for CSIT jobs - Add vpp ubuntu-24.04 non-voting pre-production jobs Change-Id: Id373ad8fbdee5a257b33762cf0cab167f7f3b9e7 Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
Diffstat (limited to 'jjb/vpp')
-rw-r--r--jjb/vpp/docs.yaml9
-rw-r--r--jjb/vpp/vpp-preprod.yaml385
-rw-r--r--jjb/vpp/vpp.yaml111
3 files changed, 458 insertions, 47 deletions
diff --git a/jjb/vpp/docs.yaml b/jjb/vpp/docs.yaml
index 545789edc..860625d1f 100644
--- a/jjb/vpp/docs.yaml
+++ b/jjb/vpp/docs.yaml
@@ -8,19 +8,22 @@
- 'vpp-docsonly-merge-{stream}-{os}-{executor-arch}'
project: 'vpp'
- executor-arch: 'x86_64'
- os:
- - 'ubuntu2204'
+ os: 'ubuntu2404'
stream:
- 'master':
branch: 'master'
branch-refspec: ''
+ # TODO: Remove when ubuntu 24.04 is put into production.
+ os: 'ubuntu2204'
- '2402':
branch: 'stable/2402'
branch-refspec: ''
+ os: 'ubuntu2204'
- '2406':
branch: 'stable/2406'
branch-refspec: ''
+ os: 'ubuntu2204'
+ executor-arch: 'x86_64'
- job-template:
name: 'vpp-docs-verify-{stream}-{os}-{executor-arch}'
diff --git a/jjb/vpp/vpp-preprod.yaml b/jjb/vpp/vpp-preprod.yaml
new file mode 100644
index 000000000..a4685211c
--- /dev/null
+++ b/jjb/vpp/vpp-preprod.yaml
@@ -0,0 +1,385 @@
+# Copyright (c) 2024 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+---
+# PROJECT DEFINITIONS
+#
+# Please keep projects grouped in this order:
+# vpp-x86_64, vpp-aarch64, vpp-csit
+#
+# NOTES:
+# - The 'branch-refspec' attribute is used for sandbox testing.
+# Use the get_gerrit_refspec() bash function in
+# .../ci-management/extras/bash/sandbox_test_functions.sh
+# to query gerrit for the refspec of HEAD in a branch.
+# TODO: see if there is a refspec that works without requiring
+# use of get_gerrit_refspec and hand entering the result
+# in the WebUI 'Build With Parameters' gerrit refspec field.
+# [end] NOTES
+
+# VPP-X86_64 PROJECT
+#
+# NOTE: The list of supported branches for each OS are maintained
+# in .../ci-management/docker/scripts/lib_vpp.sh
+# The job configuration must be derived from that list, thus
+# modifications to both should be made at the same time.
+# Since x86_64 is the primary development architecture, this
+# project definition should be identical to the docker image
+# build scripts. Other architectures may be a subset.
+- project:
+ name: vpp-preprod-x86_64
+ jobs:
+ - 'vpp-preprod-verify-{stream}-{os}-{executor-arch}'
+ - 'vpp-preprod-merge-{stream}-{os}-{executor-arch}'
+ project: 'vpp'
+ os:
+ - 'ubuntu2404'
+ make-parallel-jobs: '4'
+ make-test-multiworker-os: 'debian-11'
+ make-test-os: 'ubuntu-20.04 ubuntu-22.04 ubuntu-24.04'
+ stream:
+ - 'master':
+ branch: 'master'
+ branch-refspec: ''
+ executor-arch: 'x86_64'
+# [end] VPP-X86_64 PROJECT
+
+# VPP-GCC-X86_64 PROJECT
+- project:
+ name: vpp-preprod-gcc-x86_64
+ jobs:
+ - 'vpp-preprod-gcc-verify-{stream}-{os}-{executor-arch}'
+ project: 'vpp'
+ os:
+ - 'ubuntu2404'
+ make-parallel-jobs: '4'
+ executor-arch: 'x86_64'
+ stream:
+ - 'master':
+ branch: 'master'
+ branch-refspec: ''
+# [end] VPP-GCC-X86_64 PROJECT
+
+# VPP-DEBUG-X86_64 PROJECT
+#
+# Currently a periodic job due to intermittent failures.
+# Limiting branches to master, since other branches
+# may not get fixes for the intermittent failures.
+#
+- project:
+ name: vpp-preprod-debug-x86_64
+ jobs:
+ - 'vpp-preprod-debug-verify-{stream}-{os}-{executor-arch}'
+ project: 'vpp'
+ os: 'ubuntu2404'
+ make-parallel-jobs: '4'
+ make-test-os: 'ubuntu-20.04 ubuntu-22.04 ubuntu-24.04'
+ comment-trigger-value: 'debug-verify'
+ stream:
+ - 'master':
+ branch: 'master'
+ branch-refspec: ''
+ executor-arch: 'x86_64'
+
+# VPP-AARCH64 PROJECT
+#
+# NOTE: The list of supported branches for each OS are maintained
+# in .../ci-management/docker/scripts/lib_vpp.sh
+# The job configuration must be derived from that list, thus
+# modifications to both should be made at the same time.
+# The AARCH64 architecture is in the process of catching up
+# with X86_64 in terms of OS coverage. Thus the jobs are
+# a subset of those defined in the docker image build script.
+- project:
+ name: vpp-preprod-aarch64
+ jobs:
+ - 'vpp-preprod-verify-{stream}-{os}-{executor-arch}'
+ - 'vpp-preprod-merge-{stream}-{os}-{executor-arch}'
+ project: 'vpp'
+ os:
+ - 'ubuntu2404'
+ make-parallel-jobs: '4'
+ make-test-multiworker-os: 'debian-11'
+ make-test-os: 'ubuntu-20.04 ubuntu-22.04 ubuntu-24.04'
+ stream:
+ - 'master':
+ branch: 'master'
+ branch-refspec: ''
+ executor-arch: 'aarch64'
+# [end] VPP-AARCH64 PROJECT
+
+# JOB TEMPLATE DEFINITIONS
+#
+# Please keep job templates in the same order as they are referenced
+# in the project definitions above.
+
+# VPP-VERIFY JOB TEMPLATE
+- job-template:
+ name: 'vpp-preprod-verify-{stream}-{os}-{executor-arch}'
+
+ project-type: freestyle
+ node: 'builder-{os}-prod-{executor-arch}'
+ concurrent: true
+
+ properties:
+ - lf-infra-properties:
+ build-days-to-keep: "{build-days-to-keep}"
+
+ # Please keep parameters in alphabetical order
+ parameters:
+ - gerrit-parameter:
+ branch: '{branch}'
+ - gerrit-refspec-parameter:
+ refspec: '{branch-refspec}'
+ - make-parallel-jobs-parameter:
+ make-parallel-jobs: '{make-parallel-jobs}'
+ - make-test-os-parameter:
+ make-test-os: '{make-test-os}'
+ - make-test-multiworker-os-parameter:
+ make-test-multiworker-os: '{make-test-multiworker-os}'
+ - os-parameter:
+ os: '{os}'
+ - project-parameter:
+ project: '{project}'
+ - stream-parameter:
+ stream: '{stream}'
+
+ scm:
+ - gerrit-trigger-scm:
+ credentials-id: 'jenkins-gerrit-credentials'
+ refspec: '$GERRIT_REFSPEC'
+ choosing-strategy: 'gerrit'
+
+ wrappers:
+ - fdio-infra-wrappers:
+ build-timeout: 120
+
+ triggers:
+ - gerrit-trigger-checkstyle-nonvoting:
+ name: '{project}'
+ branch: '{branch}'
+
+ builders:
+ - shell:
+ !include-raw-escape:
+ - ../scripts/setup_executor_env.sh
+ - shell:
+ !include-raw-escape:
+ - ../scripts/setup_vpp_ubuntu_docker_test.sh
+ - shell:
+ !include-raw-escape:
+ - ../scripts/setup_vpp_ext_deps.sh
+ - shell:
+ !include-raw-escape:
+ - ../scripts/vpp/build.sh
+
+ publishers:
+ - fdio-infra-publish
+# [end] VPP-VERIFY JOB TEMPLATE
+
+# VPP-DEBUG-VERIFY JOB TEMPLATE
+- job-template:
+ name: 'vpp-preprod-debug-verify-{stream}-{os}-{executor-arch}'
+
+ project-type: freestyle
+ node: 'builder-{os}-prod-{executor-arch}'
+ concurrent: true
+
+ properties:
+ - lf-infra-properties:
+ build-days-to-keep: "{build-days-to-keep}"
+
+ # Please keep parameters in alphabetical order
+ parameters:
+ - gerrit-parameter:
+ branch: '{branch}'
+ - gerrit-refspec-parameter:
+ refspec: '{branch-refspec}'
+ - make-parallel-jobs-parameter:
+ make-parallel-jobs: '{make-parallel-jobs}'
+ - make-test-os-parameter:
+ make-test-os: '{make-test-os}'
+ - os-parameter:
+ os: '{os}'
+ - project-parameter:
+ project: '{project}'
+ - stream-parameter:
+ stream: '{stream}'
+
+ scm:
+ - gerrit-trigger-scm:
+ credentials-id: 'jenkins-gerrit-credentials'
+ refspec: '$GERRIT_REFSPEC'
+ choosing-strategy: 'gerrit'
+
+ wrappers:
+ - fdio-infra-wrappers:
+ build-timeout: '{build-timeout}'
+
+ triggers:
+ - gerrit-trigger-checkstyle-nonvoting:
+ name: '{project}'
+ branch: '{branch}'
+
+ builders:
+ - shell:
+ !include-raw-escape:
+ - ../scripts/setup_executor_env.sh
+ - shell:
+ !include-raw-escape:
+ - ../scripts/setup_vpp_ubuntu_docker_test.sh
+ - shell:
+ !include-raw-escape:
+ - ../scripts/setup_vpp_ext_deps.sh
+ - shell:
+ !include-raw-escape:
+ - ../scripts/vpp/debug-build.sh
+
+ publishers:
+ - fdio-infra-publish
+# [end] VPP-DEBUG-VERIFY JOB TEMPLATE
+
+# VPP-MERGE JOB TEMPLATE
+- job-template:
+ name: 'vpp-preprod-merge-{stream}-{os}-{executor-arch}'
+
+ project-type: freestyle
+ node: 'builder-{os}-prod-{executor-arch}'
+
+ properties:
+ - lf-infra-properties:
+ build-days-to-keep: "{build-days-to-keep}"
+
+ # Please keep parameters in alphabetical order
+ parameters:
+ - gerrit-parameter:
+ branch: '{branch}'
+ - make-parallel-jobs-parameter:
+ make-parallel-jobs: '{make-parallel-jobs}'
+ - make-test-os-parameter:
+ make-test-os: '{make-test-os}'
+ - make-test-multiworker-os-parameter:
+ make-test-multiworker-os: '{make-test-multiworker-os}'
+ - os-parameter:
+ os: '{os}'
+ - project-parameter:
+ project: '{project}'
+ - stream-parameter:
+ stream: '{stream}'
+
+ scm:
+ - gerrit-trigger-scm:
+ credentials-id: 'jenkins-gerrit-credentials'
+ refspec: ''
+ choosing-strategy: 'default'
+
+ wrappers:
+ - fdio-infra-wrappers:
+ build-timeout: 120
+
+ triggers:
+ - gerrit-trigger-patch-merged:
+ name: '{project}'
+ branch: '{branch}'
+
+ builders:
+ - config-file-provider:
+ files:
+ - file-id: '.packagecloud'
+ target: '/root/.packagecloud'
+ - config-file-provider:
+ files:
+ - file-id: 'packagecloud_api'
+ target: '/root/packagecloud_api'
+ - shell:
+ !include-raw-escape:
+ - ../scripts/setup_executor_env.sh
+ - shell:
+ !include-raw-escape:
+ - ../scripts/vpp/commitmsg.sh
+ - shell:
+ !include-raw-escape:
+ - ../scripts/setup_vpp_ubuntu_docker_test.sh
+ - shell:
+ !include-raw-escape:
+ - ../scripts/setup_vpp_ext_deps.sh
+ - shell:
+ !include-raw-escape:
+ - ../scripts/vpp/build.sh
+ - shell:
+ !include-raw-escape:
+ - ../scripts/packagecloud_push.sh
+
+ publishers:
+ - fdio-infra-publish
+# [end] VPP-MERGE JOB TEMPLATE
+
+# VPP-GCC-VERIFY JOB TEMPLATE
+- job-template:
+ name: 'vpp-preprod-gcc-verify-{stream}-{os}-{executor-arch}'
+
+ project-type: freestyle
+ node: 'builder-{os}-prod-{executor-arch}'
+ concurrent: true
+
+ properties:
+ - lf-infra-properties:
+ build-days-to-keep: "{build-days-to-keep}"
+
+ # Please keep parameters in alphabetical order
+ parameters:
+ - gerrit-parameter:
+ branch: '{branch}'
+ - gerrit-refspec-parameter:
+ refspec: '{branch-refspec}'
+ - make-parallel-jobs-parameter:
+ make-parallel-jobs: '{make-parallel-jobs}'
+ - os-parameter:
+ os: '{os}'
+ - project-parameter:
+ project: '{project}'
+ - stream-parameter:
+ stream: '{stream}'
+
+ scm:
+ - gerrit-trigger-scm:
+ credentials-id: 'jenkins-gerrit-credentials'
+ refspec: '$GERRIT_REFSPEC'
+ choosing-strategy: 'gerrit'
+
+ wrappers:
+ - fdio-infra-wrappers:
+ build-timeout: 120
+
+ triggers:
+ - gerrit-trigger-checkstyle-nonvoting:
+ name: '{project}'
+ branch: '{branch}'
+
+ builders:
+ - shell:
+ !include-raw-escape:
+ - ../scripts/setup_executor_env.sh
+ - shell:
+ !include-raw-escape:
+ - ../scripts/setup_vpp_ubuntu_docker_test.sh
+ - shell:
+ !include-raw-escape:
+ - ../scripts/setup_vpp_ext_deps.sh
+ - shell:
+ !include-raw-escape:
+ - ../scripts/vpp/gcc-build.sh
+
+ publishers:
+ - fdio-infra-publish
+# [end] VPP-GCC-VERIFY JOB TEMPLATE
diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index 3ec3e0f40..e8832d0c1 100644
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -34,15 +34,19 @@
- 'vpp-checkstyle-verify-{stream}-{os}-{executor-arch}'
project: 'vpp'
os:
- - ubuntu2204
+ - ubuntu2404
stream:
- 'master':
+ # TODO: Remove when ubuntu2404 is put into production
+ os: 'ubuntu2204'
branch: 'master'
branch-refspec: ''
- '2402':
+ os: 'ubuntu2204'
branch: 'stable/2402'
branch-refspec: ''
- '2406':
+ os: 'ubuntu2204'
branch: 'stable/2406'
branch-refspec: ''
executor-arch: 'x86_64'
@@ -75,6 +79,8 @@
- ubuntu2204
stream:
- 'master':
+ # TODO: Remove when ubuntu2404 is put into production
+ os: 'ubuntu2204'
branch: 'master'
branch-refspec: ''
executor-arch: 'x86_64'
@@ -96,28 +102,34 @@
- 'vpp-verify-{stream}-{os}-{executor-arch}'
- 'vpp-merge-{stream}-{os}-{executor-arch}'
project: 'vpp'
+ os:
+ - 'debian11'
+ - 'ubuntu2004'
+ - 'ubuntu2204'
+ # TODO: Uncomment when ubuntu 24.04 is put into production
+ #- 'ubuntu2404'
make-parallel-jobs: '4'
+ make-test-multiworker-os: 'debian-11'
+ make-test-os: 'ubuntu-20.04 ubuntu-22.04 ubuntu-24.04'
stream:
- 'master':
branch: 'master'
branch-refspec: ''
- make-test-os: 'ubuntu-20.04 ubuntu-22.04'
- make-test-multiworker-os: 'debian-11'
- '2402':
branch: 'stable/2402'
branch-refspec: ''
- make-test-os: 'ubuntu-20.04 ubuntu-22.04'
- make-test-multiworker-os: 'debian-11'
- '2406':
branch: 'stable/2406'
branch-refspec: ''
- make-test-os: 'ubuntu-20.04 ubuntu-22.04'
- make-test-multiworker-os: 'debian-11'
- os:
- - debian11
- - ubuntu2004
- - ubuntu2204
executor-arch: 'x86_64'
+ exclude:
+ # ubuntu-24.04 introduced in VPP 24.10
+ - stream: '2402'
+ os: 'ubuntu2404'
+ # ubuntu-24.04 introduced in VPP 24.10
+ - stream: '2406'
+ os: 'ubuntu2404'
+
# [end] VPP-X86_64 PROJECT
# VPP-GCC-X86_64 PROJECT
@@ -126,9 +138,11 @@
jobs:
- 'vpp-gcc-verify-{stream}-{os}-{executor-arch}'
project: 'vpp'
- make-parallel-jobs: '4'
os:
- - ubuntu2204
+ - 'ubuntu2004'
+ # TODO: Uncomment when ubuntu 24.04 is put into production
+ #- 'ubuntu2404'
+ make-parallel-jobs: '4'
executor-arch: 'x86_64'
stream:
- 'master':
@@ -140,6 +154,13 @@
- '2406':
branch: 'stable/2406'
branch-refspec: ''
+ exclude:
+ # ubuntu-24.04 introduced in VPP 24.10
+ - stream: '2402'
+ os: 'ubuntu2404'
+ # ubuntu-24.04 introduced in VPP 24.10
+ - stream: '2406'
+ os: 'ubuntu2404'
# [end] VPP-GCC-X86_64 PROJECT
@@ -154,15 +175,16 @@
jobs:
- 'vpp-debug-verify-{stream}-{os}-{executor-arch}'
project: 'vpp'
+ os: 'ubuntu2404'
make-parallel-jobs: '4'
- make-test-os: 'ubuntu-20.04 ubuntu-22.04'
+ make-test-os: 'ubuntu-20.04 ubuntu-22.04 ubuntu-24.04'
comment-trigger-value: 'debug-verify'
stream:
- 'master':
+ # TODO: Remove when ubuntu2404 is put into production
+ os: 'ubuntu2204'
branch: 'master'
branch-refspec: ''
- make-test-os: 'ubuntu-20.04 ubuntu-22.04'
- os: 'ubuntu2204'
executor-arch: 'x86_64'
# [end] VPP-DEBUG-X86_64 PROJECT
@@ -178,14 +200,15 @@
jobs:
- 'vpp-dpdk-rdma-version-mismatch-{stream}-{os}-{executor-arch}'
project: 'vpp'
- make-test-os: 'ubuntu-20.04 ubuntu-22.04'
+ os: 'ubuntu2404'
comment-trigger-value: 'dpdk-rdma-version-mismatch'
stream:
- 'master':
+ # TODO: Remove when ubuntu2404 is put into production
+ os: 'ubuntu2204'
branch: 'master'
# Once per day at 00:15
periodicity: '15 0 * * 0-6'
- os: 'ubuntu2204'
executor-arch: 'x86_64'
# [end] VPP-DPDK-RDMA-VERSION-MISMATCH-X86_64 PROJECT
@@ -202,16 +225,18 @@
jobs:
- 'vpp-cov-verify-{stream}-{os}-{executor-arch}'
project: 'vpp'
+ os: 'ubuntu2404'
make-parallel-jobs: '4'
- make-test-os: 'ubuntu-20.04 ubuntu-22.04'
+ make-test-os: 'ubuntu-20.04 ubuntu-22.04 ubuntu-24.04'
comment-trigger-value: 'gcov-report'
stream:
- 'master':
+ # TODO: Remove when ubuntu2404 is put into production
+ os: 'ubuntu2204'
branch: 'master'
branch-refspec: ''
# Once per day at 00:25
periodicity: '25 0 * * 0-6'
- os: 'ubuntu2004'
executor-arch: 'x86_64'
# [end] VPP-COV-X86_64 PROJECT
@@ -231,27 +256,32 @@
- 'vpp-verify-{stream}-{os}-{executor-arch}'
- 'vpp-merge-{stream}-{os}-{executor-arch}'
project: 'vpp'
+ os:
+ - ubuntu2004
+ - ubuntu2204
+ # TODO: Uncomment when ubuntu 24.04 is put into production
+ #- 'ubuntu2404'
make-parallel-jobs: '4'
+ make-test-multiworker-os: 'debian-11'
+ make-test-os: 'ubuntu-20.04 ubuntu-22.04 ubuntu-24.04'
stream:
- 'master':
branch: 'master'
branch-refspec: ''
- make-test-os: 'ubuntu-20.04 ubuntu-22.04'
- make-test-multiworker-os: ''
- '2402':
branch: 'stable/2402'
branch-refspec: ''
- make-test-os: 'ubuntu-20.04 ubuntu-22.04'
- make-test-multiworker-os: ''
- '2406':
branch: 'stable/2406'
branch-refspec: ''
- make-test-os: 'ubuntu-20.04 ubuntu-22.04'
- make-test-multiworker-os: ''
- os:
- - ubuntu2004
- - ubuntu2204
executor-arch: 'aarch64'
+ exclude:
+ # ubuntu-24.04 introduced in VPP 24.10
+ - stream: '2402'
+ os: 'ubuntu2404'
+ # ubuntu-24.04 introduced in VPP 24.10
+ - stream: '2406'
+ os: 'ubuntu2404'
# [end] VPP-AARCH64 PROJECT
# VPP-CSIT-VERIFY-DEVICE PROJECT
@@ -261,29 +291,23 @@
- 'vpp-csit-verify-device-{stream}-{os}-{executor-arch}-{testbed-arch}':
make-parallel-jobs: '32'
project: 'vpp'
+ os: 'ubuntu2404'
skip-vote: 'false'
stream:
- 'master':
branch: 'master'
branch-refspec: ''
- - '2402':
- branch: 'stable/2402'
- branch-refspec: ''
- - '2406':
- branch: 'stable/2406'
- branch-refspec: ''
testbed-arch:
- 1n-spr:
+ # TODO: Remove when ubuntu2404 is put into production
os: 'ubuntu2204'
executor-arch: 'x86_64'
skip-vote: 'false'
- 1n-alt:
+ # TODO: Remove when ubuntu2404 is put into production
os: 'ubuntu2204'
executor-arch: 'aarch64'
skip-vote: 'false'
- exclude:
- - testbed-arch: 1n-spr
- stream: '2402'
# [end] VPP-CSIT-VERIFY-DEVICE PROJECT
# VPP-CSIT-VERIFY-PERF PROJECT
@@ -338,20 +362,23 @@
jobs:
- 'vpp-csit-verify-api-crc-{stream}-{os}-{executor-arch}'
project: 'vpp'
+ os: ubuntu2404
executor-arch: 'x86_64'
skip-vote: 'false'
stream:
- 'master':
branch: 'master'
branch-refspec: ''
+ # TODO: Remove when ubuntu2404 is put into production
+ os: 'ubuntu2204'
- '2402':
branch: 'stable/2402'
branch-refspec: ''
+ os: 'ubuntu2204'
- '2406':
branch: 'stable/2406'
branch-refspec: ''
- os:
- - 'ubuntu2204'
+ os: 'ubuntu2204'
# [end] VPP-CSIT-API-CRC PROJECT
# LF RELENG VPP PROJECTS
@@ -745,10 +772,6 @@
parameters:
- gerrit-parameter:
branch: '{branch}'
- - make-parallel-jobs-parameter:
- make-parallel-jobs: '{make-parallel-jobs}'
- - make-test-os-parameter:
- make-test-os: '{make-test-os}'
- os-parameter:
os: '{os}'
- project-parameter: