diff options
50 files changed, 307 insertions, 990 deletions
diff --git a/docker/scripts/lib_common.sh b/docker/scripts/lib_common.sh index f48ba8dba..69587f6f0 100644 --- a/docker/scripts/lib_common.sh +++ b/docker/scripts/lib_common.sh @@ -1,7 +1,7 @@ # lib_common.sh - Docker build script common library. # For import only. -# Copyright (c) 2021 Cisco and/or its affiliates. +# Copyright (c) 2022 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: @@ -156,12 +156,12 @@ export EXECUTOR_CLASS_ARCH="$EXECUTOR_DEFAULT_CLASS-$OS_ARCH" export EXECUTOR_CLASSES="$EXECUTOR_DEFAULT_CLASS csit_dut csit_shim" export EXECUTOR_ARCHS="aarch64 x86_64" declare -A EXECUTOR_CLASS_ARCH_OS_NAMES -EXECUTOR_CLASS_ARCH_OS_NAMES["builder-aarch64"]="ubuntu-18.04 ubuntu-20.04" -EXECUTOR_CLASS_ARCH_OS_NAMES["builder-x86_64"]="debian-10 debian-11 ubuntu-18.04 ubuntu-20.04" -EXECUTOR_CLASS_ARCH_OS_NAMES["csit_dut-aarch64"]="ubuntu-18.04 ubuntu-20.04" -EXECUTOR_CLASS_ARCH_OS_NAMES["csit_dut-x86_64"]="ubuntu-18.04 ubuntu-20.04" -EXECUTOR_CLASS_ARCH_OS_NAMES["csit_shim-aarch64"]="ubuntu-18.04 ubuntu-20.04" -EXECUTOR_CLASS_ARCH_OS_NAMES["csit_shim-x86_64"]="ubuntu-18.04 ubuntu-20.04" +EXECUTOR_CLASS_ARCH_OS_NAMES["builder-aarch64"]="ubuntu-20.04" +EXECUTOR_CLASS_ARCH_OS_NAMES["builder-x86_64"]="debian-10 debian-11 ubuntu-20.04" +EXECUTOR_CLASS_ARCH_OS_NAMES["csit_dut-aarch64"]="ubuntu-20.04" +EXECUTOR_CLASS_ARCH_OS_NAMES["csit_dut-x86_64"]="ubuntu-20.04" +EXECUTOR_CLASS_ARCH_OS_NAMES["csit_shim-aarch64"]="ubuntu-20.04" +EXECUTOR_CLASS_ARCH_OS_NAMES["csit_shim-x86_64"]="ubuntu-20.04" export EXECUTOR_CLASS_ARCH_OS_NAMES executor_list_roles() { diff --git a/docker/scripts/lib_vpp.sh b/docker/scripts/lib_vpp.sh index 7bae93afd..5353b63e2 100644 --- a/docker/scripts/lib_vpp.sh +++ b/docker/scripts/lib_vpp.sh @@ -96,8 +96,7 @@ docker_build_setup_vpp() { # to create an enumerated set of jobs jobs that match the # definitions here. declare -A VPP_BRANCHES -VPP_BRANCHES["debian-10"]="stable/2110 stable/2202 stable/2206 master" +VPP_BRANCHES["debian-10"]="stable/2202 stable/2206 master" VPP_BRANCHES["debian-11"]="stable/2206 master" -VPP_BRANCHES["ubuntu-18.04"]="stable/2110" -VPP_BRANCHES["ubuntu-20.04"]="stable/2110 stable/2202 stable/2206 master" +VPP_BRANCHES["ubuntu-20.04"]="stable/2202 stable/2206 master" export VPP_BRANCHES diff --git a/docker/scripts/update_dockerhub_prod_tags.sh b/docker/scripts/update_dockerhub_prod_tags.sh index 890beb3e3..6e54cf03c 100755 --- a/docker/scripts/update_dockerhub_prod_tags.sh +++ b/docker/scripts/update_dockerhub_prod_tags.sh @@ -1,6 +1,6 @@ #! /bin/bash -# Copyright (c) 2021 Cisco and/or its affiliates. +# Copyright (c) 2022 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: @@ -58,11 +58,11 @@ usage() { echo " $script i[nspect] <prod image>" echo echo " revert: swaps 'prod-<arch>' and 'prod-prev-<arch>' images" - echo " <prod image>: e.g. fdiotools/builder-ubuntu1804:prod-x86_64" + echo " <prod image>: e.g. fdiotools/builder-ubuntu2204:prod-x86_64" echo echo " promote: moves 'prod-<arch>' image to 'prod-prev-<arch>' tag and" echo " tags <new image> with 'prod-<arch>'" - echo " <new image>: e.g. fdiotools/builder-ubuntu1804:2020_09_23_151655-x86_64" + echo " <new image>: e.g. fdiotools/builder-ubuntu2204:2022_07_23_151655-x86_64" echo " inspect: prints out all tags for prod-<arch> and prod-prev-<arch>" echo exit 1 diff --git a/global-jjb b/global-jjb -Subproject 2866593326538d6cba981820f0e9b5ba9918949 +Subproject a09b8bab2c37f67f0f5e9ef36f9e93b330fdd57 diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-prod-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-prod-aarch64.yaml new file mode 100644 index 000000000..c4f8c3780 --- /dev/null +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-prod-aarch64.yaml @@ -0,0 +1,7 @@ +--- +templates: + - image: "fdiotools/builder-ubuntu2204:prod-aarch64" + labels: "builder-ubuntu2204-prod-aarch64" + prefix: "builder-ubuntu2204-prod-aarch64" + hostVolumes: "/tmp/ccache.ubuntu2204:/scratch/ccache" + memory: 16000 diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-prod-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-prod-x86_64.yaml new file mode 100644 index 000000000..529a0bee0 --- /dev/null +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-prod-x86_64.yaml @@ -0,0 +1,15 @@ +--- +templates: + - constraints: + - ltarget: "^${attr.cpu.arch}" + operand: "=" + rtarget: "amd64" + - ltarget: "^${node.class}" + operand: "=" + rtarget: "builder" + cpu: 20000 + image: "fdiotools/builder-ubuntu2204:prod-x86_64" + labels: "builder-ubuntu2204-prod-x86_64" + memory: 20000 + prefix: "builder-ubuntu2204-prod-x86_64" + hostVolumes: "/tmp/ccache.ubuntu2204:/scratch/ccache" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-sandbox-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-sandbox-aarch64.yaml new file mode 100644 index 000000000..69f782318 --- /dev/null +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-sandbox-aarch64.yaml @@ -0,0 +1,7 @@ +--- +templates: + - image: "fdiotools/builder-ubuntu2204:sandbox-aarch64" + labels: "builder-ubuntu2204-sandbox-aarch64" + prefix: "builder-ubuntu2204-sandbox-aarch64" + hostVolumes: "/tmp/ccache.ubuntu2204:/scratch/ccache" + memory: 16000 diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-sandbox-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-sandbox-x86_64.yaml new file mode 100644 index 000000000..f9a7ce2c8 --- /dev/null +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-sandbox-x86_64.yaml @@ -0,0 +1,15 @@ +--- +templates: + - constraints: + - ltarget: "^${attr.cpu.arch}" + operand: "=" + rtarget: "amd64" + - ltarget: "^${node.class}" + operand: "=" + rtarget: "builder" + cpu: 14000 + image: "fdiotools/builder-ubuntu2204:sandbox-x86_64" + labels: "builder-ubuntu2204-sandbox-x86_64" + memory: 14000 + prefix: "builder-ubuntu2204-sandbox-x86_64" + hostVolumes: "/tmp/ccache.ubuntu2204:/scratch/ccache" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-test-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-test-aarch64.yaml new file mode 100644 index 000000000..5b73277c7 --- /dev/null +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-test-aarch64.yaml @@ -0,0 +1,7 @@ +--- +templates: + - image: "fdiotools/builder-ubuntu2204:test-aarch64" + labels: "builder-ubuntu2204-test-aarch64" + prefix: "builder-ubuntu2204-test-aarch64" + hostVolumes: "/tmp/ccache.ubuntu2204:/scratch/ccache" + memory: 16000 diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-test-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-test-x86_64.yaml new file mode 100644 index 000000000..d798c160e --- /dev/null +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-test-x86_64.yaml @@ -0,0 +1,15 @@ +--- +templates: + - constraints: + - ltarget: "^${attr.cpu.arch}" + operand: "=" + rtarget: "amd64" + - ltarget: "^${node.class}" + operand: "=" + rtarget: "builder" + cpu: 14000 + image: "fdiotools/builder-ubuntu2204:test-x86_64" + labels: "builder-ubuntu2204-test-x86_64" + memory: 14000 + prefix: "builder-ubuntu2204-test-x86_64" + hostVolumes: "/tmp/ccache.ubuntu2204:/scratch/ccache" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-prod-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-prod-aarch64.yaml new file mode 100644 index 000000000..1105c10dc --- /dev/null +++ b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-prod-aarch64.yaml @@ -0,0 +1,13 @@ +--- +templates: + - constraints: + - ltarget: "^${attr.cpu.arch}" + operand: "=" + rtarget: "arm64" + - ltarget: "^${node.class}" + operand: "=" + rtarget: "csitarm" + image: "fdiotools/builder-ubuntu2204:prod-aarch64" + labels: "csit-builder-ubuntu2204-prod-aarch64" + memory: 14000 + prefix: "csit-builder-ubuntu2204-prod-aarch64" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-prod-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-prod-x86_64.yaml new file mode 100644 index 000000000..da4c25be6 --- /dev/null +++ b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-prod-x86_64.yaml @@ -0,0 +1,14 @@ +--- +templates: + - constraints: + - ltarget: "^${attr.cpu.arch}" + operand: "=" + rtarget: "amd64" + - ltarget: "^${node.class}" + operand: "=" + rtarget: "csit" + cpu: 15000 + image: "fdiotools/builder-ubuntu2204:prod-x86_64" + labels: "csit-builder-ubuntu2204-prod-x86_64" + memory: 16000 + prefix: "csit-builder-ubuntu2204-prod-x86_64" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-sandbox-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-sandbox-aarch64.yaml new file mode 100644 index 000000000..c64c19589 --- /dev/null +++ b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-sandbox-aarch64.yaml @@ -0,0 +1,13 @@ +--- +templates: + - constraints: + - ltarget: "^${attr.cpu.arch}" + operand: "=" + rtarget: "arm64" + - ltarget: "^${node.class}" + operand: "=" + rtarget: "csitarm" + image: "fdiotools/builder-ubuntu2204:sandbox-aarch64" + labels: "csit-builder-ubuntu2204-sandbox-aarch64" + memory: 14000 + prefix: "csit-builder-ubuntu2204-sandbox-aarch64" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-sandbox-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-sandbox-x86_64.yaml new file mode 100644 index 000000000..7d70ef64e --- /dev/null +++ b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-sandbox-x86_64.yaml @@ -0,0 +1,14 @@ +--- +templates: + - constraints: + - ltarget: "^${attr.cpu.arch}" + operand: "=" + rtarget: "amd64" + - ltarget: "^${node.class}" + operand: "=" + rtarget: "csit" + cpu: 15000 + image: "fdiotools/builder-ubuntu2204:sandbox-x86_64" + labels: "csit-builder-ubuntu2204-sandbox-x86_64" + memory: 16000 + prefix: "csit-builder-ubuntu2204-sandbox-x86_64" diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-2c-2g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-2c-2g.cfg index 7dc2de8a5..2f5a6b676 100644 --- a/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-2c-2g.cfg +++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-2c-2g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20210930-221429.769 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20220823-165924.392 LABELS=centos7-builder-2c-2g HARDWARE_ID=v3-standard-2 diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-4c-4g.cfg index 6e15fe66f..39069f298 100644 --- a/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-4c-4g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20210930-221429.769 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20220823-165924.392 LABELS=centos7-builder-4c-4g HARDWARE_ID=v3-standard-4 diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-docker-2c-2g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-docker-2c-2g.cfg index 7b1ca5dbe..d9310eee9 100644 --- a/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-docker-2c-2g.cfg +++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-docker-2c-2g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20210930-213141.243 +IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20220818-125455.324 LABELS=centos7-docker-2c-2g HARDWARE_ID=v3-standard-2 diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-docker-4c-4g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-docker-4c-4g.cfg index 44ddb5cb7..5d5bf3307 100644 --- a/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-docker-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-docker-4c-4g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20210930-213141.243 +IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20220818-125455.324 LABELS=centos7-docker-4c-4g HARDWARE_ID=v3-standard-4 diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu2004-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu2004-builder-4c-4g.cfg index 3988228ba..b7f73cdf0 100644 --- a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu2004-builder-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu2004-builder-4c-4g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=ZZCI - Ubuntu 20.04 - builder - x86_64 - 20211108-170718.566 +IMAGE_NAME=ZZCI - Ubuntu 20.04 - builder - x86_64 - 20220817-125321.417 LABELS=ubuntu2004-builder-4c-4g HARDWARE_ID=v3-standard-4 diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu2004-builder-arm64-4c-4g b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu2004-builder-arm64-4c-4g new file mode 100644 index 000000000..3d828a3bc --- /dev/null +++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu2004-builder-arm64-4c-4g @@ -0,0 +1,3 @@ +IMAGE_NAME=ZZCI - Ubuntu 20.04 - builder - arm64 - 20211120-085353.738 +LABELS=ubuntu2004-builder-arm64-4c-4g +HARDWARE_ID=v3-standard-4 diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu2004-docker-4c-4g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu2004-docker-4c-4g.cfg new file mode 100644 index 000000000..4ede0ed16 --- /dev/null +++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu2004-docker-4c-4g.cfg @@ -0,0 +1,3 @@ +IMAGE_NAME=ZZCI - Ubuntu 20.04 - docker - x86_64 - 20220816-203803.966 +LABELS=ubuntu2004-builder-4c-4g +HARDWARE_ID=v3-standard-4 diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu2004-docker-arm64-4c-4g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu2004-docker-arm64-4c-4g.cfg new file mode 100644 index 000000000..d5df5c736 --- /dev/null +++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu2004-docker-arm64-4c-4g.cfg @@ -0,0 +1,3 @@ +IMAGE_NAME=ZZCI - Ubuntu 20.04 - docker - arm64 - 20220817-143859.508 +LABELS=ubuntu2004-docker-arm64-4c-4g +HARDWARE_ID=v3-standard-4 diff --git a/jenkins-config/managed-config-files/custom/ansible-cfg/config-params.yaml b/jenkins-config/managed-config-files/custom/ansible-cfg/config-params.yaml new file mode 100644 index 000000000..f9e66ffc6 --- /dev/null +++ b/jenkins-config/managed-config-files/custom/ansible-cfg/config-params.yaml @@ -0,0 +1,3 @@ +--- +name: "ansible-cfg" +comment: "ansible config file" diff --git a/jenkins-config/managed-config-files/custom/ansible-cfg/content b/jenkins-config/managed-config-files/custom/ansible-cfg/content new file mode 100644 index 000000000..96c911799 --- /dev/null +++ b/jenkins-config/managed-config-files/custom/ansible-cfg/content @@ -0,0 +1,2 @@ +[defaults] +remote_tmp = ~/.ansible/tmp diff --git a/jenkins-config/managed-config-files/mavenSettings/cicn-settings/serverCredentialMappings.yaml b/jenkins-config/managed-config-files/mavenSettings/cicn-settings/serverCredentialMappings.yaml index 3b6f793bf..a2e195934 100644 --- a/jenkins-config/managed-config-files/mavenSettings/cicn-settings/serverCredentialMappings.yaml +++ b/jenkins-config/managed-config-files/mavenSettings/cicn-settings/serverCredentialMappings.yaml @@ -12,23 +12,11 @@ serverCredentialMappings: credentialsId: "cicn" - serverId: "fd.io.master.centos7" credentialsId: "cicn" - - serverId: "fd.io.master.ubuntu.trusty.main" - credentialsId: "cicn" - - serverId: "fd.io.master.ubuntu.xenial.main" - credentialsId: "cicn" - serverId: "fd.io.master.ubuntu.bionic.main" credentialsId: "cicn" - - serverId: "fd.io.master.ubuntu-arm.xenial.main" - credentialsId: "cicn" - serverId: "fd.io.master.ubunto-arm.bionic.main" credentialsId: "cicn" - serverId: "fd.io.centos7" credentialsId: "cicn" - - serverId: "fd.io.ubuntu.trust.main" - credentialsId: "cicn" - - serverId: "fd.io.ubuntu.xenial.main" - credentialsId: "cicn" - serverId: "fd.io.ubuntu.bionic.main" credentialsId: "cicn" - - serverId: "fd.io.ubuntu-arm.xenial.main" - credentialsId: "cicn" diff --git a/jenkins-config/managed-config-files/mavenSettings/csit-settings/serverCredentialMappings.yaml b/jenkins-config/managed-config-files/mavenSettings/csit-settings/serverCredentialMappings.yaml index 16e83c512..9ca623514 100644 --- a/jenkins-config/managed-config-files/mavenSettings/csit-settings/serverCredentialMappings.yaml +++ b/jenkins-config/managed-config-files/mavenSettings/csit-settings/serverCredentialMappings.yaml @@ -12,23 +12,11 @@ serverCredentialMappings: credentialsId: "csit" - serverId: "fd.io.master.centos7" credentialsId: "csit" - - serverId: "fd.io.master.ubuntu.trusty.main" - credentialsId: "csit" - - serverId: "fd.io.master.ubuntu.xenial.main" - credentialsId: "csit" - serverId: "fd.io.master.ubuntu.bionic.main" credentialsId: "csit" - - serverId: "fd.io.master.ubuntu-arm.xenial.main" - credentialsId: "csit" - serverId: "fd.io.master.ubunto-arm.bionic.main" credentialsId: "csit" - serverId: "fd.io.centos7" credentialsId: "csit" - - serverId: "fd.io.ubuntu.trust.main" - credentialsId: "csit" - - serverId: "fd.io.ubuntu.xenial.main" - credentialsId: "csit" - serverId: "fd.io.ubuntu.bionic.main" credentialsId: "csit" - - serverId: "fd.io.ubuntu-arm.xenial.main" - credentialsId: "csit" diff --git a/jenkins-config/managed-config-files/mavenSettings/hc2vpp-settings/serverCredentialMappings.yaml b/jenkins-config/managed-config-files/mavenSettings/hc2vpp-settings/serverCredentialMappings.yaml index 882a3a609..3b72d77c4 100644 --- a/jenkins-config/managed-config-files/mavenSettings/hc2vpp-settings/serverCredentialMappings.yaml +++ b/jenkins-config/managed-config-files/mavenSettings/hc2vpp-settings/serverCredentialMappings.yaml @@ -12,23 +12,11 @@ serverCredentialMappings: credentialsId: "hc2vpp" - serverId: "fd.io.master.centos7" credentialsId: "hc2vpp" - - serverId: "fd.io.master.ubuntu.trusty.main" - credentialsId: "hc2vpp" - - serverId: "fd.io.master.ubuntu.xenial.main" - credentialsId: "hc2vpp" - serverId: "fd.io.master.ubuntu.bionic.main" credentialsId: "hc2vpp" - - serverId: "fd.io.master.ubuntu-arm.xenial.main" - credentialsId: "hc2vpp" - serverId: "fd.io.master.ubunto-arm.bionic.main" credentialsId: "hc2vpp" - serverId: "fd.io.centos7" credentialsId: "hc2vpp" - - serverId: "fd.io.ubuntu.trust.main" - credentialsId: "hc2vpp" - - serverId: "fd.io.ubuntu.xenial.main" - credentialsId: "hc2vpp" - serverId: "fd.io.ubuntu.bionic.main" credentialsId: "hc2vpp" - - serverId: "fd.io.ubuntu-arm.xenial.main" - credentialsId: "hc2vpp" diff --git a/jenkins-config/managed-config-files/mavenSettings/hicn-settings/serverCredentialMappings.yaml b/jenkins-config/managed-config-files/mavenSettings/hicn-settings/serverCredentialMappings.yaml index 85dffa343..aa60636b8 100644 --- a/jenkins-config/managed-config-files/mavenSettings/hicn-settings/serverCredentialMappings.yaml +++ b/jenkins-config/managed-config-files/mavenSettings/hicn-settings/serverCredentialMappings.yaml @@ -12,23 +12,11 @@ serverCredentialMappings: credentialsId: "hicn" - serverId: "fd.io.master.centos7" credentialsId: "hicn" - - serverId: "fd.io.master.ubuntu.trusty.main" - credentialsId: "hicn" - - serverId: "fd.io.master.ubuntu.xenial.main" - credentialsId: "hicn" - serverId: "fd.io.master.ubuntu.bionic.main" credentialsId: "hicn" - - serverId: "fd.io.master.ubuntu-arm.xenial.main" - credentialsId: "hicn" - serverId: "fd.io.master.ubunto-arm.bionic.main" credentialsId: "hicn" - serverId: "fd.io.centos7" credentialsId: "hicn" - - serverId: "fd.io.ubuntu.trust.main" - credentialsId: "hicn" - - serverId: "fd.io.ubuntu.xenial.main" - credentialsId: "hicn" - serverId: "fd.io.ubuntu.bionic.main" credentialsId: "hicn" - - serverId: "fd.io.ubuntu-arm.xenial.main" - credentialsId: "hicn" diff --git a/jenkins-config/managed-config-files/mavenSettings/udpi-settings/serverCredentialMappings.yaml b/jenkins-config/managed-config-files/mavenSettings/udpi-settings/serverCredentialMappings.yaml index c11aa99df..4df90fa7a 100644 --- a/jenkins-config/managed-config-files/mavenSettings/udpi-settings/serverCredentialMappings.yaml +++ b/jenkins-config/managed-config-files/mavenSettings/udpi-settings/serverCredentialMappings.yaml @@ -12,23 +12,11 @@ serverCredentialMappings: credentialsId: "udpi" - serverId: "fd.io.master.centos7" credentialsId: "udpi" - - serverId: "fd.io.master.ubuntu.trusty.main" - credentialsId: "udpi" - - serverId: "fd.io.master.ubuntu.xenial.main" - credentialsId: "udpi" - serverId: "fd.io.master.ubuntu.bionic.main" credentialsId: "udpi" - - serverId: "fd.io.master.ubuntu-arm.xenial.main" - credentialsId: "udpi" - serverId: "fd.io.master.ubunto-arm.bionic.main" credentialsId: "udpi" - serverId: "fd.io.centos7" credentialsId: "udpi" - - serverId: "fd.io.ubuntu.trust.main" - credentialsId: "udpi" - - serverId: "fd.io.ubuntu.xenial.main" - credentialsId: "udpi" - serverId: "fd.io.ubuntu.bionic.main" credentialsId: "udpi" - - serverId: "fd.io.ubuntu-arm.xenial.main" - credentialsId: "udpi" diff --git a/jenkins-config/managed-config-files/mavenSettings/vpp-settings/serverCredentialMappings.yaml b/jenkins-config/managed-config-files/mavenSettings/vpp-settings/serverCredentialMappings.yaml index fab774c99..c65f2e29a 100644 --- a/jenkins-config/managed-config-files/mavenSettings/vpp-settings/serverCredentialMappings.yaml +++ b/jenkins-config/managed-config-files/mavenSettings/vpp-settings/serverCredentialMappings.yaml @@ -12,23 +12,11 @@ serverCredentialMappings: credentialsId: "vpp" - serverId: "fd.io.master.centos7" credentialsId: "vpp" - - serverId: "fd.io.master.ubuntu.trusty.main" - credentialsId: "vpp" - - serverId: "fd.io.master.ubuntu.xenial.main" - credentialsId: "vpp" - serverId: "fd.io.master.ubuntu.bionic.main" credentialsId: "vpp" - - serverId: "fd.io.master.ubuntu-arm.xenial.main" - credentialsId: "vpp" - serverId: "fd.io.master.ubunto-arm.bionic.main" credentialsId: "vpp" - serverId: "fd.io.centos7" credentialsId: "vpp" - - serverId: "fd.io.ubuntu.trust.main" - credentialsId: "vpp" - - serverId: "fd.io.ubuntu.xenial.main" - credentialsId: "vpp" - serverId: "fd.io.ubuntu.bionic.main" credentialsId: "vpp" - - serverId: "fd.io.ubuntu-arm.xenial.main" - credentialsId: "vpp" diff --git a/jjb/ci-management/package-list.sh b/jjb/ci-management/package-list.sh index 6172b7b54..2b4325641 100644 --- a/jjb/ci-management/package-list.sh +++ b/jjb/ci-management/package-list.sh @@ -34,16 +34,6 @@ libparc-dev \ libmemif-dev \ longbow-dev" -export PACKAGE_LIST_CENTOS="libhicnctrl-devel \ -libhicnctrl-memif-devel \ -libhicntransport-memif-devel \ -libhicn-devel \ -libhicntransport-devel \ -hicn-plugin-devel \ -libparc-devel \ -libmemif-devel \ -longbow-devel" - export VERSION_WHITELIST="19.01-227 \ 19.08-289 \ 20.01-73 \ diff --git a/jjb/ci-management/packagecloud-repo-cleanup.sh b/jjb/ci-management/packagecloud-repo-cleanup.sh index d664ae3ab..456b3a36d 100644 --- a/jjb/ci-management/packagecloud-repo-cleanup.sh +++ b/jjb/ci-management/packagecloud-repo-cleanup.sh @@ -1,13 +1,12 @@ #!/bin/bash echo "---> jjb/ci-management/packagecloud-repo-cleanup.sh" -set -euo pipefail +set -euxo pipefail # Number of packages to keep. N_PACKAGES=5 PACKAGECLOUD_REPO_DEB="https://packagecloud.io/install/repositories/fdio/${STREAM}/script.deb.sh" -PACKAGECLOUD_REPO_RPM="https://packagecloud.io/install/repositories/fdio/${STREAM}/script.rpm.sh" FACTER_OS=$(/usr/bin/facter operatingsystem) PACKAGE_LIST="" @@ -77,46 +76,6 @@ build_package_blacklist_ubuntu () { echo ${OUTPUT_LIST} } -# Params -# $1: Package list -build_package_blacklist_centos () { - PACKAGE_LIST=${@} - OUTPUT_LIST="" - VERSIONS="" - ARCH=$(uname -m) - - for package in ${PACKAGE_LIST}; do - OUTPUT=$(yum --showduplicates list ${package} 2> /dev/null) - if [[ ${?} -ne 0 || -z "${OUTPUT}" ]]; then - continue - fi - - VERSIONS="$(echo ${OUTPUT} | grep -Eo "${VERSION_REGEX}" | head -n -${N_PACKAGES})" - - for version in ${VERSIONS}; do - if ! check_version_whitelist ${version}; then - OUTPUT_LIST+="${package}-${version}.${ARCH}.rpm " - fi - done - done - - echo ${OUTPUT_LIST} -} - -promote_attic_repo_centos () { - FACTER_OSMAJREL=$(/usr/bin/facter operatingsystemmajrelease) - FACTER_ARCH=$(/usr/bin/facter architecture) - - for package in ${@}; do - echo package_cloud promote \ - ${PCIO_CO}/${STREAM}/el/${FACTER_OSMAJREL}/os/${FACTER_ARCH}/ \ - ${package} ${PCIO_CO}/attic/el/${FACTER_OSMAJREL}/os/${FACTER_ARCH}/ - package_cloud promote \ - ${PCIO_CO}/${STREAM}/el/${FACTER_OSMAJREL}/os/${FACTER_ARCH}/ \ - ${package} ${PCIO_CO}/attic/el/${FACTER_OSMAJREL}/os/${FACTER_ARCH}/ - done -} - promote_attic_repo_ubuntu () { FACTER_LSBNAME=$(/usr/bin/facter lsbdistcodename) @@ -140,12 +99,6 @@ setup_fdio_repo () { FUNCTIONS["promote_attic_repo"]="promote_attic_repo_ubuntu" PACKAGE_LIST="${PACKAGE_LIST_COMMON} ${PACKAGE_LIST_UBUNTU}" ;; - CentOS) - curl -s ${PACKAGECLOUD_REPO_RPM} | sudo bash - FUNCTIONS["package_blacklist"]="build_package_blacklist_centos" - FUNCTIONS["promote_attic_repo"]="promote_attic_repo_centos" - PACKAGE_LIST="${PACKAGE_LIST_COMMON} ${PACKAGE_LIST_CENTOS}" - ;; *) echo_err "Distribution ${FACTER_OS} is not supported." ;; diff --git a/jjb/ci-management/packagecloud-repo-cleanup.yaml b/jjb/ci-management/packagecloud-repo-cleanup.yaml index dcad9efc1..1c107c2fa 100644 --- a/jjb/ci-management/packagecloud-repo-cleanup.yaml +++ b/jjb/ci-management/packagecloud-repo-cleanup.yaml @@ -5,10 +5,7 @@ - 'packagecloud-repo-cleanup-hicn-{os}-{executor-arch}' project: 'ci-management' os: - - ubuntu1804: - repo-os-part: 'ubuntu.bionic.main' - - centos7: - repo-os-part: 'centos7' + - ubuntu2004 executor-arch: "x86_64" @@ -19,8 +16,7 @@ - 'packagecloud-repo-cleanup-hicn-{os}-{executor-arch}' project: 'ci-management' os: - - ubuntu1804: - repo-os-part: 'ubuntu-arm.bionic.main' + - ubuntu2004 executor-arch: "aarch64" diff --git a/jjb/csit/csit-perf.yaml b/jjb/csit/csit-perf.yaml index 503745beb..6223d9aa5 100644 --- a/jjb/csit/csit-perf.yaml +++ b/jjb/csit/csit-perf.yaml @@ -26,9 +26,6 @@ - 2n-clx: os: 'ubuntu2004' executor-arch: 'x86_64' - - 2n-skx: - os: 'ubuntu2004' - executor-arch: 'x86_64' - 2n-dnv: os: 'ubuntu2004' executor-arch: 'x86_64' @@ -38,9 +35,6 @@ - 2n-tx2: os: 'ubuntu2004' executor-arch: 'aarch64' - - 3n-skx: - os: 'ubuntu2004' - executor-arch: 'x86_64' - 3n-icx: os: 'ubuntu2004' executor-arch: 'x86_64' @@ -53,6 +47,9 @@ - 3n-alt: os: 'ubuntu2004' executor-arch: 'aarch64' + - 3n-snr: + os: 'ubuntu2004' + executor-arch: 'x86_64' - 'csit-dpdk-perf-mrr-weekly-master-{node-arch}': node-arch: - 2n-icx: @@ -61,18 +58,12 @@ - 2n-clx: os: 'ubuntu2004' executor-arch: 'x86_64' - - 2n-skx: - os: 'ubuntu2004' - executor-arch: 'x86_64' - 2n-zn2: os: 'ubuntu2004' executor-arch: 'x86_64' - 2n-tx2: os: 'ubuntu2004' executor-arch: 'aarch64' - - 3n-skx: - os: 'ubuntu2004' - executor-arch: 'x86_64' - 3n-icx: os: 'ubuntu2004' executor-arch: 'x86_64' @@ -82,15 +73,15 @@ - 3n-alt: os: 'ubuntu2004' executor-arch: 'aarch64' + - 3n-snr: + os: 'ubuntu2004' + executor-arch: 'x86_64' periodicity: '0 0 * * 6' - 'csit-trex-perf-verify-{stream}-{node-arch}': node-arch: - 1n-aws: os: 'ubuntu2004' executor-arch: 'x86_64' - - 2n-skx: - os: 'ubuntu2004' - executor-arch: 'x86_64' - 'csit-vpp-perf-verify-{stream}-{node-arch}': node-arch: - 2n-icx: @@ -99,9 +90,6 @@ - 2n-clx: os: 'ubuntu2004' executor-arch: 'x86_64' - - 2n-skx: - os: 'ubuntu2004' - executor-arch: 'x86_64' - 2n-dnv: os: 'ubuntu2004' executor-arch: 'x86_64' @@ -111,9 +99,6 @@ - 2n-tx2: os: 'ubuntu2004' executor-arch: 'aarch64' - - 3n-skx: - os: 'ubuntu2004' - executor-arch: 'x86_64' - 3n-icx: os: 'ubuntu2004' executor-arch: 'x86_64' @@ -126,6 +111,9 @@ - 3n-alt: os: 'ubuntu2004' executor-arch: 'aarch64' + - 3n-snr: + os: 'ubuntu2004' + executor-arch: 'x86_64' stream: - master: branch: 'master' @@ -146,10 +134,6 @@ os: 'ubuntu2004' executor-arch: 'x86_64' periodicity: '30 22 * * 0-4' - - 2n-skx: - os: 'ubuntu2004' - executor-arch: 'x86_64' - periodicity: '30 22 * * 0-4' - 2n-dnv: os: 'ubuntu2004' executor-arch: 'x86_64' @@ -162,10 +146,6 @@ os: 'ubuntu2004' executor-arch: 'aarch64' periodicity: '30 22 * * 0-4' - - 3n-skx: - os: 'ubuntu2004' - executor-arch: 'x86_64' - periodicity: '30 22 * * 0-4' - 3n-icx: os: 'ubuntu2004' executor-arch: 'x86_64' @@ -182,6 +162,10 @@ os: 'ubuntu2004' executor-arch: 'aarch64' periodicity: '30 22 * * 0-4' + - 3n-snr: + os: 'ubuntu2004' + executor-arch: 'x86_64' + periodicity: '30 22 * * 0-4' - 'csit-vpp-perf-mrr-weekly-{stream}-{node-arch}': node-arch: - 2n-icx: @@ -190,18 +174,15 @@ - 2n-clx: os: 'ubuntu2004' executor-arch: 'x86_64' - - 2n-skx: - os: 'ubuntu2004' - executor-arch: 'x86_64' - - 3n-skx: - os: 'ubuntu2004' - executor-arch: 'x86_64' - 3n-icx: os: 'ubuntu2004' executor-arch: 'x86_64' - 2n-aws: os: 'ubuntu2004' executor-arch: 'x86_64' + - 3n-snr: + os: 'ubuntu2004' + executor-arch: 'x86_64' stream: - master: branch: 'master' @@ -215,12 +196,6 @@ - 2n-clx: os: 'ubuntu2004' executor-arch: 'x86_64' - - 2n-skx: - os: 'ubuntu2004' - executor-arch: 'x86_64' - - 3n-skx: - os: 'ubuntu2004' - executor-arch: 'x86_64' - 3n-icx: os: 'ubuntu2004' executor-arch: 'x86_64' @@ -239,9 +214,6 @@ - 2n-clx: os: 'ubuntu2004' executor-arch: 'x86_64' - - 2n-skx: - os: 'ubuntu2004' - executor-arch: 'x86_64' - 2n-dnv: os: 'ubuntu2004' executor-arch: 'x86_64' @@ -251,9 +223,6 @@ - 2n-tx2: os: 'ubuntu2004' executor-arch: 'aarch64' - - 3n-skx: - os: 'ubuntu2004' - executor-arch: 'x86_64' - 3n-icx: os: 'ubuntu2004' executor-arch: 'x86_64' @@ -272,6 +241,9 @@ - 3n-aws: os: 'ubuntu2004' executor-arch: 'x86_64' + - 3n-snr: + os: 'ubuntu2004' + executor-arch: 'x86_64' - 'csit-dpdk-perf-report-iterative-{stream_report}-{node-arch}': node-arch: - 2n-icx: @@ -280,9 +252,6 @@ - 2n-clx: os: 'ubuntu2004' executor-arch: 'x86_64' - - 2n-skx: - os: 'ubuntu2004' - executor-arch: 'x86_64' - 2n-dnv: os: 'ubuntu2004' executor-arch: 'x86_64' @@ -292,9 +261,6 @@ - 2n-tx2: os: 'ubuntu2004' executor-arch: 'aarch64' - - 3n-skx: - os: 'ubuntu2004' - executor-arch: 'x86_64' - 3n-icx: os: 'ubuntu2004' executor-arch: 'x86_64' @@ -313,14 +279,14 @@ - 3n-aws: os: 'ubuntu2004' executor-arch: 'x86_64' + - 3n-snr: + os: 'ubuntu2004' + executor-arch: 'x86_64' - 'csit-trex-perf-report-iterative-{stream_report}-{node-arch}': node-arch: - 1n-aws: os: 'ubuntu2004' executor-arch: 'x86_64' - - 2n-skx: - os: 'ubuntu2004' - executor-arch: 'x86_64' - 'csit-vpp-perf-report-coverage-{stream_report}-{node-arch}': node-arch: - 2n-icx: @@ -329,9 +295,6 @@ - 2n-clx: os: 'ubuntu2004' executor-arch: 'x86_64' - - 2n-skx: - os: 'ubuntu2004' - executor-arch: 'x86_64' - 2n-dnv: os: 'ubuntu2004' executor-arch: 'x86_64' @@ -341,9 +304,6 @@ - 2n-tx2: os: 'ubuntu2004' executor-arch: 'aarch64' - - 3n-skx: - os: 'ubuntu2004' - executor-arch: 'x86_64' - 3n-icx: os: 'ubuntu2004' executor-arch: 'x86_64' @@ -362,6 +322,9 @@ - 3n-aws: os: 'ubuntu2004' executor-arch: 'x86_64' + - 3n-snr: + os: 'ubuntu2004' + executor-arch: 'x86_64' - 'csit-dpdk-perf-report-coverage-{stream_report}-{node-arch}': node-arch: - 2n-icx: @@ -370,9 +333,6 @@ - 2n-clx: os: 'ubuntu2004' executor-arch: 'x86_64' - - 2n-skx: - os: 'ubuntu2004' - executor-arch: 'x86_64' - 2n-dnv: os: 'ubuntu2004' executor-arch: 'x86_64' @@ -382,9 +342,6 @@ - 2n-tx2: os: 'ubuntu2004' executor-arch: 'aarch64' - - 3n-skx: - os: 'ubuntu2004' - executor-arch: 'x86_64' - 3n-icx: os: 'ubuntu2004' executor-arch: 'x86_64' @@ -403,14 +360,14 @@ - 3n-aws: os: 'ubuntu2004' executor-arch: 'x86_64' + - 3n-snr: + os: 'ubuntu2004' + executor-arch: 'x86_64' - 'csit-trex-perf-report-coverage-{stream_report}-{node-arch}': node-arch: - 1n-aws: os: 'ubuntu2004' executor-arch: 'x86_64' - - 2n-skx: - os: 'ubuntu2004' - executor-arch: 'x86_64' project: 'csit' branch: 'master' diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml index 8eba7450c..c75e4819b 100644 --- a/jjb/csit/csit.yaml +++ b/jjb/csit/csit.yaml @@ -19,7 +19,6 @@ jobs: - 'csit-docs-merge-{stream}-{os}-{executor-arch}' - 'csit-report-merge-{stream}-{os}-{executor-arch}' - - 'csit-trending-merge-daily-master-{os}-{executor-arch}' project: 'csit' branch: 'master' @@ -163,56 +162,6 @@ - fdio-infra-publish-docs - fdio-infra-publish -- job-template: - name: 'csit-trending-merge-daily-master-{os}-{executor-arch}' - - project-type: freestyle - node: 'builder-{os}-prod-{executor-arch}' - concurrent: false - - properties: - - lf-infra-properties: - build-days-to-keep: "{build-days-to-keep}" - - parameters: - - project-parameter: - project: '{project}' - - gerrit-parameter: - branch: '{branch}' - - scm: - - gerrit-trigger-scm: - credentials-id: 'jenkins-gerrit-credentials' - refspec: '' - choosing-strategy: 'default' - - wrappers: - - fdio-infra-wrappers-non-activity-timeout: - build-timeout: '{build-timeout}' - - triggers: - - timed: '0 14 * * *' - - builders: - - shell: - !include-raw-escape: - - ../scripts/setup_executor_env.sh - - shell: - !include-raw-escape: - - ../scripts/csit/trending.sh - - publishers: - - csit-trending-failed: - branch: 'master' - - csit-trending-failed-job: - branch: 'master' - - csit-trending-progressions: - branch: 'master' - - csit-trending-regressions: - branch: 'master' - - fdio-infra-publish-docs - - fdio-infra-publish - - project: name: csit-info project-name: csit diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml index 5043b8681..e0887571e 100644 --- a/jjb/global-macros.yaml +++ b/jjb/global-macros.yaml @@ -280,6 +280,22 @@ #### TRIGGERS # Keep 'trigger' entries ordered alphabetically, please. - trigger: + name: gerrit-trigger-build + # Comes from hicn, some verify jobs wait for build to pass. + triggers: + - gerrit: + server-name: 'Primary' + trigger-on: + - comment-added-contains-event: + comment-contains-value: 'build_success-{stream}-{os}-{executor-arch}' + projects: + - project-compare-type: 'ANT' + project-pattern: '{name}' + branches: + - branch-compare-type: 'ANT' + branch-pattern: '**/{branch}' + +- trigger: name: gerrit-trigger-checkstyle # Comes from VPP, some verify jobs wait for checkstyle to pass. # This macro is to be used for such verify jobs which are voting. diff --git a/jjb/hc2vpp/hc2vpp.yaml b/jjb/hc2vpp/hc2vpp.yaml deleted file mode 100644 index d7d2d41ea..000000000 --- a/jjb/hc2vpp/hc2vpp.yaml +++ /dev/null @@ -1,259 +0,0 @@ ---- -- project: - name: hc2vpp - jobs: - - 'hc2vpp-verify-{stream}-{os}' - - 'hc2vpp-merge-{stream}-{os}' - - 'hc2vpp-integration-{stream}-{os}' - project: 'hc2vpp' - os: - - ubuntu1804: - skip-site: 'false' - skip-jar-deploy: 'false' - - centos7: - skip-site: 'true' - skip-jar-deploy: 'true' - stream: - - master: - branch: 'master' - - '1904': - branch: 'stable/1904' - -- project: - name: hc2vpp-view - views: - - project-view - project-name: hc2vpp - -- job-template: - name: 'hc2vpp-verify-{stream}-{os}' - project-type: maven - node: '{os}-builder-4c-4g' - concurrent: true - jdk: openjdk8-{os} - - properties: - - lf-infra-properties: - build-days-to-keep: "{build-days-to-keep}" - - parameters: - - project-parameter: - project: '{project}' - - gerrit-parameter: - branch: '{branch}' - - os-parameter: - os: '{os}' - - 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-patch-submitted: - name: 'hc2vpp' - branch: '{branch}' - - maven: - maven-name: 'mvn36' - root-pom: 'pom.xml' - # yamllint disable-line rule:line-length - goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dmerge site' - maven-opts: '-Xmx2048m -Dmaven.compile.fork=true' - settings: 'hc2vpp-settings' - settings-type: cfp - global-settings: 'global-settings' - global-settings-type: cfp - - publishers: - - email-notification: - email-prefix: '[hc2vpp]' - - lf-infra-publish - -- job-template: - name: 'hc2vpp-merge-{stream}-{os}' - project-type: maven - node: '{os}-builder-4c-4g' - jdk: openjdk8-{os} - - properties: - - lf-infra-properties: - build-days-to-keep: "{build-days-to-keep}" - - parameters: - - project-parameter: - project: '{project}' - - os-parameter: - os: '{os}' - - maven-project-parameter: - maven: 'mvn36' - - maven-exec: - maven-version: 'mvn36' - - scm: - - gerrit-trigger-scm: - credentials-id: 'jenkins-gerrit-credentials' - refspec: '' - choosing-strategy: 'default' - - wrappers: - - ssh-agent-credentials: - users: - - 'jenkins-gerrit-credentials' - - fdio-infra-wrappers: - build-timeout: '{build-timeout}' - - triggers: - - gerrit-trigger-patch-merged: - name: 'hc2vpp' - branch: '{branch}' - - maven: - maven-name: 'mvn36' - root-pom: 'pom.xml' - # yamllint disable-line rule:line-length - goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dmerge -Dsonar -Ddocs.hc.folder=io/fd/hc2vpp -Dmaven.site.skip={skip-site} site -Dmaven.site.deploy.skip={skip-site} site:deploy' - maven-opts: '-Xmx2048m -Dmaven.compile.fork=true' - settings: 'hc2vpp-settings' - settings-type: cfp - global-settings: 'global-settings' - global-settings-type: cfp - - reporters: - - findbugs - - publishers: - - sonar: - jdk: 'openjdk8-{os}' - language: 'java' - branch: '{stream}' - - email-notification: - email-prefix: '[hc2vpp]' - - lf-infra-publish - -- job-template: - name: 'hc2vpp-integration-{stream}-{os}' - project-type: maven - node: '{os}-builder-4c-4g' - jdk: openjdk8-{os} - - properties: - - lf-infra-properties: - build-days-to-keep: "{build-days-to-keep}" - - parameters: - - project-parameter: - project: '{project}' - - os-parameter: - os: '{os}' - - stream-parameter: - stream: '{stream}' - - maven-project-parameter: - maven: 'mvn36' - - maven-exec: - maven-version: 'mvn36' - - string: - name: SKIP_JAR_DEPLOY - default: '{skip-jar-deploy}' - # yamllint disable-line rule:line-length - description: "Skips deployment of hc2vpp jars if variable is set to true" - - scm: - - git-scm: - credentials-id: 'jenkins-gerrit-credentials' - refspec: '' - branch: '{branch}' - - wrappers: - - ssh-agent-credentials: - users: - - 'jenkins-gerrit-credentials' - - fdio-infra-wrappers: - build-timeout: '{build-timeout}' - - triggers: - - reverse: - jobs: 'jvpp-merge-{stream}-{os},hc2vpp-merge-{stream}-{os}' - result: 'success' - - prebuilders: - - config-file-provider: - files: - - file-id: '.packagecloud' - target: '/home/jenkins' - - config-file-provider: - files: - - file-id: 'packagecloud_api' - target: '/home/jenkins' - - - shell: - !include-raw-escape: include-raw-hc2vpp-integration-prebuild.sh - maven: - maven-name: 'mvn36' - root-pom: 'pom.xml' - # yamllint disable-line rule:line-length - goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dmerge' - maven-opts: '-Xmx2048m -Dmaven.compile.fork=true' - settings: 'hc2vpp-settings' - settings-type: cfp - global-settings: 'global-settings' - global-settings-type: cfp - - postbuilders: - - maven-target: - maven-version: 'mvn36' - goals: '--version' - settings: 'hc2vpp-settings' - settings-type: cfp - global-settings: 'global-settings' - global-settings-type: cfp - - provide-maven-settings: - settings-file: 'hc2vpp-settings' - global-settings-file: 'global-settings' - - shell: - !include-raw-escape: - - ../scripts/maven_push_functions.sh - - include-raw-hc2vpp-pkg-push.sh - - shell: - !include-raw-escape: - - ../scripts/packagecloud_push.sh - reporters: - - findbugs - - publishers: - - email-notification: - email-prefix: '[hc2vpp]' - - maven-deploy: - id: '' - unique-version: true - deploy-unstable: false - release-env-var: SKIP_JAR_DEPLOY - - lf-infra-publish - -- project: - name: hc2vpp-info - project-name: hc2vpp - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-2g - project: hc2vpp - branch: master - -- project: - name: hc2vpp-sonar - project: hc2vpp - project-name: hc2vpp - mvn-settings: hc2vpp-settings - sonarcloud: true - sonarcloud-project-organization: '{sonarcloud_project_organization}' - sonarcloud-api-token: '{sonarcloud_api_token}' - sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' - branch: master - build-node: centos7-docker-2c-2g - jobs: - - gerrit-maven-sonar diff --git a/jjb/hc2vpp/include-raw-hc2vpp-integration-prebuild.sh b/jjb/hc2vpp/include-raw-hc2vpp-integration-prebuild.sh deleted file mode 100644 index dc4ca43de..000000000 --- a/jjb/hc2vpp/include-raw-hc2vpp-integration-prebuild.sh +++ /dev/null @@ -1,95 +0,0 @@ -#!/bin/bash - -set -ex -# Download the latest VPP java API package -VERSION="RELEASE" -VERSION=`./jvpp-version` - -# Figure out what system we are running on -if [[ -f /etc/lsb-release ]];then - . /etc/lsb-release -elif [[ -f /etc/redhat-release ]];then - sudo yum install -y redhat-lsb - DISTRIB_ID=`lsb_release -si` - DISTRIB_RELEASE=`lsb_release -sr` - DISTRIB_CODENAME=`lsb_release -sc` - DISTRIB_DESCRIPTION=`lsb_release -sd` -fi -echo "----- OS INFO -----" -echo DISTRIB_ID: ${DISTRIB_ID} -echo DISTRIB_RELEASE: ${DISTRIB_RELEASE} -echo DISTRIB_CODENAME: ${DISTRIB_CODENAME} -echo DISTRIB_DESCRIPTION: ${DISTRIB_DESCRIPTION} - -if [[ "$VERSION" == *"-release" ]]; then - # at the time when HC2VPP release packages are being build, - # jvpp release packages are already promoted to release repository. - # Therefore we need to switch to release repository in order to download - # correct jvpp package versions - STREAM="release" -fi - -echo "----- DOWNLOADING PACKAGES -----" -if ! [[ -z ${REPO_NAME} ]]; then - REPO_URL="https://packagecloud.io/fdio/${STREAM}" - echo "REPO_URL: ${REPO_URL}" - if [[ "$DISTRIB_ID" == "Ubuntu" ]]; then - if [[ -f /etc/apt/sources.list.d/99fd.io.list ]];then - echo "Deleting: /etc/apt/sources.list.d/99fd.io.list" - sudo rm /etc/apt/sources.list.d/99fd.io.list - fi - if ! [[ "${STREAM}" == "master" ]]; then - echo "stable branch - clearing all fdio repos. new one will be installed." - sudo rm -f /etc/apt/sources.list.d/fdio_*.list - fi - curl -s https://packagecloud.io/install/repositories/fdio/${STREAM}/script.deb.sh | sudo bash - if [[ "${VERSION}" != 'RELEASE' ]]; then - # download specific version if set - echo VERSION: ${VERSION} - apt-get download vpp-api-java=${VERSION} || true - else - # download latest version for specified stream - apt-get download vpp-api-java || true - fi - - elif [[ "$DISTRIB_ID" == "CentOS" ]]; then - if [[ -f /etc/yum.repos.d/fdio-master.repo ]]; then - echo "Deleting: /etc/yum.repos.d/fdio-master.repo" - sudo rm /etc/yum.repos.d/fdio-master.repo - fi - curl -s https://packagecloud.io/install/repositories/fdio/${STREAM}/script.rpm.sh | sudo bash - if [[ "${VERSION}" != 'RELEASE' ]]; then - # download specific version if set - echo VERSION: ${VERSION} - yumdownloader vpp-api-java-${VERSION} || true - else - # download latest version for specified stream - yumdownloader vpp-api-java || true - fi - fi -fi - -# install vpp-api-java, this extracts jvpp .jar files into usr/share/java -if [[ "${OS}" == "centos7" ]]; then - sudo rpm --nodeps --install vpp-api-java* -else - sudo dpkg --ignore-depends=vpp,vpp-plugin-core --install vpp-api-java* -fi -sudo rm vpp-api-java* - -# install jvpp jars into maven repo, so that maven picks them up when building hc2vpp -version=`./jvpp/version` - -current_dir=`pwd` -cd /usr/share/java - -for item in jvpp*.jar; do - # Example filename: jvpp-registry-17.01-20161206.125556-1.jar - # ArtifactId = jvpp-registry - # Version = 17.01 - basefile=$(basename -s .jar "$item") - artifactId=$(echo "$basefile" | cut -d '-' -f 1-2) - mvn install:install-file -Dfile=${item} -DgroupId=io.fd.jvpp -DartifactId=${artifactId} -Dversion=${version} -Dpackaging=jar -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -done - -cd ${current_dir} diff --git a/jjb/hc2vpp/include-raw-hc2vpp-pkg-push.sh b/jjb/hc2vpp/include-raw-hc2vpp-pkg-push.sh deleted file mode 100644 index fbf06c029..000000000 --- a/jjb/hc2vpp/include-raw-hc2vpp-pkg-push.sh +++ /dev/null @@ -1,83 +0,0 @@ -#!/bin/bash -set -x - -# In case of master branch, update vpp_dependencies file -# to match vpp-api-java and eliminate Java API mismatches (HC2VPP-102). -# -# In order to have control of package dependencies in the release artifacts (HC2VPP-282), -# the vpp_dependencies file is not modified in case of stable branch -# (after VPP API freeze, Java API mismatches occur very rarely). -if [[ "${STREAM}" == "master" ]]; then - if [[ "${OS}" == "centos7" ]]; then - # Determine VPP Java API version used in maven build - JVPP_VERSION=`yum list installed vpp-api-java | grep vpp-api-java | awk '{ printf $2; }'` - VERSION=`yum deplist vpp-api-java |grep vpp-lib |head -1 | awk '{ print $3}'` - - # Write a file that will echo VPP dependencies - echo -n 'echo' > vpp_dependencies - echo " \"vpp = ${VERSION}, vpp-plugins = ${VERSION}, vpp-api-java = ${JVPP_VERSION}\"" >> vpp_dependencies - chmod +x vpp_dependencies - - # Overwrite default dependencies file - mv vpp_dependencies packaging/rpm/ - else - # Determine VPP Java API version used in maven build - JVPP_VERSION=`apt list --installed | grep vpp-api-java | awk '{ printf $2; }'` - # get vpp-api-java package dependencies - JVPP_DEPS=`apt-cache show vpp-api-java=${JVPP_VERSION} |grep Depends: | sed "s/Depends: //"` - # separate deps with newline, then find VPP dependency and filter out the version - VERSION=`echo ${JVPP_DEPS}| sed "s/, /\\n/" |grep "vpp " | sed "s/).*//" |sed "s/.* //"` - - # Write a file that will echo VPP dependencies - echo -n 'echo' > vpp_dependencies - echo " \"vpp (= ${VERSION}), vpp-plugin-core (= ${VERSION}), vpp-api-java (= ${JVPP_VERSION})\"" >> vpp_dependencies - chmod +x vpp_dependencies - - # Overwrite default dependencies file - mv vpp_dependencies packaging/deb/common/ - fi -fi - -# Build package -if [[ "${OS}" == "centos7" ]]; then - - # Build the rpms - ./packaging/rpm/rpmbuild.sh - - # Find the files - RPMS=$(find ./packaging/ -type f -iname '*.rpm') - SRPMS=$(find ./packaging/ -type f -iname '*.srpm') - SRCRPMS=$(find ./packaging/ -type f -name '*.src.rpm') - - # Publish hc2vpp packages - for i in ${RPMS} ${SRPMS} ${SRCRPMS} - do - push_rpm "$i" - done -elif [[ "${OS}" == "ubuntu1604" ]]; then - - # Build the debs - ./packaging/deb/xenial/debuild.sh - - # Find the files - DEBS=$(find ./packaging/ -type f -iname '*.deb') - - # Publish hc2vpp packages - for i in ${DEBS} - do - push_deb "$i" - done -elif [[ "${OS}" == "ubuntu1804" ]]; then - - # Build the debs - ./packaging/deb/bionic/debuild.sh - - # Find the files - DEBS=$(find ./packaging/ -type f -iname '*.deb') - - # Publish hc2vpp packages - for i in ${DEBS} - do - push_deb "$i" - done -fi diff --git a/jjb/hicn/hicn.yaml b/jjb/hicn/hicn.yaml index 4e1bb5349..3fc019824 100644 --- a/jjb/hicn/hicn.yaml +++ b/jjb/hicn/hicn.yaml @@ -15,7 +15,8 @@ - project: name: hicn-x86_64 jobs: - - "hicn-verify-{stream}-{os}-{executor-arch}" + - "hicn-verify-build-{stream}-{os}-{executor-arch}" + - "hicn-verify-functest-{stream}-{os}-{executor-arch}" - "hicn-merge-{stream}-{os}-{executor-arch}" project: "hicn" os: ubuntu2004 @@ -27,7 +28,7 @@ - project: name: hicn-aarch64 jobs: - - "hicn-verify-{stream}-{os}-{executor-arch}" + - "hicn-verify-build-{stream}-{os}-{executor-arch}" - "hicn-merge-{stream}-{os}-{executor-arch}" project: "hicn" os: ubuntu2004 @@ -236,7 +237,7 @@ fixed-delay: 90 - job-template: - name: "hicn-verify-{stream}-{os}-{executor-arch}" + name: "hicn-verify-build-{stream}-{os}-{executor-arch}" project-type: freestyle node: "builder-{os}-prod-{executor-arch}" @@ -267,9 +268,30 @@ build-timeout: 120 triggers: - - gerrit-trigger-checkstyle: - name: "{project}" - branch: "{branch}" + - gerrit: + server-name: "Primary" + trigger-on: + - comment-added-contains-event: + comment-contains-value: "checkstyle_success" + projects: + - project-compare-type: "ANT" + project-pattern: "{project}" + branches: + - branch-compare-type: "ANT" + branch-pattern: "**/{branch}" + override-votes: true + gerrit-build-notbuilt-verified-value: 0 + gerrit-build-successful-verified-value: 1 + # yamllint disable-line rule:line-length + notbuilt-message: "Automatic retry of failed jobs may be in process. A proper vote should be set when retry completes." + # yamllint disable-line rule:line-length + failed-message: "Build failed. No further verify jobs will be started." + successful-message: "build_success-{stream}-{os}-{executor-arch}" + skip-vote: + successful: true + failed: false + unstable: false + notbuilt: false builders: - shell: !include-raw-escape: @@ -279,6 +301,55 @@ publishers: - fdio-infra-publish + - archive-artifacts: + artifacts: "packages/*.deb, packages/*.rpm" + +- job-template: + name: "hicn-verify-functest-{stream}-{os}-{executor-arch}" + + project-type: freestyle + node: "centos7-docker-4c-4g" + concurrent: true + + properties: + - lf-infra-properties: + build-days-to-keep: "{build-days-to-keep}" + + parameters: + - project-parameter: + project: "{project}" + - gerrit-parameter: + branch: "{branch}" + - os-parameter: + os: "{os}" + - 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-build: + name: "{project}" + branch: "{branch}" + stream: "{stream}" + os: "{os}" + executor-arch: "{executor-arch}" + + builders: + - shell: !include-raw-escape: + - ../scripts/hicn/functest.sh + + publishers: + - robot-report: + output-path: "tests" - job-template: name: "hicn-merge-{stream}-{os}-{executor-arch}" diff --git a/jjb/scripts/hicn/functest.sh b/jjb/scripts/hicn/functest.sh new file mode 100644 index 000000000..e520c78ce --- /dev/null +++ b/jjb/scripts/hicn/functest.sh @@ -0,0 +1,9 @@ +#!/bin/bash +# basic build script example +set -euxo pipefail + +echo "---> jjb/scripts/hicn/functest.sh" + +pushd scripts +bash ./functional-tests.sh +popd diff --git a/jjb/scripts/publish_docs.sh b/jjb/scripts/publish_docs.sh index adc179668..891e57a7b 100755 --- a/jjb/scripts/publish_docs.sh +++ b/jjb/scripts/publish_docs.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (c) 2021 Cisco and/or its affiliates. +# Copyright (c) 2022 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: @@ -45,22 +45,9 @@ if [[ ${JOB_NAME} == *merge* ]]; then ;; *"vpp-docs"*) vpp_release="$(${WORKSPACE}/build-root/scripts/version rpm-version)" - # TODO: Remove conditional statement when stable/2106 and - # stable/2110 are no longer supported - if [[ "${vpp_release::2}" -ge "22" ]] ; then - workspace_dir="${WORKSPACE}/build-root/docs/html" - else - workspace_dir="${WORKSPACE}/docs/_build/html" - fi + workspace_dir="${WORKSPACE}/build-root/docs/html" bucket_path="/vpp/${vpp_release}/" ;; - # TODO: Remove 'vpp-make-test-docs' when stable/2106 and - # stable/2110 are no longer supported - *"vpp-make-test-docs"*) - vpp_release="$(${WORKSPACE}/build-root/scripts/version rpm-version)" - workspace_dir="${WORKSPACE}/test/doc/build/html" - bucket_path="/vpp/${vpp_release}/vpp_make_test/html/" - ;; *) die "Unknown job: ${JOB_NAME}" esac diff --git a/jjb/scripts/setup_vpp_ext_deps.sh b/jjb/scripts/setup_vpp_ext_deps.sh index 5ace223cf..077dca163 100755 --- a/jjb/scripts/setup_vpp_ext_deps.sh +++ b/jjb/scripts/setup_vpp_ext_deps.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (c) 2021 Cisco and/or its affiliates. +# Copyright (c) 2022 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: @@ -62,25 +62,6 @@ if [ "${OS_ID,,}" == "ubuntu" ] || [ "${OS_ID,,}" == "debian" ] ; then echo "Removing packagecloud.io repository references and running apt-get update" sudo rm -f /etc/apt/sources.list.d/fdio_*.list sudo apt-get update -qq || true -#TODO: Remove centos when VPP 21.06 is no longer supported -elif [ "${OS_ID,,}" == "centos" ] ; then - if [ "${STREAM}" != "master" ] ; then - echo "stream '${STREAM}' is not master: replacing packagecloud repo list with stream specific list" - sudo yum -y erase vpp-ext-deps || true - sudo yum clean all || true - sudo rm -f /etc/yum.repos.d/fdio_master.repo - curl -s $INSTALL_URL/script.rpm.sh | sudo bash || true - fi - vpp_ext_deps_version="$(yum -q list vpp-ext-deps 2> /dev/null | mawk '/vpp-ext-deps/{print $2}')" - vpp_ext_deps_pkg="$(yum -q list vpp-ext-deps 2> /dev/null | mawk '/vpp-ext-deps/{print $1}')" - vpp_ext_deps_pkg="${vpp_ext_deps_pkg/./-${vpp_ext_deps_version}.}.rpm" - if [ -f "$vpp_ext_deps_pkg" ] ; then - echo "Installing cached vpp-ext-deps pkg: $vpp_ext_deps_pkg" - sudo yum -y localinstall "$downloads_dir/$vpp_ext_deps_pkg" || true - else - echo "Installing vpp-ext-deps from packagecloud.io" - sudo yum -y install vpp-ext-deps || true - fi else echo "ERROR: Unsupported OS '$OS_ID'!" fi diff --git a/jjb/scripts/vpp/docs.sh b/jjb/scripts/vpp/docs.sh index 2d80e5593..52b920e31 100755 --- a/jjb/scripts/vpp/docs.sh +++ b/jjb/scripts/vpp/docs.sh @@ -26,11 +26,4 @@ if [[ ${JOB_NAME} == *merge* ]] && [ -n "${GERRIT_NEWREV:-}" ] && exit 0 fi -# TODO: Remove conditional statement when stable/2106 and stable/2110 are no -# longer supported -vpp_release="$(${WORKSPACE}/build-root/scripts/version rpm-version)" -if [[ "${vpp_release::2}" -ge "22" ]] ; then - make UNATTENDED=yes docs docs-spell -else - make UNATTENDED=yes docs-venv docs -fi +make UNATTENDED=yes docs diff --git a/jjb/scripts/vpp/gcc-build.sh b/jjb/scripts/vpp/gcc-build.sh index 488e8d7d7..5afe739db 100644 --- a/jjb/scripts/vpp/gcc-build.sh +++ b/jjb/scripts/vpp/gcc-build.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (c) 2021 Cisco and/or its affiliates. +# Copyright (c) 2022 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: @@ -49,7 +49,7 @@ make_build_release_build_test_gcov_sanity() { fi # TODO: Add 'smoke test' env var to select smoke test cases # then update this accordingly. For now pick a few basic suites... - MAKE_TEST_SUITES="vlib vppinfra vpe_api vapi vom bihash" + MAKE_TEST_SUITES="vlib vppinfra vpe_api vapi cli bihash" for suite in $MAKE_TEST_SUITES ; do if ! make UNATTENDED=yes GCOV_TESTS=1 TEST_JOBS=auto TEST=$suite test ; then BUILD_ERROR="FAILED 'make GCOV_TESTS=1 TEST_JOBS=auto TEST=$suite test'!" diff --git a/jjb/scripts/vpp/make-test-docs.sh b/jjb/scripts/vpp/make-test-docs.sh deleted file mode 100755 index 0c6e2156d..000000000 --- a/jjb/scripts/vpp/make-test-docs.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2021 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. - -echo "---> jjb/scripts/vpp/make-test-docs.sh" - -set -euxo pipefail - -# TODO: Remove this file when stable/2106 and stable/2110 are no longer -# supported as 'make test-doc' is deprecated in master (VPP 22.02) - -line="*************************************************************************" -# Don't build anything if this is a merge job being run when -# the git HEAD id is not the same as the Gerrit New Revision id. -if [[ ${JOB_NAME} == *merge* ]] && [ -n "${GERRIT_NEWREV:-}" ] && - [ "$GERRIT_NEWREV" != "$GIT_COMMIT" ] ; then - echo -e "\n$line\nSkipping 'make test' docs build. A newer patch has been merged.\n$line\n" - exit 0 -fi - -make test-doc diff --git a/jjb/vpp/docs.yaml b/jjb/vpp/docs.yaml index 499793af5..05268384c 100644 --- a/jjb/vpp/docs.yaml +++ b/jjb/vpp/docs.yaml @@ -13,9 +13,6 @@ - master: branch: 'master' branch-refspec: '' - - '2110': - branch: 'stable/2110' - branch-refspec: '' - '2202': branch: 'stable/2202' branch-refspec: '' @@ -23,22 +20,6 @@ branch: 'stable/2206' branch-refspec: '' -# TODO: Remove when stable/2110 is no longer supported. -- project: - name: make-test-docs - jobs: - - 'vpp-make-test-docs-merge-{stream}-{os}-{executor-arch}' - - 'vpp-make-test-docs-verify-{stream}-{os}-{executor-arch}' - - project: 'vpp' - executor-arch: 'x86_64' - os: 'ubuntu2004' - - stream: - - '2110': - branch: 'stable/2110' - branch-refspec: '' - - job-template: name: 'vpp-docs-verify-{stream}-{os}-{executor-arch}' @@ -165,131 +146,3 @@ publishers: - fdio-infra-publish-docs - fdio-infra-publish - - -- job-template: - name: 'vpp-make-test-docs-verify-{stream}-{os}-{executor-arch}' - - project-type: freestyle - node: 'builder-{os}-prod-{executor-arch}' - concurrent: true - allow-empty: 'true' - fingerprint: false - only-if-success: true - default-excludes: false - - properties: - - lf-infra-properties: - build-days-to-keep: "{build-days-to-keep}" - - parameters: - - project-parameter: - project: '{project}' - - gerrit-parameter: - branch: '{branch}' - - os-parameter: - os: '{os}' - - stream-parameter: - stream: '{stream}' - - gerrit-refspec-parameter: - refspec: '{branch-refspec}' - - 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: - 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/vpp/make-test-docs.sh - - publishers: - - fdio-infra-publish - -- job-template: - name: 'vpp-make-test-docs-merge-{stream}-{os}-{executor-arch}' - - project-type: freestyle - node: 'builder-{os}-prod-{executor-arch}' - concurrent: false - allow-empty: 'true' - fingerprint: false - only-if-success: true - default-excludes: false - - properties: - - lf-infra-properties: - build-days-to-keep: "{build-days-to-keep}" - - parameters: - - project-parameter: - project: '{project}' - - gerrit-parameter: - branch: '{branch}' - - os-parameter: - os: '{os}' - - stream-parameter: - stream: '{stream}' - - scm: - - gerrit-trigger-scm: - credentials-id: 'jenkins-gerrit-credentials' - refspec: '' - choosing-strategy: 'default' - - wrappers: - - fdio-infra-wrappers: - build-timeout: '{build-timeout}' - - triggers: - - reverse: - jobs: 'vpp-merge-{stream}-{os}-{executor-arch}' - result: 'success' - - gerrit: - server-name: 'Primary' - trigger-on: - - comment-added-contains-event: - comment-contains-value: 'run-docs' - projects: - - project-compare-type: 'ANT' - project-pattern: '{project}' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' - skip-vote: - successful: true - failed: true - unstable: true - notbuilt: true - - 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/vpp/make-test-docs.sh - - publishers: - - fdio-infra-publish-docs - - fdio-infra-publish diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index 5a157285c..e8de49c85 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -38,9 +38,6 @@ - master: branch: 'master' branch-refspec: '' - - '2110': - branch: 'stable/2110' - branch-refspec: '' - '2202': branch: 'stable/2202' branch-refspec: '' @@ -71,9 +68,6 @@ - master: branch: 'master' branch-refspec: '' - - '2110': - branch: 'stable/2110' - branch-refspec: '' - '2202': branch: 'stable/2202' branch-refspec: '' @@ -83,24 +77,10 @@ os: - debian10 - debian11 - - ubuntu1804 - ubuntu2004 executor-arch: 'x86_64' exclude: - # OS deprecated on master - - stream: 'master' - os: 'ubuntu1804' - # OS deprecated on 2202 - - stream: '2202' - os: 'ubuntu1804' - # OS deprecated on 2206 - - stream: '2206' - os: 'ubuntu1804' - # os added in master - - stream: '2106' - os: 'debian11' - - stream: '2110' - os: 'debian11' + # os added in 22.06 - stream: '2202' os: 'debian11' # [end] VPP-X86_64 PROJECT @@ -141,9 +121,6 @@ - master: branch: 'master' branch-refspec: '' - - '2110': - branch: 'stable/2110' - branch-refspec: '' - '2202': branch: 'stable/2202' branch-refspec: '' @@ -173,9 +150,6 @@ - master: branch: 'master' branch-refspec: '' - - '2110': - branch: 'stable/2110' - branch-refspec: '' - '2202': branch: 'stable/2202' branch-refspec: '' @@ -183,19 +157,8 @@ branch: 'stable/2206' branch-refspec: '' os: - - ubuntu1804 - ubuntu2004 executor-arch: 'aarch64' - exclude: - # OS deprecated on master - - stream: 'master' - os: 'ubuntu1804' - # OS deprecated on 2202 - - stream: '2202' - os: 'ubuntu1804' - # OS deprecated on 2206 - - stream: '2206' - os: 'ubuntu1804' # [end] VPP-AARCH64 PROJECT # VPP-CSIT-VERIFY-DEVICE PROJECT @@ -251,15 +214,9 @@ - 2n-clx: os: 'ubuntu2004' executor-arch: 'x86_64' - - 2n-skx: - os: 'ubuntu2004' - executor-arch: 'x86_64' - 2n-zn2: os: 'ubuntu2004' executor-arch: 'x86_64' - - 3n-skx: - os: 'ubuntu2004' - executor-arch: 'x86_64' - 3n-icx: os: 'ubuntu2004' executor-arch: 'x86_64' @@ -281,6 +238,9 @@ os: 'ubuntu2004' executor-arch: 'aarch64' make-parallel-jobs: '16' + - 3n-snr: + os: 'ubuntu2004' + executor-arch: 'x86_64' # [end] VPP-CSIT-VERIFY-PERF PROJECT diff --git a/packer/common-packer b/packer/common-packer -Subproject 3dcae183d810816f31950afbe1fa08fa948e61f +Subproject ae3a1a9c4bb342170ef883da033646811ac703a diff --git a/packer/provision/local-builder.yaml b/packer/provision/local-builder.yaml index 96c1b8a6d..ef904075e 100644 --- a/packer/provision/local-builder.yaml +++ b/packer/provision/local-builder.yaml @@ -40,11 +40,12 @@ name: - tox - tox-pyenv - - virtualenv + - python-virtualenv state: present become: true + when: ansible_distribution == 'Ubuntu' - - name: 'Install TLDK Packages' + - name: 'Apt Install TLDK Packages' apt: name: - libaprutil1-dev @@ -62,7 +63,16 @@ - python3-pyelftools - python3-scapy - libnuma-dev - - meson + state: present + when: ansible_distribution == 'Ubuntu' + become: true + + - name: Pip Install TLDK Packages + pip: + name: + - meson==0.59.0 + - ninja + state: present when: ansible_distribution == 'Ubuntu' become: true |