From 3a780f80f17429928e5305516662f260a12c534b Mon Sep 17 00:00:00 2001 From: Mike Ellery Date: Fri, 10 May 2019 15:49:20 -0700 Subject: [PATCH] Remove repo package check from update script --- Builds/containers/gitlab-ci/build_container.sh | 2 +- Builds/containers/shared/update-rippled.sh | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Builds/containers/gitlab-ci/build_container.sh b/Builds/containers/gitlab-ci/build_container.sh index ff4b7ac561..c5914a0f78 100644 --- a/Builds/containers/gitlab-ci/build_container.sh +++ b/Builds/containers/gitlab-ci/build_container.sh @@ -15,7 +15,7 @@ if docker pull "${ARTIFACTORY_HUB}/${container_name}:${CI_COMMIT_SHA}"; then exit 0 else echo "no existing ${pkgtype} container for this branch - searching history." - for CID_PREV in $(git log --pretty=%H -n5) ; do + for CID_PREV in $(git log --pretty=%H -n30) ; do if docker pull "${ARTIFACTORY_HUB}/${container_name}:${CID_PREV}"; then echo "found container for previous commit ${CID_PREV}" \ "- using as cache." diff --git a/Builds/containers/shared/update-rippled.sh b/Builds/containers/shared/update-rippled.sh index a0e28d23ff..c9305bbf96 100755 --- a/Builds/containers/shared/update-rippled.sh +++ b/Builds/containers/shared/update-rippled.sh @@ -33,8 +33,6 @@ if [[ "$ID" == "ubuntu" || "$ID" == "debian" ]] ; then } elif [[ "$ID" == "fedora" || "$ID" == "centos" || "$ID" == "rhel" || "$ID" == "scientific" ]] ; then RIPPLE_REPO=${RIPPLE_REPO-stable} - # Update ripple.repo file - rpm -Uvh --replacepkgs https://mirrors.ripple.com/ripple-repo-el7.rpm yum --disablerepo=* --enablerepo=ripple-$RIPPLE_REPO clean expire-cache yum check-update -q --enablerepo=ripple-$RIPPLE_REPO rippled || can_update=true