From: Peter Mikus Date: Tue, 27 Feb 2018 08:35:21 +0000 (+0100) Subject: Update of VPP_STABLE_VER files + fix Centos dep list X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=commitdiff_plain;h=02f01f9f327cc64745c1941968813b3f107ca771 Update of VPP_STABLE_VER files + fix Centos dep list Change-Id: Icd149927c6b2893f8f716df29d8de475e809be49 Signed-off-by: Peter Mikus --- diff --git a/VPP_STABLE_VER_CENTOS b/VPP_STABLE_VER_CENTOS index 98d2f2843e..aa97943c3b 100644 --- a/VPP_STABLE_VER_CENTOS +++ b/VPP_STABLE_VER_CENTOS @@ -1 +1 @@ -18.04-rc0~76_gd47c509~b3554.x86_64 \ No newline at end of file +18.04-rc0~291_g22ac59b~b3768.x86_64 \ No newline at end of file diff --git a/VPP_STABLE_VER_UBUNTU b/VPP_STABLE_VER_UBUNTU index 680ca00fc9..096456938d 100644 --- a/VPP_STABLE_VER_UBUNTU +++ b/VPP_STABLE_VER_UBUNTU @@ -1 +1 @@ -18.04-rc0~76-gd47c509~b3557_amd64 \ No newline at end of file +18.04-rc0~291-g22ac59b~b3771_amd64 \ No newline at end of file diff --git a/bootstrap-vpp-verify-weekly.sh b/bootstrap-vpp-verify-weekly.sh index e732810080..8b12553e3f 100644 --- a/bootstrap-vpp-verify-weekly.sh +++ b/bootstrap-vpp-verify-weekly.sh @@ -125,7 +125,7 @@ done # Temporarily download VPP and DPDK packages from nexus.fd.io case "$DISTRO" in CENTOS ) - VPP_ARTIFACTS="vpp vpp-devel vpp-lib vpp-plugins" + VPP_ARTIFACTS="vpp vpp-selinux-policy vpp-devel vpp-lib vpp-plugins" DPDK_ARTIFACTS="" PACKAGE="rpm" VPP_CLASSIFIER="" diff --git a/bootstrap.sh b/bootstrap.sh index 3d79016849..189ec6f3cc 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -23,7 +23,7 @@ export PYTHONPATH=${SCRIPT_DIR} if [ -f "/etc/redhat-release" ]; then DISTRO="CENTOS" sudo yum install -y python-devel python-virtualenv - VPP_ARTIFACTS="vpp vpp-devel vpp-lib vpp-plugins" + VPP_ARTIFACTS="vpp vpp-selinux-policy vpp-devel vpp-lib vpp-plugins" DPDK_ARTIFACTS="" PACKAGE="rpm" VPP_CLASSIFIER="" diff --git a/resources/tools/scripts/download_install_vpp_pkgs.sh b/resources/tools/scripts/download_install_vpp_pkgs.sh index 0dd597d3ee..eea3cc058c 100755 --- a/resources/tools/scripts/download_install_vpp_pkgs.sh +++ b/resources/tools/scripts/download_install_vpp_pkgs.sh @@ -34,7 +34,7 @@ if [ -f "/etc/redhat-release" ]; then MD5FILES=*.rpm.md5 fi - ARTIFACTS="vpp vpp-devel vpp-lib vpp-plugins" + ARTIFACTS="vpp vpp-selinux-policy vpp-devel vpp-lib vpp-plugins" PACKAGE="rpm rpm.md5" CLASS="" VPP_INSTALL_COMMAND="rpm -ivh *.rpm" diff --git a/resources/tools/scripts/download_install_vpp_rpms.sh b/resources/tools/scripts/download_install_vpp_rpms.sh index 25390fbf88..b1322abc39 100644 --- a/resources/tools/scripts/download_install_vpp_rpms.sh +++ b/resources/tools/scripts/download_install_vpp_rpms.sh @@ -26,7 +26,7 @@ else REPO='https://nexus.fd.io/content/repositories/fd.io.centos7' fi -ARTIFACTS="vpp vpp-lib vpp-devel vpp-python-api vpp-plugins" +ARTIFACTS="vpp vpp-selinux-policy vpp-lib vpp-devel vpp-python-api vpp-plugins" yum-config-manager --add-repo $REPO