summaryrefslogtreecommitdiffstats
path: root/jjb/cicn
diff options
context:
space:
mode:
Diffstat (limited to 'jjb/cicn')
-rw-r--r--jjb/cicn/cicn.yaml68
-rw-r--r--jjb/cicn/include-raw-cicn-libparc-build.sh8
-rw-r--r--jjb/cicn/include-raw-cicn-libparc-docs.sh74
-rw-r--r--jjb/cicn/include-raw-cicn-maven-push.sh49
-rw-r--r--jjb/cicn/include-raw-cicn-viper-build.sh8
5 files changed, 10 insertions, 197 deletions
diff --git a/jjb/cicn/cicn.yaml b/jjb/cicn/cicn.yaml
index 6ba90711..54737dc2 100644
--- a/jjb/cicn/cicn.yaml
+++ b/jjb/cicn/cicn.yaml
@@ -20,19 +20,15 @@
project: "cicn"
os:
- - ubuntu1804:
- repo-os-part: "ubuntu.bionic.main"
- - ubuntu2004:
- repo-os-part: "ubuntu.focal.main"
- - centos8:
- repo-os-part: "centos8"
+ - ubuntu1804
+ - ubuntu2004
+ - centos8
executor-arch: "x86_64"
stream:
- master:
branch: "cframework/master"
- repo-stream-part: "master"
type:
- short
@@ -46,17 +42,14 @@
project: "cicn"
os:
- - ubuntu1804:
- repo-os-part: "ubuntu-arm.bionic.main"
- - ubuntu2004:
- repo-os-part: "ubuntu-arm.focal.main"
+ - ubuntu1804
+ - ubuntu2004
executor-arch: "aarch64"
stream:
- master:
branch: "cframework/master"
- repo-stream-part: "master"
type:
- short
@@ -69,16 +62,13 @@
- "cicn-viper-merge-{stream}-{os}-{executor-arch}"
project: "cicn"
- os:
- - ubuntu1804:
- repo-os-part: "ubuntu.bionic.main"
+ os: ubuntu1804
executor-arch: "x86_64"
stream:
- master:
branch: "viper/master"
- repo-stream-part: "master"
type:
- short
@@ -101,12 +91,6 @@
branch: "{branch}"
- os-parameter:
os: "{os}"
- - maven-project-parameter:
- maven: "mvn33-new"
- - maven-exec:
- maven-version: "mvn33-new"
- - repo-name-parameter:
- repo-name: "{repo-stream-part}.{repo-os-part}"
- stream-parameter:
stream: "hicn"
@@ -134,23 +118,10 @@
files:
- file-id: "packagecloud_api"
target: "/root/packagecloud_api"
- - maven-target:
- maven-version: "mvn33-new"
- goals: "--version"
- settings: "cicn-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-cicn-libparc-build.sh
- - provide-maven-settings:
- settings-file: "cicn-settings"
- global-settings-file: "global-settings"
- - shell: !include-raw-escape:
- - ../scripts/maven_push_functions.sh
- - include-raw-cicn-maven-push.sh
+ - ../scripts/cicn/build-libparc.sh
- shell: !include-raw-escape:
- ../scripts/packagecloud_push.sh
@@ -195,7 +166,7 @@
- shell: !include-raw-escape:
- ../scripts/setup_executor_env.sh
- shell: !include-raw-escape:
- - include-raw-cicn-libparc-build.sh
+ - ../scripts/cicn/build-libparc.sh
publishers:
- fdio-infra-publish
@@ -217,12 +188,6 @@
branch: "{branch}"
- os-parameter:
os: "{os}"
- - maven-project-parameter:
- maven: "mvn33-new"
- - maven-exec:
- maven-version: "mvn33-new"
- - repo-name-parameter:
- repo-name: "{repo-stream-part}.{repo-os-part}"
- stream-parameter:
stream: "hicn"
@@ -253,23 +218,10 @@
files:
- file-id: "packagecloud_api"
target: "/root/packagecloud_api"
- - maven-target:
- maven-version: "mvn33-new"
- goals: "--version"
- settings: "cicn-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-cicn-viper-build.sh
- - provide-maven-settings:
- settings-file: "cicn-settings"
- global-settings-file: "global-settings"
- - shell: !include-raw-escape:
- - ../scripts/maven_push_functions.sh
- - include-raw-cicn-maven-push.sh
+ - ../scripts/cicn/build-viper.sh
- shell: !include-raw-escape:
- ../scripts/packagecloud_push.sh
@@ -314,7 +266,7 @@
- shell: !include-raw-escape:
- ../scripts/setup_executor_env.sh
- shell: !include-raw-escape:
- - include-raw-cicn-viper-build.sh
+ - ../scripts/cicn/build-viper.sh
publishers:
- fdio-infra-publish
diff --git a/jjb/cicn/include-raw-cicn-libparc-build.sh b/jjb/cicn/include-raw-cicn-libparc-build.sh
deleted file mode 100644
index 4943501c..00000000
--- a/jjb/cicn/include-raw-cicn-libparc-build.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-# basic build script example
-set -euxo pipefail
-IFS=$'\n\t'
-
-pushd libparc/scripts
-bash build-package.sh
-popd
diff --git a/jjb/cicn/include-raw-cicn-libparc-docs.sh b/jjb/cicn/include-raw-cicn-libparc-docs.sh
deleted file mode 100644
index cb4d698e..00000000
--- a/jjb/cicn/include-raw-cicn-libparc-docs.sh
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/bin/bash
-set -xe -o pipefail
-
-update_cmake_repo() {
- cat /etc/resolv.conf
- echo "nameserver 8.8.8.8" | sudo tee -a /etc/resolv.conf
- cat /etc/resolv.conf
-
- CMAKE_INSTALL_SCRIPT_URL="https://cmake.org/files/v3.8/cmake-3.8.0-Linux-x86_64.sh"
- CMAKE_INSTALL_SCRIPT="/tmp/install_cmake.sh"
- curl ${CMAKE_INSTALL_SCRIPT_URL} > ${CMAKE_INSTALL_SCRIPT}
-
- sudo mkdir -p /opt/cmake
- sudo bash ${CMAKE_INSTALL_SCRIPT} --skip-license --prefix=/opt/cmake
- export PATH=/opt/cmake/bin:$PATH
-}
-
-cd libparc
-
-[ "$DOCS_REPO_URL" ] || DOCS_REPO_URL="https://nexus.fd.io/content/sites/site"
-[ "$PROJECT_PATH" ] || PROJECT_PATH="io/fd/cicn/libparc"
-[ "$DOC_FILE" ] || DOC_FILE="cicn.libparc.docs.zip"
-[ "$DOC_DIR" ] || DOC_DIR="build/documentation/generated-documentation/html"
-[ "$SITE_DIR" ] || SITE_DIR="build/documentation/deploy-site/"
-[ "$RESOURCES_DIR" ] || RESOURCES_DIR=${SITE_DIR}/src/site/resources
-[ "$MVN" ] || MVN="/opt/apache/maven/bin/mvn"
-[ "$VERSION" ] || VERSION=$(bash scripts/version rpm-version)
-
-echo "Current directory: $(pwd)"
-
-update_cmake_repo
-mkdir -p build
-pushd build
-cmake -DDOC_ONLY=ON ..
-make documentation
-popd
-
-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.vpp</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>3.3.3</version>
- </extension>
- </extensions>
- </build>
- <distributionManagement>
- <site>
- <id>fdio-site</id>
- <url>dav:${DOCS_REPO_URL}/${PROJECT_PATH}/${VERSION}</url>
- </site>
- </distributionManagement>
- </project>
-EOF
- ${MVN} site:site site:deploy -gs "${GLOBAL_SETTINGS_FILE}" -s "${SETTINGS_FILE}" -T 4C
- cd -
-fi
diff --git a/jjb/cicn/include-raw-cicn-maven-push.sh b/jjb/cicn/include-raw-cicn-maven-push.sh
deleted file mode 100644
index 65fbd833..00000000
--- a/jjb/cicn/include-raw-cicn-maven-push.sh
+++ /dev/null
@@ -1,49 +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
-# vim: ts=4 sw=4 sts=4 et ft=sh :
diff --git a/jjb/cicn/include-raw-cicn-viper-build.sh b/jjb/cicn/include-raw-cicn-viper-build.sh
deleted file mode 100644
index 92bf809e..00000000
--- a/jjb/cicn/include-raw-cicn-viper-build.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-# basic build script example
-set -euxo pipefail
-IFS=$'\n\t'
-
-pushd scripts
-bash build-package.sh
-popd