diff options
| -rw-r--r-- | jjb/scripts/setup_vpp_dpdk_dev_env.sh | 43 | ||||
| -rw-r--r-- | jjb/vpp/vpp.yaml | 28 |
2 files changed, 66 insertions, 5 deletions
diff --git a/jjb/scripts/setup_vpp_dpdk_dev_env.sh b/jjb/scripts/setup_vpp_dpdk_dev_env.sh new file mode 100644 index 000000000..ee9e98b76 --- /dev/null +++ b/jjb/scripts/setup_vpp_dpdk_dev_env.sh @@ -0,0 +1,43 @@ +#!/bin/bash +set -e -o pipefail + +# Figure out what system we are running on +if [ -f /etc/lsb-release ];then + . /etc/lsb-release +elif [ -f /etc/redhat-release ];then + sudo yum install -y redhat-lsb + DISTRIB_ID=`lsb_release -si` + DISTRIB_RELEASE=`lsb_release -sr` + DISTRIB_CODENAME=`lsb_release -sc` + DISTRIB_DESCRIPTION=`lsb_release -sd` +fi +echo DISTRIB_ID: $DISTRIB_ID +echo DISTRIB_RELEASE: $DISTRIB_RELEASE +echo DISTRIB_CODENAME: $DISTRIB_CODENAME +echo DISTRIB_DESCRIPTION: $DISTRIB_DESCRIPTION + +function setup { + if [ -z ${REPO_NAME} ]; then + echo "INSTALLING VPP-DPKG-DEV from apt/yum repo" + REPO_URL="${NEXUSPROXY}/content/repositories/fd.io.${REPO_NAME}" + echo "REPO_URL: ${REPO_URL}" + # Setup by installing vpp-dev and vpp-lib + if [ $DISTRIB_ID == "Ubuntu" ]; then + echo "deb ${REPO_URL} ./" | sudo tee /etc/apt/sources.list.d/99fd.io.list + sudo apt-get update || true + sudo apt-get -y --force-yes install vpp-dpdk-dev || true + elif [[ $DISTRIB_ID == "CentOS" ]]; then + sudo cat << EOF > fdio-master.repo +[fdio-master] +name=fd.io master branch latest merge +baseurl=${REPO_URL} +enabled=1 +gpgcheck=0 +EOF + sudo mv fdio-master.repo /etc/yum.repos.d/fdio-master.repo + sudo yum -y install vpp-dpdk-dev || true + fi + fi +} + +setup
\ No newline at end of file diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index bc1d5597d..8791fc7e5 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -86,6 +86,8 @@ branch: '{branch}' - os-parameter: os: '{os}' + - repo-name-parameter: + repo-name: '{repo-stream-part}.{repo-os-part}' scm: - gerrit-trigger-scm: @@ -108,7 +110,9 @@ - shell: !include-raw-escape: include-raw-vpp-test-checkstyle.sh - shell: - !include-raw-escape: include-raw-vpp-build.sh + !include-raw-escape: + - ../scripts/setup_vpp_dpdk_dev_env.sh + - include-raw-vpp-build.sh publishers: - archive: artifacts: 'build-root/*.rpm,build-root/*.deb' @@ -139,6 +143,8 @@ branch: '{branch}' - os-parameter: os: '{os}' + - repo-name-parameter: + repo-name: '{repo-stream-part}.{repo-os-part}' scm: - gerrit-trigger-scm: @@ -172,7 +178,9 @@ - shell: !include-raw-escape: include-raw-vpp-checkstyle.sh - shell: - !include-raw-escape: include-raw-vpp-build.sh + !include-raw-escape: + - ../scripts/setup_vpp_dpdk_dev_env.sh + - include-raw-vpp-build.sh publishers: - fdio-infra-shiplogs: @@ -230,7 +238,9 @@ - shell: !include-raw-escape: include-raw-vpp-checkstyle.sh - shell: - !include-raw-escape: include-raw-vpp-build.sh + !include-raw-escape: + - ../scripts/setup_vpp_dpdk_dev_env.sh + - include-raw-vpp-build.sh - provide-maven-settings: settings-file: 'vpp-settings' global-settings-file: 'global-settings' @@ -268,6 +278,8 @@ branch: '{branch}' - os-parameter: os: '{os}' + - repo-name-parameter: + repo-name: '{repo-stream-part}.ubuntu.xenial.main' - is-csit-vpp-job-parameter: is-csit-vpp-job: 'True' @@ -290,7 +302,9 @@ - shell: !include-raw-escape: include-raw-vpp-checkstyle.sh - shell: - !include-raw-escape: include-raw-vpp-build.sh + !include-raw-escape: + - ../scripts/setup_vpp_dpdk_dev_env.sh + - include-raw-vpp-build.sh - shell: !include-raw-escape: include-raw-vpp-csit-functional.sh @@ -325,6 +339,8 @@ branch: '{branch}' - os-parameter: os: '{os}' + - repo-name-parameter: + repo-name: '{repo-stream-part}.ubuntu.xenial.main' - type-parameter: type: '{type}' - is-csit-vpp-job-parameter: @@ -348,7 +364,9 @@ builders: - shell: - !include-raw-escape: include-raw-vpp-build.sh + !include-raw-escape: + - ../scripts/setup_vpp_dpdk_dev_env.sh + - include-raw-vpp-build.sh - shell: !include-raw-escape: include-raw-vpp-csit-verify-perf.sh |