diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/csit/csit-perf.yaml | 43 | ||||
| -rw-r--r-- | jjb/csit/csit-vpp-device.yaml | 2 | ||||
| -rw-r--r-- | jjb/global-macros.yaml | 45 | ||||
| -rw-r--r-- | jjb/hicn/hicn-docs.yaml | 10 | ||||
| -rw-r--r-- | jjb/hicn/hicn.yaml | 75 | ||||
| -rw-r--r-- | jjb/scripts/hicn/docs.sh | 8 | ||||
| -rwxr-xr-x | jjb/scripts/publish_docs.sh | 48 | ||||
| -rw-r--r-- | jjb/scripts/terraform_s3_docs_ship.sh | 3 | ||||
| -rw-r--r-- | jjb/vpp/docs.yaml | 7 | ||||
| -rw-r--r-- | jjb/vpp/vpp.yaml | 39 |
10 files changed, 177 insertions, 103 deletions
diff --git a/jjb/csit/csit-perf.yaml b/jjb/csit/csit-perf.yaml index 657accbc0..e5223bb8d 100644 --- a/jjb/csit/csit-perf.yaml +++ b/jjb/csit/csit-perf.yaml @@ -26,9 +26,6 @@ - 2n-clx: os: 'ubuntu2204' executor-arch: 'x86_64' - - 2n-dnv: - os: 'ubuntu2004' - executor-arch: 'x86_64' - 2n-zn2: os: 'ubuntu2204' executor-arch: 'x86_64' @@ -38,9 +35,6 @@ - 3n-icx: os: 'ubuntu2204' executor-arch: 'x86_64' - - 3n-dnv: - os: 'ubuntu2004' - executor-arch: 'x86_64' - 3n-tsh: os: 'ubuntu2204' executor-arch: 'aarch64' @@ -93,9 +87,6 @@ - 2n-clx: os: 'ubuntu2204' executor-arch: 'x86_64' - - 2n-dnv: - os: 'ubuntu2004' - executor-arch: 'x86_64' - 2n-zn2: os: 'ubuntu2204' executor-arch: 'x86_64' @@ -105,9 +96,6 @@ - 3n-icx: os: 'ubuntu2204' executor-arch: 'x86_64' - - 3n-dnv: - os: 'ubuntu2004' - executor-arch: 'x86_64' - 3n-tsh: os: 'ubuntu2204' executor-arch: 'aarch64' @@ -137,9 +125,6 @@ os: 'ubuntu2204' executor-arch: 'x86_64' periodicity: '30 22 * * 0-4' - - 2n-dnv: - os: 'ubuntu2004' - executor-arch: 'x86_64' periodicity: '30 22 * * 0-4' - 2n-zn2: os: 'ubuntu2204' @@ -153,10 +138,6 @@ os: 'ubuntu2204' executor-arch: 'x86_64' periodicity: '30 22 * * 0-4' - - 3n-dnv: - os: 'ubuntu2004' - executor-arch: 'x86_64' - periodicity: '30 22 * * 0-4' - 3n-tsh: os: 'ubuntu2204' executor-arch: 'aarch64' @@ -215,9 +196,6 @@ - 2n-clx: os: 'ubuntu2204' executor-arch: 'x86_64' - - 2n-dnv: - os: 'ubuntu2004' - executor-arch: 'x86_64' - 2n-zn2: os: 'ubuntu2204' executor-arch: 'x86_64' @@ -227,9 +205,6 @@ - 3n-icx: os: 'ubuntu2204' executor-arch: 'x86_64' - - 3n-dnv: - os: 'ubuntu2004' - executor-arch: 'x86_64' - 3n-tsh: os: 'ubuntu2204' executor-arch: 'aarch64' @@ -253,9 +228,6 @@ - 2n-clx: os: 'ubuntu2204' executor-arch: 'x86_64' - - 2n-dnv: - os: 'ubuntu2004' - executor-arch: 'x86_64' - 2n-zn2: os: 'ubuntu2204' executor-arch: 'x86_64' @@ -265,9 +237,6 @@ - 3n-icx: os: 'ubuntu2204' executor-arch: 'x86_64' - - 3n-dnv: - os: 'ubuntu2004' - executor-arch: 'x86_64' - 3n-tsh: os: 'ubuntu2204' executor-arch: 'aarch64' @@ -299,9 +268,6 @@ - 2n-clx: os: 'ubuntu2204' executor-arch: 'x86_64' - - 2n-dnv: - os: 'ubuntu2004' - executor-arch: 'x86_64' - 2n-zn2: os: 'ubuntu2204' executor-arch: 'x86_64' @@ -311,9 +277,6 @@ - 3n-icx: os: 'ubuntu2204' executor-arch: 'x86_64' - - 3n-dnv: - os: 'ubuntu2004' - executor-arch: 'x86_64' - 3n-tsh: os: 'ubuntu2204' executor-arch: 'aarch64' @@ -337,9 +300,6 @@ - 2n-clx: os: 'ubuntu2204' executor-arch: 'x86_64' - - 2n-dnv: - os: 'ubuntu2004' - executor-arch: 'x86_64' - 2n-zn2: os: 'ubuntu2204' executor-arch: 'x86_64' @@ -349,9 +309,6 @@ - 3n-icx: os: 'ubuntu2204' executor-arch: 'x86_64' - - 3n-dnv: - os: 'ubuntu2004' - executor-arch: 'x86_64' - 3n-tsh: os: 'ubuntu2204' executor-arch: 'aarch64' diff --git a/jjb/csit/csit-vpp-device.yaml b/jjb/csit/csit-vpp-device.yaml index 51807031c..ed21aa17e 100644 --- a/jjb/csit/csit-vpp-device.yaml +++ b/jjb/csit/csit-vpp-device.yaml @@ -25,7 +25,7 @@ os: 'ubuntu2204' executor-arch: 'aarch64' make-parallel-jobs: '32' - skip-vote: 'true' + skip-vote: 'false' jobs: - 'csit-vpp-device-{stream}-{os}-{executor-arch}-{node-arch}' - 'csit-vpp-device-{stream}-{os}-{executor-arch}-{node-arch}-semiweekly': diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml index c2c24ca13..ca925ebc0 100644 --- a/jjb/global-macros.yaml +++ b/jjb/global-macros.yaml @@ -754,10 +754,10 @@ - publisher: name: fdio-infra-publish-docs - # macro to finish up a build. + # macro to finish up a docs build. # # Handles the following: - # - Shipping docs S3 logs repository + # - Mapping docs S3 bucket credentials for merge job docs upload # - Cleanup workspace publishers: - postbuildscript: @@ -780,6 +780,33 @@ fail-build: false - publisher: + name: fdio-infra-publish-docs-7day + # macro to finish up a verify docs build. + # + # Handles the following: + # - Mapping 7-day retention S3 bucket credentials for verify job docs upload + # - Cleanup workspace + publishers: + - postbuildscript: + builders: + - role: BOTH + build-on: + - ABORTED + - FAILURE + - NOT_BUILT + - SUCCESS + - UNSTABLE + build-steps: + - fdio-infra-ship-docs-7day + mark-unstable-if-failed: true + - workspace-cleanup: + exclude: + # Do not clean up *.jenkins-trigger files for jobs that use a + # properties file as input for triggering another build. + - "**/*.jenkins-trigger" + fail-build: false + +- publisher: name: fdio-infra-publish # macro to finish up a build. # @@ -864,6 +891,20 @@ - ../global-jjb/shell/logs-clear-credentials.sh - builder: + name: fdio-infra-ship-docs-7day + builders: + - config-file-provider: + files: + - file-id: "jenkins-s3-vpp-docs-ship" + target: $HOME/.aws/credentials + - shell: !include-raw: + - scripts/terraform_s3_docs_ship.sh + - shell: !include-raw: + - scripts/publish_docs.sh + - shell: !include-raw: + - ../global-jjb/shell/logs-clear-credentials.sh + +- builder: name: fdio-infra-ship-logs builders: - config-file-provider: diff --git a/jjb/hicn/hicn-docs.yaml b/jjb/hicn/hicn-docs.yaml index 89fb9fcc7..c865faa34 100644 --- a/jjb/hicn/hicn-docs.yaml +++ b/jjb/hicn/hicn-docs.yaml @@ -11,6 +11,11 @@ stream: - "master": branch: "master" + repo: "hicn" + branch-refspec: "" + - "2210": + branch: "stable/2210" + repo: "2210" branch-refspec: "" type: - short @@ -41,7 +46,7 @@ - os-parameter: os: "{os}" - stream-parameter: - stream: "{stream}" + stream: "{repo}" scm: - gerrit-trigger-scm: @@ -63,6 +68,7 @@ - shell: !include-raw-escape: ../scripts/hicn/docs.sh publishers: + - fdio-infra-publish-docs-7day - fdio-infra-publish - job-template: @@ -90,7 +96,7 @@ - os-parameter: os: "{os}" - stream-parameter: - stream: "{stream}" + stream: "{repo}" scm: - gerrit-trigger-scm: diff --git a/jjb/hicn/hicn.yaml b/jjb/hicn/hicn.yaml index ab41a8a34..843d85295 100644 --- a/jjb/hicn/hicn.yaml +++ b/jjb/hicn/hicn.yaml @@ -22,8 +22,12 @@ os: ubuntu2004 executor-arch: "x86_64" stream: - - hicn: + - "master": branch: "master" + repo: "hicn" + - "2210": + branch: "stable/2210" + repo: "2210" - project: name: hicn-aarch64 @@ -34,8 +38,12 @@ os: ubuntu2004 executor-arch: "aarch64" stream: - - hicn: + - "master": branch: "master" + repo: "hicn" + - "2210": + branch: "stable/2210" + repo: "2210" - project: name: hicn-misc @@ -43,8 +51,12 @@ - "hicn-checkstyle-verify-{stream}-{os}-{executor-arch}" project: "hicn" stream: - - hicn: + - "master": branch: "master" + repo: "hicn" + - "2210": + branch: "stable/2210" + repo: "2210" os: ubuntu2004 executor-arch: "x86_64" @@ -57,8 +69,12 @@ os: ubuntu2004 executor-arch: "x86_64" stream: - - hicn: + - "master": branch: "master" + repo: "hicn" + - "2210": + branch: "stable/2210" + repo: "2210" - project: name: hicn-extras-aarch64 @@ -69,8 +85,12 @@ os: ubuntu2004 executor-arch: "aarch64" stream: - - hicn: + - "master": branch: "master" + repo: "hicn" + - "2210": + branch: "stable/2210" + repo: "2210" - project: name: hicn-vpp-latest-x86_64 @@ -80,8 +100,9 @@ os: ubuntu2004 executor-arch: "x86_64" stream: - - master: + - "master": branch: "master" + repo: "hicn" - project: name: hicn-vpp-latest-aarch64 @@ -91,8 +112,9 @@ os: ubuntu2004 executor-arch: "aarch64" stream: - - master: + - "master": branch: "master" + repo: "hicn" - project: name: hicn-view @@ -103,18 +125,22 @@ - project: name: hicn-sonar jobs: - - hicn-sonar-scanner + - "hicn-sonar-scanner-{stream}" project: hicn sonarcloud: true sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-api-token: "{sonarcloud_api_token}" sonarcloud-project-key: "{sonarcloud_project_organization}-{project}" stream: - - hicn: + - "master": branch: "master" + repo: "hicn" + - "2210": + branch: "stable/2210" + repo: "2210" - job-template: - name: hicn-sonar-scanner + name: "hicn-sonar-scanner-{stream}" project-type: freestyle node: centos7-docker-4c-4g @@ -126,7 +152,7 @@ - gerrit-parameter: branch: "{branch}" - stream-parameter: - stream: "{stream}" + stream: "{repo}" scm: - gerrit-trigger-scm: @@ -255,7 +281,7 @@ - os-parameter: os: "{os}" - stream-parameter: - stream: "{stream}" + stream: "{repo}" scm: - gerrit-trigger-scm: @@ -306,10 +332,10 @@ - archive-artifacts: artifacts: "packages/*.deb, packages/*.rpm" - xunit: - thresholdmode: 'percent' + thresholdmode: "percent" thresholds: - failed: - failure: 0 + failure: 0 types: - gtest: pattern: "**/reports/*report.xml" @@ -333,7 +359,7 @@ - os-parameter: os: "{os}" - stream-parameter: - stream: "{stream}" + stream: "{repo}" scm: - gerrit-trigger-scm: @@ -420,10 +446,10 @@ publishers: - fdio-infra-publish - xunit: - thresholdmode: 'percent' + thresholdmode: "percent" thresholds: - failed: - failure: 0 + failure: 0 types: - gtest: pattern: "**/reports/*report.xml" @@ -447,7 +473,7 @@ - os-parameter: os: "{os}" - stream-parameter: - stream: "{stream}" + stream: "{repo}" scm: - gerrit-trigger-scm: @@ -499,7 +525,7 @@ - os-parameter: os: "{os}" - stream-parameter: - stream: "hicn" + stream: "{repo}" scm: - gerrit-trigger-scm: @@ -562,7 +588,7 @@ - os-parameter: os: "{os}" - stream-parameter: - stream: "{stream}" + stream: "{repo}" scm: - gerrit-trigger-scm: @@ -575,12 +601,11 @@ build-timeout: 120 triggers: - - - timed: 'H H * * *' + - timed: "H H * * *" - gerrit-trigger-manually-triggered: - comment-trigger-value: 'verify-vpp-latest' - name: '{project}' - branch: '{branch}' + comment-trigger-value: "verify-vpp-latest" + name: "{project}" + branch: "{branch}" builders: - shell: !include-raw-escape: diff --git a/jjb/scripts/hicn/docs.sh b/jjb/scripts/hicn/docs.sh index 46e835082..e927f0bbc 100644 --- a/jjb/scripts/hicn/docs.sh +++ b/jjb/scripts/hicn/docs.sh @@ -9,8 +9,6 @@ echo "---> jjb/scripts/hicn/docs.sh" bash scripts/build-packages.sh sphinx -if [[ "${JOB_NAME}" == *merge* ]]; then - mkdir -p "${SITE_DIR_ROOT}" - mv -f "${DOC_DIR}" "${SITE_DIR}" - find "${SITE_DIR}" -type f '(' -name '*.md5' -o -name '*.dot' -o -name '*.map' ')' -delete -fi +mkdir -p "${SITE_DIR_ROOT}" +mv -f "${DOC_DIR}" "${SITE_DIR}" +find "${SITE_DIR}" -type f '(' -name '*.md5' -o -name '*.dot' -o -name '*.map' ')' -delete diff --git a/jjb/scripts/publish_docs.sh b/jjb/scripts/publish_docs.sh index 891e57a7b..1cf01a4bb 100755 --- a/jjb/scripts/publish_docs.sh +++ b/jjb/scripts/publish_docs.sh @@ -17,12 +17,8 @@ echo "---> publish_docs.sh" set -exuo pipefail -if [[ "${SILO}" != "production" ]] ; then - echo "WARNING: Doc upload not supported on Jenkins '${SILO}'..." - exit 0 -fi - CDN_URL="s3-docs.fd.io" +bucket="fdio-docs-s3-cloudfront-index" if [[ ${JOB_NAME} == *merge* ]]; then case "${JOB_NAME}" in @@ -51,17 +47,37 @@ if [[ ${JOB_NAME} == *merge* ]]; then *) die "Unknown job: ${JOB_NAME}" esac +elif [[ ${JOB_NAME} == *verify* ]]; then + bucket="vpp-docs-7day-retention" + # Use the same bucket path as logs so that the docs can be viewed by + # s/s3-logs/s3-docs-7day/ in the URL after selecting the logs URL from + # the jenkins job page. + bucket_path="$JENKINS_HOSTNAME/$JOB_NAME/$BUILD_NUMBER/" + case "${JOB_NAME}" in + *"hicn-docs"*) + workspace_dir="${WORKSPACE}/build/doc/deploy-site" + ;; + *"vpp-docs"*) + CDN_URL="s3-docs-7day.fd.io" + workspace_dir="${WORKSPACE}/build-root/docs/html" + ;; + *) + die "Unknown job: ${JOB_NAME}" + esac +else + die "Unknown job: ${JOB_NAME}" +fi - export TF_VAR_workspace_dir=$workspace_dir - export TF_VAR_bucket_path=$bucket_path - export AWS_SHARED_CREDENTIALS_FILE=$HOME/.aws/credentials - export AWS_DEFAULT_REGION="us-east-1" +export TF_VAR_workspace_dir="$workspace_dir" +export TF_VAR_bucket_path="$bucket_path" +export TF_VAR_bucket="$bucket" +export AWS_SHARED_CREDENTIALS_FILE=$HOME/.aws/credentials +export AWS_DEFAULT_REGION="us-east-1" - echo "INFO: archiving docs to S3" - pushd .. - terraform init -no-color - terraform apply -no-color -auto-approve - popd +echo "INFO: archiving docs to S3 bucket '$bucket'" +pushd .. +terraform init -no-color +terraform apply -no-color -auto-approve +popd - echo "S3 docs: <a href=\"https://${CDN_URL}${bucket_path}\">https://${CDN_URL}${bucket_path}</a>" -fi +echo "S3 docs: <a href=\"https://${CDN_URL}${bucket_path}\">https://${CDN_URL}${bucket_path}</a>" diff --git a/jjb/scripts/terraform_s3_docs_ship.sh b/jjb/scripts/terraform_s3_docs_ship.sh index 5989e3e9a..de177d35c 100644 --- a/jjb/scripts/terraform_s3_docs_ship.sh +++ b/jjb/scripts/terraform_s3_docs_ship.sh @@ -21,7 +21,7 @@ cat >"/w/workspace/main.tf" <<'END_OF_TERRAFORM_SCRIPT' provider "aws" { region = "us-east-1" profile = "default" - s3_force_path_style = false + s3_use_path_style = false skip_credentials_validation = true skip_metadata_api_check = true skip_requesting_account_id = true @@ -65,7 +65,6 @@ variable "file_match_pattern" { variable "bucket" { description = "S3 bucket name" type = string - default = "fdio-docs-s3-cloudfront-index" } variable "bucket_path" { diff --git a/jjb/vpp/docs.yaml b/jjb/vpp/docs.yaml index 25a2dde72..d9eb205b6 100644 --- a/jjb/vpp/docs.yaml +++ b/jjb/vpp/docs.yaml @@ -20,7 +20,13 @@ - '2210': branch: 'stable/2210' branch-refspec: '' + - '2302': + branch: 'stable/2302' + branch-refspec: '' exclude: + # os deprecated in 23.02 + - stream: '2302' + os: 'ubuntu2004' # os deprecated in 22.10 - stream: '2210' os: 'ubuntu2004' @@ -85,6 +91,7 @@ - ../scripts/vpp/docs.sh publishers: + - fdio-infra-publish-docs-7day - fdio-infra-publish - job-template: diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index 9497d5d75..6b14e7eea 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -46,8 +46,14 @@ - '2210': branch: 'stable/2210' branch-refspec: '' + - '2302': + branch: 'stable/2302' + branch-refspec: '' executor-arch: 'x86_64' exclude: + # os deprecated in 23.02 + - stream: '2302' + os: 'ubuntu2004' # os deprecated in 22.10 - stream: '2210' os: 'ubuntu2004' @@ -91,6 +97,11 @@ branch-refspec: '' make-test-os: 'ubuntu-20.04' make-test-multiworker-os: 'debian-11' + - '2302': + branch: 'stable/2302' + branch-refspec: '' + make-test-os: 'ubuntu-22.04' + make-test-multiworker-os: 'debian-11' os: - debian11 - ubuntu2004 @@ -170,7 +181,13 @@ - '2210': branch: 'stable/2210' branch-refspec: '' + - '2302': + branch: 'stable/2302' + branch-refspec: '' exclude: + # os deprecated in 23.02 + - stream: '2302' + os: 'ubuntu2004' # os deprecated in 22.10 - stream: '2210' os: 'ubuntu2004' @@ -214,6 +231,11 @@ branch-refspec: '' make-test-os: 'ubuntu-20.04' make-test-multiworker-os: '' + - '2302': + branch: 'stable/2302' + branch-refspec: '' + make-test-os: 'ubuntu-22.04' + make-test-multiworker-os: '' os: - ubuntu2004 - ubuntu2204 @@ -239,6 +261,9 @@ - '2210': branch: 'stable/2210' branch-refspec: '' + - '2302': + branch: 'stable/2302' + branch-refspec: '' testbed-arch: - 1n-skx: os: 'ubuntu2204' @@ -246,7 +271,7 @@ - 1n-tx2: os: 'ubuntu2204' executor-arch: 'aarch64' - skip-vote: 'true' + skip-vote: 'false' # [end] VPP-CSIT-VERIFY-DEVICE PROJECT # VPP-CSIT-VERIFY-PERF PROJECT @@ -273,12 +298,6 @@ - 3n-icx: os: 'ubuntu2204' executor-arch: 'x86_64' - - 2n-dnv: - os: 'ubuntu2204' - executor-arch: 'x86_64' - - 3n-dnv: - os: 'ubuntu2204' - executor-arch: 'x86_64' - 3n-tsh: os: 'ubuntu2204' executor-arch: 'aarch64' @@ -317,10 +336,16 @@ - '2210': branch: 'stable/2210' branch-refspec: '' + - '2302': + branch: 'stable/2302' + branch-refspec: '' os: - 'ubuntu2004' - 'ubuntu2204' exclude: + # os deprecated in 23.02 + - stream: '2302' + os: 'ubuntu2004' # os deprecated in 22.10 - stream: '2210' os: 'ubuntu2004' |