diff options
Diffstat (limited to 'jjb/hicn')
-rw-r--r-- | jjb/hicn/hicn-docs.yaml | 59 | ||||
-rw-r--r-- | jjb/hicn/hicn.yaml | 147 | ||||
-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, 18 insertions, 311 deletions
diff --git a/jjb/hicn/hicn-docs.yaml b/jjb/hicn/hicn-docs.yaml index c428a222..4423af86 100644 --- a/jjb/hicn/hicn-docs.yaml +++ b/jjb/hicn/hicn-docs.yaml @@ -6,18 +6,12 @@ - "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" branch-refspec: "" - repo-stream-part: "master" - repository-name: "hicn" type: - short - long @@ -28,9 +22,6 @@ 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 @@ -49,14 +40,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. scm: - gerrit-trigger-scm: @@ -74,25 +59,11 @@ 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 - - naginator: - rerun-unstable-builds: false - max-failed-builds: 1 - fixed-delay: 90 - job-template: name: "hicn-docs-merge-{stream}-{os}-{executor-arch}" @@ -100,9 +71,6 @@ 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 @@ -121,14 +89,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. scm: - gerrit-trigger-scm: @@ -162,22 +124,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 901a9edd..6ecc1f38 100644 --- a/jjb/hicn/hicn.yaml +++ b/jjb/hicn/hicn.yaml @@ -17,81 +17,50 @@ jobs: - "hicn-verify-{stream}-{os}-{executor-arch}" - "hicn-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-stream-part: "master" - repository-name: "hicn" - "2101": branch: "stable/2101" - repo-stream-part: "stable.2101" - repository-name: "hicn" - project: name: hicn-aarch64 jobs: - "hicn-verify-{stream}-{os}-{executor-arch}" - "hicn-merge-{stream}-{os}-{executor-arch}" - project: "hicn" - - os: - - ubuntu2004: - repo-os-part: "ubuntu-arm.focal.main" - + os: ubuntu2004 executor-arch: "aarch64" - stream: - master: branch: "master" - repo-stream-part: "master" - repository-name: "hicn" - "2101": branch: "stable/2101" - repo-stream-part: "stable.2101" - repository-name: "hicn" - project: name: hicn-beta-x86_64 jobs: - "hicn-verify-{stream}-{os}-{executor-arch}" - project: "hicn" - os: - - ubuntu2004: - repo-os-part: "ubuntu.focal.main" - + os: ubuntu2004 executor-arch: "x86_64" - stream: - lightng: branch: "hicn-light-ng" - repo-stream-part: "hicn-light-ng" - project: name: hicn-beta-aarch64 jobs: - "hicn-verify-{stream}-{os}-{executor-arch}" - project: "hicn" - os: - - ubuntu2004: - repo-os-part: "ubuntu-arm.focal.main" - + os: ubuntu2004 executor-arch: "aarch64" - stream: - lightng: branch: "hicn-light-ng" - repo-stream-part: "hicn-light-ng" - project: name: hicn-misc @@ -101,17 +70,11 @@ stream: - master: branch: "master" - repo-stream-part: "master" - "2101": branch: "stable/2101" - repo-stream-part: "stable.2101" - repository-name: "hicn" - lightng: branch: "hicn-light-ng" - repo-stream-part: "hicn-light-ng" - os: - - ubuntu2004: - repo-os-part: "ubuntu.focal.main" + os: ubuntu2004 executor-arch: "x86_64" - project: @@ -120,34 +83,23 @@ - "hicn-extras-verify-{stream}-{os}-{executor-arch}" - "hicn-extras-build-{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-stream-part: "master" - project: name: hicn-extras-aarch64 jobs: - "hicn-extras-verify-{stream}-{os}-{executor-arch}" - "hicn-extras-build-{stream}-{os}-{executor-arch}" - project: "hicn" - os: - - ubuntu2004: - repo-os-part: "ubuntu-arm.focal.main" - + os: ubuntu2004 executor-arch: "aarch64" - stream: - master: branch: "master" - repo-stream-part: "master" - project: name: hicn-view @@ -161,7 +113,6 @@ project-type: freestyle node: "builder-{os}-prod-{executor-arch}" concurrent: true - archive-artifacts: "**/tmp/hicn-failed-unittests/*/* **/core" properties: - lf-infra-properties: @@ -174,10 +125,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: @@ -234,7 +181,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 @@ -261,12 +208,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}' scm: - gerrit-trigger-scm: @@ -287,14 +230,10 @@ - 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 - job-template: name: "hicn-merge-{stream}-{os}-{executor-arch}" @@ -313,16 +252,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: @@ -348,34 +279,17 @@ 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 @@ -409,12 +323,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}' scm: - gerrit-trigger-scm: @@ -443,14 +353,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}" @@ -469,16 +375,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}' scm: - gerrit-trigger-scm: @@ -512,32 +410,15 @@ 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 - - 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-info diff --git a/jjb/hicn/include-raw-hicn-build.sh b/jjb/hicn/include-raw-hicn-build.sh deleted file mode 100644 index e1d20a48..00000000 --- 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 636590e7..00000000 --- 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 f90c8fe8..00000000 --- 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 bcf913be..00000000 --- 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 6e3c9a86..00000000 --- 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 |