diff options
author | Peter Mikus <pmikus@cisco.com> | 2019-11-11 16:14:32 +0000 |
---|---|---|
committer | Peter Mikus <pmikus@cisco.com> | 2019-11-19 06:43:59 +0000 |
commit | e7ad66f3147662973039caaac33015de7e0c6f8c (patch) | |
tree | 809a056325425bad672a8a9274c3c2d696a35030 /resources/tools/scripts | |
parent | 20cc67d5f23a7f4e05b08012bf3d3a63be4bcf63 (diff) |
HONEYCOMB: Remove
Signed-off-by: Peter Mikus <pmikus@cisco.com>
Change-Id: I60d80564050cb786c7b1e0a08f31f8292f82197e
Diffstat (limited to 'resources/tools/scripts')
-rwxr-xr-x | resources/tools/scripts/download_hc_build_pkgs.sh | 175 | ||||
-rwxr-xr-x | resources/tools/scripts/download_hc_pkgs.sh | 113 |
2 files changed, 0 insertions, 288 deletions
diff --git a/resources/tools/scripts/download_hc_build_pkgs.sh b/resources/tools/scripts/download_hc_build_pkgs.sh deleted file mode 100755 index 6b595a4752..0000000000 --- a/resources/tools/scripts/download_hc_build_pkgs.sh +++ /dev/null @@ -1,175 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2019 Cisco and/or its affiliates. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -set -ex - -STREAM=$1 -OS=$2 -jvpp_commit_id=$3 - -# Figure out what system we are running on -if [[ -f /etc/os-release ]];then - source /etc/os-release -else - echo "Cannot determine OS version" - exit 1 -fi -echo "----- OS INFO -----" -echo DISTRIB_ID: ${ID} -echo DISTRIB_RELEASE: ${VERSION_ID} -echo DISTRIB_CODENAME: ${VERSION_CODENAME} -echo DISTRIB_DESCRIPTION: ${PRETTY_NAME} - -VERSION=`../vpp-version` -JVPP_VERSION=`../jvpp-version` - -if [[ -n "${jvpp_commit_id}" ]]; then - # Skipping download of JVPP because it was built from source - VPP_DEB_NEW_ARTIFACTS="vpp libvppinfra vpp-plugin-core vpp-plugin-dpdk vpp-dev libvppinfra-dev vpp-api-python" - VPP_DEB_ARTIFACTS="vpp vpp-lib vpp-plugins vpp-dev vpp-api-python" - VPP_RPM_ARTIFACTS="vpp vpp-lib vpp-plugins vpp-devel vpp-api-python" -else - VPP_DEB_NEW_ARTIFACTS="vpp libvppinfra vpp-plugin-core vpp-plugin-dpdk vpp-api-java vpp-api-python" - VPP_DEB_ARTIFACTS="vpp vpp-lib vpp-plugins vpp-api-java vpp-api-python" - VPP_RPM_ARTIFACTS="vpp vpp-lib vpp-plugins vpp-api-java vpp-api-python" -fi - -IGNORE_DEPS="" -# Check OS and stream to set correct packages -if [[ "$ID" == "centos" ]]; then - VPP_ARTIFACTS=${VPP_RPM_ARTIFACTS} -elif [[ "$ID" == "ubuntu" ]]; then - if [[ "1807 1810 1901" =~ .*$STREAM.* ]]; then - VPP_ARTIFACTS=${VPP_DEB_ARTIFACTS} - IGNORE_DEPS="vpp,vpp-lib,vpp-plugins" - else - VPP_ARTIFACTS=${VPP_DEB_NEW_ARTIFACTS} - IGNORE_DEPS="vpp,libvppinfra,vpp-plugin-core" - fi -fi -VPP_DEB_PACKAGES="" -VPP_RPM_PACKAGES="" -for ART in ${VPP_ARTIFACTS}; do - if [[ "${VERSION}" != 'RELEASE' ]]; then - if [[ "$ART" == "vpp-api-java" ]]; then - VPP_DEB_PACKAGES="$VPP_DEB_PACKAGES $ART=$JVPP_VERSION" - VPP_RPM_PACKAGES="$VPP_RPM_PACKAGES $ART-$JVPP_VERSION" - else - VPP_DEB_PACKAGES="$VPP_DEB_PACKAGES $ART=$VERSION" - VPP_RPM_PACKAGES="$VPP_RPM_PACKAGES $ART-$VERSION" - fi - else - VPP_DEB_PACKAGES="$VPP_DEB_PACKAGES $ART" - VPP_RPM_PACKAGES="$VPP_RPM_PACKAGES $ART" - fi -done - -echo "----- DOWNLOADING PACKAGES -----" -REPO_URL="https://packagecloud.io/fdio/${STREAM}" -echo "REPO_URL: ${REPO_URL}" -if [[ "$ID" == "ubuntu" ]]; then - if [[ -f /etc/apt/sources.list.d/99fd.io.list ]];then - echo "Deleting: /etc/apt/sources.list.d/99fd.io.list" - sudo rm /etc/apt/sources.list.d/99fd.io.list - fi - curl -s https://packagecloud.io/install/repositories/fdio/${STREAM}/script.deb.sh | sudo bash - apt-get download ${VPP_DEB_PACKAGES} || true -elif [[ "$ID" == "centos" ]]; then - if [[ -f /etc/yum.repos.d/fdio-master.repo ]]; then - echo "Deleting: /etc/yum.repos.d/fdio-master.repo" - sudo rm /etc/yum.repos.d/fdio-master.repo - fi - curl -s https://packagecloud.io/install/repositories/fdio/${STREAM}/script.rpm.sh | sudo bash - sudo yum -y install --downloadonly --downloaddir=./ ${VPP_RPM_PACKAGES} || true -fi -# TODO(CSIT-994): reenable NSH -# NSH_GROUP="io.fd.nsh_sfc" -# NSH_ARTIFACTS="vpp-nsh-plugin" - -# If JVPP variable is set, clone and build JVPP from the specified commit -# Otherwise skip this step, hc2vpp will use JVPP snapshots from Nexus -if [[ -n "${jvpp_commit_id}" ]]; then - # first we need to install vpp and deps to be able to build jvpp - if [[ "$ID" == "centos" ]]; then - sudo rpm -i vpp-*.rpm - else - if [[ "$VERSION_CODENAME" == "xenial" ]]; then - sudo dpkg --ignore-depends=libmbedcrypto0,libmbedtls10,libmbedx509-0 -i vpp_*.deb vpp-dev_*.deb vpp-plugin-core_*.deb libvppinfra_*.deb libvppinfra-dev_*.deb - elif [[ "$VERSION_CODENAME" == "bionic" ]]; then - sudo dpkg --ignore-depends=libmbedcrypto1,libmbedtls10,libmbedx509-0 -i vpp_*.deb vpp-dev_*.deb vpp-plugin-core_*.deb libvppinfra_*.deb libvppinfra-dev_*.deb - else - echo "Error: Unsupported UBUNTU version." - exit 1 - fi - fi - # create new dir for custom jvpp build (jvpp directory already exists in hc2vpp, therefore using jvpp_src) - mkdir jvpp_src - cd jvpp_src - git clone https://gerrit.fd.io/r/jvpp - cd jvpp - ref=`git ls-remote -q | grep ${jvpp_commit_id} | awk '{print $2}'` - git fetch origin ${ref} && git checkout FETCH_HEAD - ./clean.sh - if [[ "$ID" == "centos" ]]; then - cmake3 . - else - cmake . - fi - make package - if [[ $? != 0 ]]; then - echo "JVPP build failed." - exit 1 - fi - cp build-root/packages/vpp-api-java* ${WORKSPACE}/csit - cd ${WORKSPACE}/csit - # Clean up when done. - if [[ "$ID" == "centos" ]]; then - sudo yum remove "*vpp*" - else - sudo apt -y remove "*vpp*" - fi - rm -rf jvpp_src -fi - -# install vpp-api-java, this extracts jvpp .jar files into usr/share/java -if [[ "${OS}" == "centos7" ]]; then - sudo rpm --nodeps --install vpp-api-java* -else - sudo dpkg --ignore-depends=${IGNORE_DEPS} --install vpp-api-java* -fi - -# 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 - -for item in jvpp*.jar; do - # Example filename: jvpp-registry-19.04.jar - # ArtifactId = jvpp-registry - # Version = 19.04 or 19.04-SNAPSHOT - basefile=$(basename -s .jar "$item") - artifactId=$(echo "$basefile" | cut -d '-' -f 1-2) - mvn install:install-file -Dfile=${item} -DgroupId=io.fd.jvpp -DartifactId=${artifactId} -Dversion=${version} -Dpackaging=jar -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -done - -# vpp-api-package is no longer necessary, breaks the installation of other packages that follow in next steps -if [[ "${OS}" == "centos7" ]]; then - sudo yum remove "*vpp-api-java*" -else - sudo apt -y remove "*vpp-api-java*" -fi - -cd ${current_dir} diff --git a/resources/tools/scripts/download_hc_pkgs.sh b/resources/tools/scripts/download_hc_pkgs.sh deleted file mode 100755 index 2f6cdd1451..0000000000 --- a/resources/tools/scripts/download_hc_pkgs.sh +++ /dev/null @@ -1,113 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2019 Cisco and/or its affiliates. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -set -x - -STREAM=$1 -OS=$2 - -# TODO(CSIT-994): reenable NSH -# NSH_GROUP="io.fd.nsh_sfc" -# NSH_ARTIFACTS="vpp-nsh-plugin" -# Figure out what system we are running on -if [[ -f /etc/os-release ]];then - source /etc/os-release -else - echo "Cannot determine OS version" - exit 1 -fi -echo "----- OS INFO -----" -echo DISTRIB_ID: ${ID} -echo DISTRIB_RELEASE: ${VERSION_ID} -echo DISTRIB_CODENAME: ${VERSION_CODENAME} -echo DISTRIB_DESCRIPTION: ${PRETTY_NAME} - -VERSION="RELEASE" -echo "----- DOWNLOADING HONEYCOMB AND JVPP PACKAGES -----" -REPO_URL="https://packagecloud.io/fdio/${STREAM}" -echo "REPO_URL: ${REPO_URL}" -if [[ "$ID" == "ubuntu" ]]; then - if [[ -f /etc/apt/sources.list.d/99fd.io.list ]];then - echo "Deleting: /etc/apt/sources.list.d/99fd.io.list" - sudo rm /etc/apt/sources.list.d/99fd.io.list - fi - curl -s https://packagecloud.io/install/repositories/fdio/${STREAM}/script.deb.sh | sudo bash - apt-get download honeycomb vpp-api-java || true -elif [[ "$ID" == "centos" ]]; then - if [[ -f /etc/yum.repos.d/fdio-master.repo ]]; then - echo "Deleting: /etc/yum.repos.d/fdio-master.repo" - sudo rm /etc/yum.repos.d/fdio-master.repo - fi - curl -s https://packagecloud.io/install/repositories/fdio/${STREAM}/script.rpm.sh | sudo bash - sudo yum -y install --downloadonly --downloaddir=./ honeycomb vpp-api-java || true -fi - -# TODO(CSIT-994): reenable NSH -# for ART in ${NSH_ARTIFACTS}; do -# for PAC in ${PACKAGE}; do -# curl "${URL}?r=${REPO}&g=${NSH_GROUP}&a=${ART}&p=${PAC}&v=${VER}&c=${CLASS}" -O -J || exit -# done -# done - -# determine VPP dependency -# use latest if honeycomb package does not depend on single VPP version, e.g. stable branches since HC2VPP-285 -VERSION="RELEASE" -if [[ "${OS}" == "centos7" ]]; then - HC_VPP_VER=`rpm -qpR honeycomb*.rpm | grep -oP 'vpp = \K.+'` - if [[ "${HC_VPP_VER}" != "" ]]; then - VERSION=${HC_VPP_VER}.x86_64 - fi -else - HC_VPP_VER=`dpkg -I honeycomb*.deb | grep -oP 'vpp \(= \K[^\)]+'` - if [[ "${HC_VPP_VER}" != "" ]]; then - VERSION=${HC_VPP_VER} - fi -fi - -VPP_DEB_NEW_ARTIFACTS="vpp libvppinfra vpp-plugin-core vpp-plugin-dpdk vpp-api-python" -VPP_DEB_ARTIFACTS="vpp vpp-lib vpp-plugins vpp-api-python" -VPP_RPM_ARTIFACTS="vpp vpp-lib vpp-plugins vpp-api-python" -# Check OS and stream to set correct packages -if [[ "$ID" == "centos" ]]; then - VPP_ARTIFACTS=${VPP_RPM_ARTIFACTS} -elif [[ "$ID" == "ubuntu" ]]; then - if [[ "1807 1810 1901" =~ .*$STREAM.* ]]; then - VPP_ARTIFACTS=${VPP_DEB_ARTIFACTS} - else - VPP_ARTIFACTS=${VPP_DEB_NEW_ARTIFACTS} - fi -fi -VPP_DEB_PACKAGES="" -VPP_RPM_PACKAGES="" -INSTALL_PACKAGES="" -for ART in ${VPP_ARTIFACTS}; do - INSTALL_PACKAGES="$INSTALL_PACKAGES $ART*" - if [[ "${VERSION}" != 'RELEASE' ]]; then - VPP_DEB_PACKAGES="$VPP_DEB_PACKAGES $ART=$VERSION" - VPP_RPM_PACKAGES="$VPP_RPM_PACKAGES $ART-$VERSION" - else - VPP_DEB_PACKAGES="$VPP_DEB_PACKAGES $ART" - VPP_RPM_PACKAGES="$VPP_RPM_PACKAGES $ART" - fi -done - -echo "----- DOWNLOADING VPP PACKAGES -----" -REPO_URL="https://packagecloud.io/fdio/${STREAM}" -echo "REPO_URL: ${REPO_URL}" -if [[ "$ID" == "ubuntu" ]]; then - apt-get download ${VPP_DEB_PACKAGES} || true -elif [[ "$ID" == "centos" ]]; then - sudo yum -y install --downloadonly --downloaddir=./ ${VPP_RPM_PACKAGES} || true -fi |