diff options
| -rw-r--r-- | jjb/csit/csit.yaml | 15 | ||||
| -rw-r--r-- | jjb/hc2vpp/include-raw-hc2vpp-integration-prebuild.sh | 3 | ||||
| -rw-r--r-- | jjb/scripts/packagecloud_push.sh | 20 | ||||
| -rw-r--r-- | jjb/vpp/include-raw-vpp-packagecloud-push.sh | 15 | ||||
| -rw-r--r-- | jjb/vpp/vpp.yaml | 15 |
5 files changed, 44 insertions, 24 deletions
diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml index 92b4d00a6..042c2ff6a 100644 --- a/jjb/csit/csit.yaml +++ b/jjb/csit/csit.yaml @@ -12,7 +12,7 @@ - 'csit-vpp-verify-{stream_timed}-{os}-weekly' - 'csit-vpp-verify-{stream_timed}-{os}-semiweekly' - 'csit-vpp-verify-perf-master-nightly-all' - - 'csit-docs-merge-{stream}' + - 'csit-docs-merge-{stream_timed}' - 'csit-docs-verify-{stream}' - 'csit-report-merge-{stream}' @@ -27,9 +27,9 @@ - master: branch: 'master' branch-id: 'oper' - - '1701': - branch: 'rls1701' - branch-id: 'oper-rls1701' + - '1704': + branch: 'rls1704' + branch-id: 'oper-rls1704' stream: - master: branch: 'master' @@ -43,6 +43,9 @@ - '1701': branch: 'rls1701' branch-id: 'oper-rls1701' + - '1704': + branch: 'rls1704' + branch-id: 'oper-rls1704' - job-template: @@ -2478,7 +2481,7 @@ maven-version: 'mvn33-new' - job-template: - name: 'csit-docs-merge-{stream}' + name: 'csit-docs-merge-{stream_timed}' project-type: freestyle node: 'ubuntu1604-basebuild-4c-4g' @@ -2512,7 +2515,7 @@ triggers: - reverse: - jobs: 'csit-vpp-verify-{stream}-weekly' + jobs: 'csit-vpp-verify-{stream_timed}-ubuntu1604-weekly' result: 'success' - gerrit: server-name: 'Primary' diff --git a/jjb/hc2vpp/include-raw-hc2vpp-integration-prebuild.sh b/jjb/hc2vpp/include-raw-hc2vpp-integration-prebuild.sh index ee6b82ea6..8c9aed4ef 100644 --- a/jjb/hc2vpp/include-raw-hc2vpp-integration-prebuild.sh +++ b/jjb/hc2vpp/include-raw-hc2vpp-integration-prebuild.sh @@ -60,6 +60,8 @@ fi 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 @@ -69,7 +71,6 @@ for item in jvpp*.jar; do # Version = 17.01 basefile=$(basename -s .jar "$item") artifactId=$(echo "$basefile" | cut -d '-' -f 1-2) - version=$(echo "$basefile" | cut -d '-' -f 3) mvn install:install-file -Dfile=${item} -DgroupId=io.fd.vpp -DartifactId=${artifactId} -Dversion=${version} -Dpackaging=jar -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r done diff --git a/jjb/scripts/packagecloud_push.sh b/jjb/scripts/packagecloud_push.sh new file mode 100644 index 000000000..af004a35d --- /dev/null +++ b/jjb/scripts/packagecloud_push.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +# PCIO_CO is a Jenkins Global Environment variable + +FACTER_OS=$(/usr/bin/facter operatingsystem) +if [ -f ~/.packagecloud ]; then + case "$FACTER_OS" in + Ubuntu) + FACTER_LSBNAME=$(/usr/bin/facter lsbdistcodename) + DEBS=$(find . -type f -iname '*.deb') + package_cloud push "${PCIO_CO}/${STREAM}/ubuntu/${FACTER_LSBNAME}/main/" ${DEBS} + ;; + CentOS) + FACTER_OSMAJREL=$(/usr/bin/facter operatingsystemmajrelease) + FACTER_ARCH=$(/usr/bin/facter architecture) + RPMS=$(find . -type f -iregex '.*/.*\.\(s\)?rpm') + package_cloud push "${PCIO_CO}/${STREAM}/el/${FACTER_OSMAJREL}/os/${FACTER_ARCH}/" ${RPMS} + ;; + esac +fi diff --git a/jjb/vpp/include-raw-vpp-packagecloud-push.sh b/jjb/vpp/include-raw-vpp-packagecloud-push.sh deleted file mode 100644 index 8908d09c5..000000000 --- a/jjb/vpp/include-raw-vpp-packagecloud-push.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -if [ "${OS}" == "ubuntu1404" ]; then - DEBS=$(find . -type f -iname '*.deb') - package_cloud push fdio/test/ubuntu/trusty/main ${DEBS} -elif [ "${OS}" == "ubuntu1604" ]; then - DEBS=$(find . -type f -iname '*.deb') - package_cloud push fdio/test/ubuntu/xenial/main ${DEBS} -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') - package_cloud push fdio/test/el/7/os/x86_64/ ${RPMS} ${SRPMS} ${SRCRPMS} -fi
\ No newline at end of file diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index 36e12c0b1..0f72442e8 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -215,6 +215,8 @@ maven: 'mvn33-new' - maven-exec: maven-version: 'mvn33-new' + - stream-parameter: + stream: '{stream}' - repo-name-parameter: repo-name: '{repo-stream-part}.{repo-os-part}' @@ -234,6 +236,10 @@ branch: '{branch}' builders: + - config-file-provider: + files: + - file-id: '.packagecloud' + target: '/home/jenkins' - maven-target: maven-version: 'mvn33-new' goals: '--version' @@ -254,6 +260,10 @@ !include-raw-escape: - ../scripts/maven_push_functions.sh - include-raw-vpp-maven-push.sh + - shell: + !include-raw-escape: + - ../scripts/packagecloud_push.sh + publishers: - archive: artifacts: 'build-root/*.rpm,build-root/*.deb,dpdk/*.rpm,dpdk/*.deb' @@ -692,6 +702,8 @@ branch: '{branch}' - os-parameter: os: '{os}' + - stream-parameter: + stream: '{stream}' - repo-name-parameter: repo-name: '{repo-stream-part}.{repo-os-part}' @@ -728,7 +740,7 @@ - include-raw-vpp-build.sh - shell: !include-raw-escape: - - include-raw-vpp-packagecloud-push.sh + - ../scripts/packagecloud_push.sh publishers: - archive: @@ -739,4 +751,3 @@ default-excludes: false - fdio-infra-shiplogs: maven-version: 'mvn33-new' - |