diff options
| author |   Ed Warnicke <hagbard@gmail.com> | 2017-03-01 19:46:26 +0000 |
|---|---|---|
| committer | Ed Warnicke <hagbard@gmail.com> | 2017-03-01 19:46:26 +0000 |
| commit | 83dc8f82dc7f2da8a423424dc387a61b471753d6 (patch) | |
| tree | abd229415c3c5fab3f4c757ad0bb63e49d5526f1 /jjb | |
| parent | 149bea0a7637967d625995ed0ee10c8575009e7a (diff) | |
Revert "Fix vpp merge jobs"
This reverts gerrit: https://gerrit.fd.io/r/#/c/5575/
This reverts commit 149bea0a7637967d625995ed0ee10c8575009e7a.
Change-Id: I7e11c9aa44ffa93afb03665c502b3ac01f0863b2
Signed-off-by: Ed Warnicke <eaw@cisco.com>
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/scripts/setup_vpp_dpdk_dev_env.sh | 44 | ||||
| -rw-r--r-- | jjb/vpp/vpp.yaml | 20 |
2 files changed, 5 insertions, 59 deletions
diff --git a/jjb/scripts/setup_vpp_dpdk_dev_env.sh b/jjb/scripts/setup_vpp_dpdk_dev_env.sh deleted file mode 100644 index 75c3ed1ff..000000000 --- a/jjb/scripts/setup_vpp_dpdk_dev_env.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash -set -e -o pipefail - -#!/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 { - 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 - 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 -} - -setup
\ No newline at end of file diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index 060cf5139..bc1d5597d 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -108,9 +108,7 @@ - shell: !include-raw-escape: include-raw-vpp-test-checkstyle.sh - shell: - !include-raw-escape: - - ../scripts/setup_vpp_dpdk_dev_env.sh - - include-raw-vpp-build.sh + !include-raw-escape: include-raw-vpp-build.sh publishers: - archive: artifacts: 'build-root/*.rpm,build-root/*.deb' @@ -174,9 +172,7 @@ - shell: !include-raw-escape: include-raw-vpp-checkstyle.sh - shell: - !include-raw-escape: - - ../scripts/setup_vpp_dpdk_dev_env.sh - - include-raw-vpp-build.sh + !include-raw-escape: include-raw-vpp-build.sh publishers: - fdio-infra-shiplogs: @@ -234,9 +230,7 @@ - shell: !include-raw-escape: include-raw-vpp-checkstyle.sh - shell: - !include-raw-escape: - - ../scripts/setup_vpp_dpdk_dev_env.sh - - include-raw-vpp-build.sh + !include-raw-escape: include-raw-vpp-build.sh - provide-maven-settings: settings-file: 'vpp-settings' global-settings-file: 'global-settings' @@ -296,9 +290,7 @@ - shell: !include-raw-escape: include-raw-vpp-checkstyle.sh - shell: - !include-raw-escape: - - ../scripts/setup_vpp_dpdk_dev_env.sh - - include-raw-vpp-build.sh + !include-raw-escape: include-raw-vpp-build.sh - shell: !include-raw-escape: include-raw-vpp-csit-functional.sh @@ -356,9 +348,7 @@ builders: - shell: - !include-raw-escape: - - ../scripts/setup_vpp_dpdk_dev_env.sh - - include-raw-vpp-build.sh + !include-raw-escape: include-raw-vpp-build.sh - shell: !include-raw-escape: include-raw-vpp-csit-verify-perf.sh |