From 5b2b0a4babd61beab258396749ba9aab1e7980fb Mon Sep 17 00:00:00 2001 From: "juraj.linkes" Date: Thu, 25 Jul 2019 10:05:26 +0200 Subject: [PATCH] Add arm 1n-tx2 VPP Device jobs Change-Id: I7bd77d96c3451415dabe20e097185b871eb2c8a2 Signed-off-by: juraj.linkes --- jjb/csit/csit-vpp-device.yaml | 29 ++++++++++++++++++++++++++--- jjb/global-defaults.yaml | 3 +++ jjb/scripts/setup_vpp_ubuntu_docker_test.sh | 9 ++++++++- jjb/vpp/include-raw-vpp-parallel-vars.sh | 20 ++------------------ jjb/vpp/vpp-macros.yaml | 8 ++++---- jjb/vpp/vpp.yaml | 21 +++++++++++++++++---- 6 files changed, 60 insertions(+), 30 deletions(-) diff --git a/jjb/csit/csit-vpp-device.yaml b/jjb/csit/csit-vpp-device.yaml index 64de3ead9..30fb10c4b 100644 --- a/jjb/csit/csit-vpp-device.yaml +++ b/jjb/csit/csit-vpp-device.yaml @@ -19,11 +19,16 @@ - 'ubuntu1804' node-arch: - '1n-skx' + - '1n-tx2': + executor: 'vpp-csit-arm-ubuntu18' + skip-vote: 'true' jobs: - 'csit-vpp-device-{stream}-{os}-{node-arch}' - 'csit-vpp-device-{stream_timed}-{os}-{node-arch}-semiweekly' - 'csit-vpp-device-{stream_timed}-{os}-{node-arch}-weekly' + project: 'csit' + executor: 'vpp-csit-device' branch: 'master' branch-id: 'oper' stream_timed: @@ -46,6 +51,19 @@ - '1904': branch: 'rls1904' branch-id: 'oper-rls1904' + exclude: + - stream: '1810' + os: 'ubuntu1804' + node-arch: '1n-tx2' + - stream: '1901' + os: 'ubuntu1804' + node-arch: '1n-tx2' + - stream: '1904' + os: 'ubuntu1804' + node-arch: '1n-tx2' + - stream_timed: '1904' + os: 'ubuntu1804' + node-arch: '1n-tx2' - job-template: name: 'csit-vpp-device-{stream}-{os}-{node-arch}' @@ -80,7 +98,7 @@ project-type: freestyle - node: 'vpp-csit-device' + node: '{executor}' concurrent: true archive-artifacts: 'archive/*.*' latest-only: false @@ -137,6 +155,11 @@ branches: - branch-compare-type: 'ANT' branch-pattern: '**/{branch}' + skip-vote: + successful: '{skip-vote}' + failed: '{skip-vote}' + unstable: '{skip-vote}' + notbuilt: '{skip-vote}' builders: - shell: @@ -179,7 +202,7 @@ project-type: freestyle - node: 'vpp-csit-device' + node: '{executor}' concurrent: false archive-artifacts: 'csit/archive/*.*' latest-only: false @@ -257,7 +280,7 @@ project-type: freestyle - node: 'vpp-csit-device' + node: '{executor}' concurrent: false archive-artifacts: 'archive/*.*' latest-only: false diff --git a/jjb/global-defaults.yaml b/jjb/global-defaults.yaml index 68cbbf1b6..93bf6cc9c 100644 --- a/jjb/global-defaults.yaml +++ b/jjb/global-defaults.yaml @@ -20,3 +20,6 @@ # fd.io branch defaults branch: master + + # voting + skip-vote: false \ No newline at end of file diff --git a/jjb/scripts/setup_vpp_ubuntu_docker_test.sh b/jjb/scripts/setup_vpp_ubuntu_docker_test.sh index 90257f1c0..fe6a0fcbc 100644 --- a/jjb/scripts/setup_vpp_ubuntu_docker_test.sh +++ b/jjb/scripts/setup_vpp_ubuntu_docker_test.sh @@ -15,7 +15,14 @@ if ! [ -z ${DOCKER_TEST} ] ; then # for 4 cores: # framework.VppTestCase.MIN_REQ_SHM + (num_cores * framework.VppTestCase.SHM_PER_PROCESS) # 1073741824 == 1024M (1073741824 >> 20) - sudo mount -o remount /dev/shm -o size=1024M || true + MEM=1024M + if [[ $(uname -m) == 'aarch64' ]] + then + # arm build are running with 16 cores, empirical evidence shows + # that 2048M is enough + MEM=2048M + fi + sudo mount -o remount /dev/shm -o size=${MEM} || true echo "/dev/shm remounted" fi diff --git a/jjb/vpp/include-raw-vpp-parallel-vars.sh b/jjb/vpp/include-raw-vpp-parallel-vars.sh index c0d2e4bd5..1a5de149f 100644 --- a/jjb/vpp/include-raw-vpp-parallel-vars.sh +++ b/jjb/vpp/include-raw-vpp-parallel-vars.sh @@ -1,24 +1,8 @@ #!/bin/bash CORES=4 -if [[ -z ${NODE_NAME+x} || -z ${NODE_LABELS+x} ]] +if [[ $(uname -m) == 'aarch64' ]] then - echo "NODE_NAME or NODE_LABELS is not set, using defaults for parallel build/test" -else - for NODE_LABEL in $NODE_LABELS - do - # NODE_LABELS is jenkins-SOMEHEX and the label we're looking for - # NODE_NAME is jenkins-SOMEHEX - if [[ $NODE_NAME != $NODE_LABEL ]] - then - # Found label such as ubuntu1804arm-us - break - fi - done - - if [[ $NODE_LABEL == ubuntu*arm-* ]] - then - CORES=16 - fi + CORES=16 fi echo "Using MAKE_PARALLEL_FLAGS='-j $CORES' TEST_JOBS=$CORES for parallel build/test" diff --git a/jjb/vpp/vpp-macros.yaml b/jjb/vpp/vpp-macros.yaml index 5b544d464..8b1fe65c3 100644 --- a/jjb/vpp/vpp-macros.yaml +++ b/jjb/vpp/vpp-macros.yaml @@ -76,7 +76,7 @@ - branch-compare-type: 'ANT' branch-pattern: '**/{branch}' skip-vote: - successful: true - failed: true - unstable: true - notbuilt: true + successful: '{skip-vote}' + failed: '{skip-vote}' + unstable: '{skip-vote}' + notbuilt: '{skip-vote}' diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index 1a3192012..eebe0a32d 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -62,9 +62,11 @@ - project: name: vpp-perpatch jobs: - - 'vpp-csit-verify-device-{stream}-1n-skx' + - 'vpp-csit-verify-device-{stream}-{device-node-arch}' - 'vpp-csit-verify-perf-{stream}-{node-arch}' project: 'vpp' + executor: 'vpp-csit-device' + skip-vote: 'true' stream: - master: branch: 'master' @@ -73,10 +75,18 @@ branch: 'stable/1904' repo-stream-part: 'stable.1904' os: ubuntu1804 + device-node-arch: + - 1n-skx + - 1n-tx2: + executor: 'vpp-csit-arm-ubuntu18' node-arch: - 2n-skx - 3n-skx - 3n-hsw + exclude: + - stream: '1904' + os: 'ubuntu1804' + device-node-arch: '1n-tx2' - project: name: vpp-master-only @@ -748,10 +758,10 @@ fixed-delay: 90 - job-template: - name: 'vpp-csit-verify-device-{stream}-1n-skx' + name: 'vpp-csit-verify-device-{stream}-{device-node-arch}' project-type: freestyle - node: 'vpp-csit-device' + node: '{executor}' concurrent: true archive-artifacts: '**/csit_current/**/*.*' latest-only: false @@ -796,6 +806,7 @@ - gerrit-trigger-csit-devicetest: name: '{project}' branch: '{branch}' + skip-vote: '{skip-vote}' builders: - shell: @@ -803,7 +814,9 @@ - shell: !include-raw-escape: ../scripts/setup_vpp_dpdk_dev_env.sh - shell: - !include-raw-escape: include-raw-vpp-csit-device.sh + !include-raw-escape: + - include-raw-vpp-parallel-vars.sh + - include-raw-vpp-csit-device.sh publishers: - robot-report: -- 2.16.6