diff options
Diffstat (limited to 'jjb/hicn')
-rw-r--r-- | jjb/hicn/hicn-docs.yaml | 89 | ||||
-rw-r--r-- | jjb/hicn/hicn.yaml | 539 | ||||
-rw-r--r-- | jjb/hicn/include-raw-hicn-build.sh | 7 | ||||
-rw-r--r-- | jjb/hicn/include-raw-hicn-checkstyle.sh | 7 | ||||
-rw-r--r-- | jjb/hicn/include-raw-hicn-docs.sh | 54 | ||||
-rw-r--r-- | jjb/hicn/include-raw-hicn-extras-build.sh | 7 | ||||
-rw-r--r-- | jjb/hicn/include-raw-hicn-maven-push.sh | 48 |
7 files changed, 297 insertions, 454 deletions
diff --git a/jjb/hicn/hicn-docs.yaml b/jjb/hicn/hicn-docs.yaml index 5d748edc0..c865faa34 100644 --- a/jjb/hicn/hicn-docs.yaml +++ b/jjb/hicn/hicn-docs.yaml @@ -6,18 +6,17 @@ - "hicn-docs-merge-{stream}-{os}-{executor-arch}" project: "hicn" - os: - - ubuntu2004: - repo-os-part: "ubuntu.focal.main" - + os: ubuntu2004 executor-arch: "x86_64" - stream: - "master": branch: "master" + repo: "hicn" + branch-refspec: "" + - "2210": + branch: "stable/2210" + repo: "2210" branch-refspec: "" - repo-stream-part: "master" - repository-name: "hicn" type: - short - long @@ -28,19 +27,14 @@ project-type: freestyle node: "builder-{os}-prod-{executor-arch}" concurrent: true - archive-artifacts: - - "**/build-doxygen/lib/doc/html/*" - - "**/docs/build/html" allow-empty: "true" fingerprint: false only-if-success: true default-excludes: false - build-discarder: - daysToKeep: "{build-days-to-keep}" - numToKeep: "{build-num-to-keep}" - artifactDaysToKeep: "{build-artifact-days-to-keep}" - artifactNumToKeep: "{build-artifact-num-to-keep}" + properties: + - lf-infra-properties: + build-days-to-keep: "{build-days-to-keep}" parameters: - project-parameter: @@ -51,14 +45,8 @@ refspec: "{branch-refspec}" - os-parameter: os: "{os}" - - maven-exec: - maven-version: "mvn33-new" - stream-parameter: - stream: "{stream}" - - string: - name: ARCHIVE_ARTIFACTS - default: "{archive-artifacts}" - description: Artifacts to archive to the logs server. + stream: "{repo}" scm: - gerrit-trigger-scm: @@ -71,30 +59,17 @@ build-timeout: "{build-timeout}" triggers: - - gerrit-trigger-checkstyle: + - gerrit-trigger-checkstyle-nonvoting: name: "{project}" branch: "{branch}" builders: - - maven-target: - maven-version: "mvn33-new" - goals: "--version" - settings: "hicn-settings" - settings-type: cfp - global-settings: "global-settings" - global-settings-type: cfp - - provide-maven-settings: - settings-file: "hicn-settings" - global-settings-file: "global-settings" - shell: !include-raw-escape: ../scripts/setup_executor_env.sh - - shell: !include-raw-escape: include-raw-hicn-docs.sh + - shell: !include-raw-escape: ../scripts/hicn/docs.sh publishers: + - fdio-infra-publish-docs-7day - fdio-infra-publish - - naginator: - rerun-unstable-builds: false - max-failed-builds: 1 - fixed-delay: 90 - job-template: name: "hicn-docs-merge-{stream}-{os}-{executor-arch}" @@ -102,19 +77,14 @@ project-type: freestyle node: "builder-{os}-prod-{executor-arch}" concurrent: false - archive-artifacts: - - "**/build-doxygen/lib/doc/html/*" - - "**/docs/build/html" allow-empty: "true" fingerprint: false only-if-success: true default-excludes: false - build-discarder: - daysToKeep: "{build-days-to-keep}" - numToKeep: "{build-num-to-keep}" - artifactDaysToKeep: "{build-artifact-days-to-keep}" - artifactNumToKeep: "{build-artifact-num-to-keep}" + properties: + - lf-infra-properties: + build-days-to-keep: "{build-days-to-keep}" parameters: - project-parameter: @@ -125,14 +95,8 @@ refspec: "{branch-refspec}" - os-parameter: os: "{os}" - - maven-exec: - maven-version: "mvn33-new" - stream-parameter: - stream: "{stream}" - - string: - name: ARCHIVE_ARTIFACTS - default: "{archive-artifacts}" - description: Artifacts to archive to the logs server. + stream: "{repo}" scm: - gerrit-trigger-scm: @@ -146,7 +110,7 @@ triggers: - reverse: - jobs: "hicn-merge-{stream}-ubuntu1804" + jobs: "hicn-merge-{stream}-{os}-{executor-arch}" result: "success" - gerrit: server-name: "Primary" @@ -166,22 +130,9 @@ notbuilt: true builders: - - maven-target: - maven-version: "mvn33-new" - goals: "--version" - settings: "hicn-settings" - settings-type: cfp - global-settings: "global-settings" - global-settings-type: cfp - - provide-maven-settings: - settings-file: "hicn-settings" - global-settings-file: "global-settings" - shell: !include-raw-escape: ../scripts/setup_executor_env.sh - - shell: !include-raw-escape: include-raw-hicn-docs.sh + - shell: !include-raw-escape: ../scripts/hicn/docs.sh publishers: + - fdio-infra-publish-docs - fdio-infra-publish - - naginator: - rerun-unstable-builds: false - max-failed-builds: 1 - fixed-delay: 90 diff --git a/jjb/hicn/hicn.yaml b/jjb/hicn/hicn.yaml index 93d3b9de6..843d85295 100644 --- a/jjb/hicn/hicn.yaml +++ b/jjb/hicn/hicn.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2020 Cisco and/or its affiliates. +# 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: @@ -13,193 +13,108 @@ --- - project: - name: hicn-os-eol-x86_64 - jobs: - - "hicn-verify-{stream}-{os}-{executor-arch}" - - "hicn-merge-{stream}-{os}-{executor-arch}" - - project: "hicn" - os: - - centos7: - repo-os-part: "centos7" - - executor-arch: "x86_64" - - stream: - - "2009": - branch: "stable/2009" - repo-stream-part: "stable.2009" - repository-name: "hicn" - - "2005": - branch: "stable/2005" - repo-stream-part: "stable.2005" - repository-name: "hicn" - -- 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: - - ubuntu1804: - repo-os-part: "ubuntu.bionic.main" - - ubuntu2004: - repo-os-part: "ubuntu.focal.main" - + os: ubuntu2004 executor-arch: "x86_64" - stream: - "master": branch: "master" - repo-stream-part: "master" - repository-name: "hicn" - - "2009": - branch: "stable/2009" - repo-stream-part: "stable.2009" - repository-name: "hicn" - - "2005": - branch: "stable/2005" - repo-stream-part: "stable.2005" - repository-name: "hicn" + repo: "hicn" + - "2210": + branch: "stable/2210" + repo: "2210" - project: - name: hicn-os-in-master-x86_64 + 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: - - centos8: - repo-os-part: "centos8" - - executor-arch: "x86_64" - + os: ubuntu2004 + executor-arch: "aarch64" stream: - "master": branch: "master" - repo-stream-part: "master" - repository-name: "hicn" + repo: "hicn" + - "2210": + branch: "stable/2210" + repo: "2210" - project: - name: hicn-aarch64 + name: hicn-misc jobs: - - "hicn-verify-{stream}-{os}-{executor-arch}" - - "hicn-merge-{stream}-{os}-{executor-arch}" - + - "hicn-checkstyle-verify-{stream}-{os}-{executor-arch}" project: "hicn" - - os: - - ubuntu1804: - repo-os-part: "ubuntu-arm.bionic.main" - - executor-arch: "aarch64" - stream: - - master: + - "master": branch: "master" - repo-stream-part: "master" - repository-name: "hicn" - - "2005": - branch: "stable/2005" - repo-stream-part: "stable.2005" - repository-name: "hicn" + repo: "hicn" + - "2210": + branch: "stable/2210" + repo: "2210" + os: ubuntu2004 + executor-arch: "x86_64" - project: - name: hicn-beta-x86_64 + name: hicn-extras-x86_64 jobs: - - "hicn-verify-{stream}-{os}-{executor-arch}" - + - "hicn-extras-verify-{stream}-{os}-{executor-arch}" + - "hicn-extras-build-{stream}-{os}-{executor-arch}" project: "hicn" - os: - - ubuntu1804: - repo-os-part: "ubuntu.bionic.main" - - ubuntu2004: - repo-os-part: "ubuntu.focal.main" - - centos8: - repo-os-part: "centos8" - + os: ubuntu2004 executor-arch: "x86_64" - stream: - - lightng: - branch: "hicn-light-ng" - repo-stream-part: "hicn-light-ng" + - "master": + branch: "master" + repo: "hicn" + - "2210": + branch: "stable/2210" + repo: "2210" - project: - name: hicn-beta-aarch64 + name: hicn-extras-aarch64 jobs: - - "hicn-verify-{stream}-{os}-{executor-arch}" - + - "hicn-extras-verify-{stream}-{os}-{executor-arch}" + - "hicn-extras-build-{stream}-{os}-{executor-arch}" project: "hicn" - os: - - ubuntu1804: - repo-os-part: "ubuntu-arm.bionic.main" - + os: ubuntu2004 executor-arch: "aarch64" - - stream: - - lightng: - branch: "hicn-light-ng" - repo-stream-part: "hicn-light-ng" - -- project: - name: hicn-misc - jobs: - - "hicn-checkstyle-verify-{stream}-{os}-{executor-arch}" - project: "hicn" stream: - - master: + - "master": branch: "master" - repo-stream-part: "master" - - lightng: - branch: "hicn-light-ng" - repo-stream-part: "hicn-light-ng" - os: - - ubuntu2004: - repo-os-part: "ubuntu.focal.main" - executor-arch: "x86_64" + repo: "hicn" + - "2210": + branch: "stable/2210" + repo: "2210" - project: - name: hicn-extras-x86_64 + name: hicn-vpp-latest-x86_64 jobs: - - "hicn-extras-verify-{stream}-{os}-{executor-arch}" - - "hicn-extras-build-{stream}-{os}-{executor-arch}" + - "hicn-vpp-latest-verify-{stream}-{os}-{executor-arch}" project: "hicn" - os: - - ubuntu1804: - repo-os-part: "ubuntu.bionic.main" - - ubuntu2004: - repo-os-part: "ubuntu.focal.main" - - centos8: - repo-os-part: "centos8" - + os: ubuntu2004 executor-arch: "x86_64" - stream: - - master: + - "master": branch: "master" - repo-stream-part: "master" + repo: "hicn" - project: - name: hicn-extras-aarch64 + name: hicn-vpp-latest-aarch64 jobs: - - "hicn-extras-verify-{stream}-{os}-{executor-arch}" - - "hicn-extras-build-{stream}-{os}-{executor-arch}" - + - "hicn-vpp-latest-verify-{stream}-{os}-{executor-arch}" project: "hicn" - os: - - ubuntu1804: - repo-os-part: "ubuntu-arm.bionic.main" - + os: ubuntu2004 executor-arch: "aarch64" - stream: - - master: + - "master": branch: "master" - repo-stream-part: "master" + repo: "hicn" - project: name: hicn-view @@ -207,19 +122,73 @@ - project-view project-name: hicn +- project: + name: hicn-sonar + jobs: + - "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: + - "master": + branch: "master" + repo: "hicn" + - "2210": + branch: "stable/2210" + repo: "2210" + +- job-template: + name: "hicn-sonar-scanner-{stream}" + + project-type: freestyle + node: centos7-docker-4c-4g + concurrent: true + + parameters: + - project-parameter: + project: "{project}" + - gerrit-parameter: + branch: "{branch}" + - stream-parameter: + stream: "{repo}" + + scm: + - gerrit-trigger-scm: + credentials-id: "jenkins-gerrit-credentials" + refspec: "" + choosing-strategy: "default" + + wrappers: + - fdio-infra-wrappers: + build-timeout: "{build-timeout}" + + triggers: + - gerrit-trigger-patch-merged: + name: "{project}" + branch: "{branch}" + + builders: + - inject: + properties-content: | + SONAR_HOST_URL=https://sonarcloud.io + PROJECT_KEY={sonarcloud-project-key} + PROJECT_ORGANIZATION={sonarcloud-project-organization} + API_TOKEN={sonarcloud-api-token} + - shell: !include-raw-escape: + - ../scripts/hicn/sonar.sh + - job-template: name: "hicn-checkstyle-verify-{stream}-{os}-{executor-arch}" project-type: freestyle node: "builder-{os}-prod-{executor-arch}" concurrent: true - archive-artifacts: "**/tmp/hicn-failed-unittests/*/* **/core" - build-discarder: - daysToKeep: "{build-days-to-keep}" - numToKeep: "{build-num-to-keep}" - artifactDaysToKeep: "{build-artifact-days-to-keep}" - artifactNumToKeep: "{build-artifact-num-to-keep}" + properties: + - lf-infra-properties: + build-days-to-keep: "{build-days-to-keep}" parameters: - project-parameter: @@ -228,10 +197,6 @@ branch: "{branch}" - os-parameter: os: "{os}" - - repo-name-parameter: - repo-name: "{repo-stream-part}.ubuntu.bionic.main" - - archive-artifacts-parameter: - artifacts: '{archive-artifacts}' scm: - gerrit-trigger-scm: @@ -288,7 +253,7 @@ - shell: !include-raw-escape: - ../scripts/setup_executor_env.sh - shell: !include-raw-escape: - - include-raw-hicn-checkstyle.sh + - ../scripts/hicn/checkstyle.sh publishers: - fdio-infra-publish @@ -298,17 +263,15 @@ 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}" concurrent: true - build-discarder: - daysToKeep: "{build-days-to-keep}" - numToKeep: 100 - artifactDaysToKeep: "{build-artifact-days-to-keep}" - artifactNumToKeep: "{build-artifact-num-to-keep}" + properties: + - lf-infra-properties: + build-days-to-keep: "{build-days-to-keep}" parameters: - project-parameter: @@ -317,12 +280,8 @@ branch: "{branch}" - os-parameter: os: "{os}" - - repo-name-parameter: - repo-name: "{repo-stream-part}.{repo-os-part}" - stream-parameter: - stream: "{stream}" - - archive-artifacts-parameter: - artifacts: '{archive-artifacts}' + stream: "{repo}" scm: - gerrit-trigger-scm: @@ -335,22 +294,101 @@ 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}" + # 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: true + unstable: true + notbuilt: true + override-votes: true + gerrit-build-successful-verified-value: 1 + gerrit-build-failed-verified-value: 1 + gerrit-build-unstable-verified-value: 1 + gerrit-build-notbuilt-verified-value: 1 builders: - shell: !include-raw-escape: - ../scripts/setup_executor_env.sh - shell: !include-raw-escape: - - include-raw-hicn-build.sh + - ../scripts/hicn/build.sh publishers: - fdio-infra-publish - - naginator: - rerun-unstable-builds: false - max-failed-builds: 2 - fixed-delay: 90 + - archive-artifacts: + artifacts: "packages/*.deb, packages/*.rpm" + - xunit: + thresholdmode: "percent" + thresholds: + - failed: + failure: 0 + types: + - gtest: + pattern: "**/reports/*report.xml" + +- job-template: + name: "hicn-verify-functest-{stream}-{os}-{executor-arch}" + + project-type: freestyle + node: "ubuntu2004-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: "{repo}" + + 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: + output-path: "tests" + pass-threshold: 75.0 + only-critical: false + - fdio-infra-publish - job-template: name: "hicn-merge-{stream}-{os}-{executor-arch}" @@ -358,11 +396,9 @@ project-type: freestyle node: "builder-{os}-prod-{executor-arch}" - build-discarder: - daysToKeep: "{build-days-to-keep}" - numToKeep: 100 - artifactDaysToKeep: "{build-artifact-days-to-keep}" - artifactNumToKeep: "{build-artifact-num-to-keep}" + properties: + - lf-infra-properties: + build-days-to-keep: "{build-days-to-keep}" parameters: - project-parameter: @@ -371,16 +407,8 @@ branch: "{branch}" - os-parameter: os: "{os}" - - maven-project-parameter: - maven: "mvn33-new" - - maven-exec: - maven-version: "mvn33-new" - stream-parameter: - stream: "{repository-name}" - - repo-name-parameter: - repo-name: "{repo-stream-part}.{repo-os-part}" - - archive-artifacts-parameter: - artifacts: '{archive-artifacts}' + stream: "{stream}" scm: - gerrit-trigger-scm: @@ -406,48 +434,25 @@ files: - file-id: "packagecloud_api" target: "/root/packagecloud_api" - - maven-target: - maven-version: "mvn33-new" - goals: "--version" - settings: "hicn-settings" - settings-type: cfp - global-settings: "global-settings" - global-settings-type: cfp - shell: !include-raw-escape: - ../scripts/setup_executor_env.sh - shell: !include-raw-escape: - - include-raw-hicn-checkstyle.sh + - ../scripts/hicn/checkstyle.sh - shell: !include-raw-escape: - - include-raw-hicn-build.sh - - provide-maven-settings: - settings-file: "hicn-settings" - global-settings-file: "global-settings" + - ../scripts/hicn/build.sh - shell: !include-raw-escape: - ../scripts/packagecloud_push.sh - - shell: !include-raw-escape: - - ../scripts/maven_push_functions.sh - - include-raw-hicn-maven-push.sh publishers: - fdio-infra-publish - - naginator: - rerun-unstable-builds: false - max-failed-builds: 1 - fixed-delay: 90 - -- project: - name: hicn-sonar - project: hicn - project-name: hicn - mvn-settings: hicn-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 + - xunit: + thresholdmode: "percent" + thresholds: + - failed: + failure: 0 + types: + - gtest: + pattern: "**/reports/*report.xml" - job-template: name: "hicn-extras-verify-{stream}-{os}-{executor-arch}" @@ -456,11 +461,9 @@ node: "builder-{os}-prod-{executor-arch}" concurrent: true - build-discarder: - daysToKeep: "{build-days-to-keep}" - numToKeep: 100 - artifactDaysToKeep: "{build-artifact-days-to-keep}" - artifactNumToKeep: "{build-artifact-num-to-keep}" + properties: + - lf-infra-properties: + build-days-to-keep: "{build-days-to-keep}" parameters: - project-parameter: @@ -469,12 +472,8 @@ branch: "{branch}" - os-parameter: os: "{os}" - - repo-name-parameter: - repo-name: "{repo-stream-part}.{repo-os-part}" - stream-parameter: - stream: "{stream}" - - archive-artifacts-parameter: - artifacts: '{archive-artifacts}' + stream: "{repo}" scm: - gerrit-trigger-scm: @@ -503,14 +502,10 @@ - shell: !include-raw-escape: - ../scripts/setup_executor_env.sh - shell: !include-raw-escape: - - include-raw-hicn-extras-build.sh + - ../scripts/hicn/build-extras.sh publishers: - fdio-infra-publish - - naginator: - rerun-unstable-builds: false - max-failed-builds: 2 - fixed-delay: 90 - job-template: name: "hicn-extras-build-{stream}-{os}-{executor-arch}" @@ -518,11 +513,9 @@ project-type: freestyle node: "builder-{os}-prod-{executor-arch}" - build-discarder: - daysToKeep: "{build-days-to-keep}" - numToKeep: 100 - artifactDaysToKeep: "{build-artifact-days-to-keep}" - artifactNumToKeep: "{build-artifact-num-to-keep}" + properties: + - lf-infra-properties: + build-days-to-keep: "{build-days-to-keep}" parameters: - project-parameter: @@ -531,16 +524,8 @@ branch: "{branch}" - os-parameter: os: "{os}" - - maven-project-parameter: - maven: "mvn33-new" - - maven-exec: - maven-version: "mvn33-new" - stream-parameter: - stream: "hicn" - - repo-name-parameter: - repo-name: "{repo-stream-part}.{repo-os-part}" - - archive-artifacts-parameter: - artifacts: '{archive-artifacts}' + stream: "{repo}" scm: - gerrit-trigger-scm: @@ -574,32 +559,62 @@ files: - file-id: "packagecloud_api" target: "/root/packagecloud_api" - - maven-target: - maven-version: "mvn33-new" - goals: "--version" - settings: "hicn-settings" - settings-type: cfp - global-settings: "global-settings" - global-settings-type: cfp - shell: !include-raw-escape: - ../scripts/setup_executor_env.sh - shell: !include-raw-escape: - - include-raw-hicn-extras-build.sh - - provide-maven-settings: - settings-file: "hicn-settings" - global-settings-file: "global-settings" + - ../scripts/hicn/build-extras.sh - shell: !include-raw-escape: - ../scripts/packagecloud_push.sh + + publishers: + - fdio-infra-publish + +- job-template: + name: "hicn-vpp-latest-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}" + + parameters: + - project-parameter: + project: "{project}" + - gerrit-parameter: + branch: "{branch}" + - os-parameter: + os: "{os}" + - stream-parameter: + stream: "{repo}" + + scm: + - gerrit-trigger-scm: + credentials-id: "jenkins-gerrit-credentials" + refspec: "$GERRIT_REFSPEC" + choosing-strategy: "gerrit" + + wrappers: + - fdio-infra-wrappers: + build-timeout: 120 + + triggers: + - timed: "H H * * *" + - gerrit-trigger-manually-triggered: + comment-trigger-value: "verify-vpp-latest" + name: "{project}" + branch: "{branch}" + + builders: + - shell: !include-raw-escape: + - ../scripts/setup_executor_env.sh - shell: !include-raw-escape: - - ../scripts/maven_push_functions.sh - - include-raw-hicn-maven-push.sh + - ../scripts/hicn/build-vpp-latest.sh publishers: - fdio-infra-publish - - naginator: - rerun-unstable-builds: false - max-failed-builds: 1 - fixed-delay: 90 - project: name: hicn-info diff --git a/jjb/hicn/include-raw-hicn-build.sh b/jjb/hicn/include-raw-hicn-build.sh deleted file mode 100644 index e1d20a48e..000000000 --- a/jjb/hicn/include-raw-hicn-build.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -# basic build script example -set -euxo pipefail - -pushd scripts -bash ./build-packages.sh -popd diff --git a/jjb/hicn/include-raw-hicn-checkstyle.sh b/jjb/hicn/include-raw-hicn-checkstyle.sh deleted file mode 100644 index 636590e7a..000000000 --- a/jjb/hicn/include-raw-hicn-checkstyle.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -if [ -f ./scripts/checkstyle.sh ];then - bash scripts/checkstyle.sh -else - echo "Cannot find scripts/checkstyle.sh - skipping checkstyle" -fi diff --git a/jjb/hicn/include-raw-hicn-docs.sh b/jjb/hicn/include-raw-hicn-docs.sh deleted file mode 100644 index f90c8fe8d..000000000 --- a/jjb/hicn/include-raw-hicn-docs.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/bash -set -xe -o pipefail - -[ "$DOCS_REPO_URL" ] || DOCS_REPO_URL="https://nexus.fd.io/content/sites/site" -[ "$PROJECT_PATH" ] || PROJECT_PATH="io/fd/hicn" -[ "$DOC_FILE" ] || DOC_FILE="hicn.docs.zip" -[ "$DOC_DIR" ] || DOC_DIR="build-doxygen/lib/doc/html" -[ "$SITE_DIR" ] || SITE_DIR="build/doc/deploy-site/" -[ "$RESOURCES_DIR" ] || RESOURCES_DIR=${SITE_DIR}/src/site/resources -[ "$MVN" ] || MVN="/opt/apache/maven/bin/mvn" -[ "$VERSION" ] || VERSION=$(git describe --abbrev=0 | egrep -o "([0-9]{1,}\.)+[0-9]{1,}") - -echo "Current directory: $(pwd)" - -bash scripts/build-packages.sh sphinx -bash scripts/build-packages.sh doxygen - -if [[ ${JOB_NAME} == *merge* ]]; then - mkdir -p $(dirname ${RESOURCES_DIR}) - mv -f ${DOC_DIR} ${RESOURCES_DIR} - cd ${SITE_DIR} - find . -type f '(' -name '*.md5' -o -name '*.dot' -o -name '*.map' ')' -delete - cat > pom.xml << EOF - <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <groupId>io.fd.hicn</groupId> - <artifactId>docs</artifactId> - <version>1.0.0</version> - <packaging>pom</packaging> - - <properties> - <generateReports>false</generateReports> - </properties> - - <build> - <extensions> - <extension> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-webdav-jackrabbit</artifactId> - <version>2.10</version> - </extension> - </extensions> - </build> - <distributionManagement> - <site> - <id>fdio-site</id> - <url>dav:${DOCS_REPO_URL}/${PROJECT_PATH}/${VERSION}</url> - </site> - </distributionManagement> - </project> -EOF - ${MVN} -B site:site site:deploy -gs "${GLOBAL_SETTINGS_FILE}" -s "${SETTINGS_FILE}" -T 4C - cd - -fi diff --git a/jjb/hicn/include-raw-hicn-extras-build.sh b/jjb/hicn/include-raw-hicn-extras-build.sh deleted file mode 100644 index bcf913be0..000000000 --- a/jjb/hicn/include-raw-hicn-extras-build.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -# basic build script example -set -euxo pipefail - -pushd scripts -bash ./build-extras.sh -popd diff --git a/jjb/hicn/include-raw-hicn-maven-push.sh b/jjb/hicn/include-raw-hicn-maven-push.sh deleted file mode 100644 index 6e3c9a86e..000000000 --- a/jjb/hicn/include-raw-hicn-maven-push.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/bash -set -xe -o pipefail -echo "*******************************************************************" -echo "* STARTING PUSH OF PACKAGES TO REPOS" -echo "* NOTHING THAT HAPPENS BELOW THIS POINT IS RELATED TO BUILD FAILURE" -echo "*******************************************************************" - -[ "$MVN" ] || MVN="/opt/apache/maven/bin/mvn" -GROUP_ID="io.fd.${PROJECT}" -BASEURL="${NEXUSPROXY}/content/repositories/fd.io." -BASEREPOID='fdio-' - -if [ "${OS}" == "ubuntu1604" ]; then - # Find the files - JARS=$(find . -type f -iname '*.jar') - DEBS=$(find . -type f -iname '*.deb') - for i in $JARS - do - push_jar "$i" - done - - for i in $DEBS - do - push_deb "$i" - done -elif [ "${OS}" == "ubuntu1804" ]; then - # Find the files - JARS=$(find . -type f -iname '*.jar') - DEBS=$(find . -type f -iname '*.deb') - for i in $JARS - do - push_jar "$i" - done - - for i in $DEBS - do - push_deb "$i" - done -elif [ "${OS}" == "centos7" ]; then - # Find the files - RPMS=$(find . -type f -iname '*.rpm') - SRPMS=$(find . -type f -iname '*.srpm') - SRCRPMS=$(find . -type f -name '*.src.rpm') - for i in $RPMS $SRPMS $SRCRPMS - do - push_rpm "$i" - done -fi |