diff --git a/elastic.sh b/elastic.sh index 290653f..a36549d 100755 --- a/elastic.sh +++ b/elastic.sh @@ -4,6 +4,7 @@ set -o pipefail _here=`dirname $(realpath $0)` apt_sync="${_here}/apt-sync.py" +yum_sync="${_here}/yum-sync.py" BASE_URL=${TUNASYNC_UPSTREAM_URL:-"https://artifacts.elastic.co"} @@ -15,8 +16,6 @@ ELASTIC_VERSION=("5.x" "6.x" "7.x") YUM_PATH="${BASE_PATH}/yum" APT_PATH="${BASE_PATH}/apt" -mkdir -p ${YUM_PATH} ${APT_PATH} - # =================== APT repos =============================== for elsver in "${ELASTIC_VERSION[@]}"; do @@ -26,33 +25,10 @@ for elsver in "${ELASTIC_VERSION[@]}"; do done # # ================ YUM/DNF repos =============================== +components="${ELASTIC_VERSION[@]}" +components=${components// /,} +"$yum_sync" "${BASE_URL}/packages/@{comp}/yum" 7 "$components" x86_64 "elastic-@{comp}" "$YUM_PATH" -cache_dir="/tmp/yum-elastic-cache/" -cfg="/tmp/yum-elastic.conf" -cat < ${cfg} -[main] -keepcache=0 - -EOF - -for elsver in "${ELASTIC_VERSION[@]}"; do -cat <> ${cfg} -[elastic-${elsver}] -name=elastic stack ${elsver} packages -baseurl=${BASE_URL}/packages/${elsver}/yum -repo_gpgcheck=0 -gpgcheck=0 -enabled=1 -sslverify=0 - -EOF +for elsver in ${ELASTIC_VERSION[@]}; do + (cd ${BASE_PATH}/${elsver}; ln -sfn ../yum/elastic-${elsver} yum) done - -if [[ -z ${DRY_RUN:-} ]]; then - reposync -c $cfg -d -p ${YUM_PATH} -e ${cache_dir} - for elsver in ${ELASTIC_VERSION[@]}; do - createrepo --update -v -c ${cache_dir} -o ${YUM_PATH}/elastic-${elsver}/ ${YUM_PATH}/elastic-${elsver}/ - (cd ${BASE_PATH}/${elsver}; ln -sfn ../yum/elastic-${elsver} yum) - done -fi -rm $cfg diff --git a/erlang.sh b/erlang.sh index a4bd483..a1514d5 100755 --- a/erlang.sh +++ b/erlang.sh @@ -4,6 +4,7 @@ set -o pipefail _here=`dirname $(realpath $0)` apt_sync="${_here}/apt-sync.py" +yum_sync="${_here}/yum-sync.py" BASE_PATH="${TUNASYNC_WORKING_DIR}" BASE_URL="https://packages.erlang-solutions.com" @@ -12,8 +13,6 @@ YUM_PATH="${BASE_PATH}/centos" UBUNTU_PATH="${BASE_PATH}/ubuntu" DEBIAN_PATH="${BASE_PATH}/debian" -EL_VERSIONS=("6" "7" "8") - # =================== APT repos =============================== "$apt_sync" "${BASE_URL}/ubuntu" @ubuntu-lts contrib amd64,i386 "$UBUNTU_PATH" echo "Ubuntu finished" @@ -21,28 +20,5 @@ echo "Ubuntu finished" echo "Debian finished" # =================== YUM repos =============================== - -cache_dir="/tmp/yum-erlang-cache/" -cfg="/tmp/yum-erlang.conf" -cat < ${cfg} -[main] -keepcache=0 - -EOF - -for elver in ${EL_VERSIONS[@]}; do -cat << EOF >> $cfg -[$elver] -name=Elang for el-${elver} -baseurl=${BASE_URL}/rpm/centos/$elver/x86_64 -enabled=1 -EOF -done - -if [[ -z ${DRY_RUN:-} ]]; then - reposync -c $cfg -d -p ${YUM_PATH} -e $cache_dir - for elver in ${EL_VERSIONS[@]}; do - createrepo --update -v -c $cache_dir -o ${YUM_PATH}/${elver}/ ${YUM_PATH}/${elver}/ - done -fi -rm $cfg +"$yum_sync" "${BASE_URL}/rpm/centos/@{os_ver}/@{arch}" 6-8 erlang x86_64 "@{os_ver}" "$YUM_PATH" +echo "YUM finished" diff --git a/influxdata.sh b/influxdata.sh index 3c2490e..0d66562 100755 --- a/influxdata.sh +++ b/influxdata.sh @@ -5,6 +5,7 @@ set -o pipefail _here=`dirname $(realpath $0)` apt_sync="${_here}/apt-sync.py" +yum_sync="${_here}/yum-sync.py" BASE_PATH="${TUNASYNC_WORKING_DIR}" BASE_URL=${TUNASYNC_UPSTREAM_URL:-"https://repos.influxdata.com"} @@ -13,10 +14,6 @@ YUM_PATH="${BASE_PATH}/yum" UBUNTU_PATH="${BASE_PATH}/ubuntu" DEBIAN_PATH="${BASE_PATH}/debian" -EL_VERSIONS=("6" "7" "8") - -mkdir -p ${YUM_PATH} ${UBUNTU_PATH} ${DEBIAN_PATH} - wget -O ${BASE_PATH}/influxdb.key ${BASE_URL}/influxdb.key # =================== APT repos =============================== @@ -28,28 +25,5 @@ echo "Debian finished" # =================== YUM/DNF repos ========================== - -cache_dir="/tmp/yum-influxdata-cache/" -cfg="/tmp/yum-influxdata.conf" -cat < ${cfg} -[main] -keepcache=0 - -EOF - -for elver in ${EL_VERSIONS[@]}; do -cat << EOF >> $cfg -[el${elver}-x86_64] -name=el${elver} -baseurl=${BASE_URL}/rhel/$elver/x86_64/stable/ -enabled=1 -EOF -done - -if [[ -z ${DRY_RUN:-} ]]; then - reposync -c $cfg -d -p ${YUM_PATH} -e $cache_dir - for elver in ${EL_VERSIONS[@]}; do - createrepo --update -v -c $cache_dir -o ${YUM_PATH}/el${elver}-x86_64/ ${YUM_PATH}/el${elver}-x86_64/ - done -fi -rm $cfg +"$yum_sync" "${BASE_URL}/rhel/@{os_ver}/@{arch}/stable/" 6-8 influxdata x86_64 "el@{os_ver}-@{arch}" "$YUM_PATH" +echo "YUM finished" diff --git a/virtualbox.sh b/virtualbox.sh index a313e79..4977cf8 100755 --- a/virtualbox.sh +++ b/virtualbox.sh @@ -5,6 +5,7 @@ set -o pipefail _here=`dirname $(realpath $0)` apt_sync="${_here}/apt-sync.py" +yum_sync="${_here}/yum-sync.py" MAX_RETRY=${MAX_RETRY:-"3"} DOWNLOAD_TIMEOUT=${DOWNLOAD_TIMEOUT:-"1800"} @@ -15,37 +16,10 @@ BASE_PATH="${TUNASYNC_WORKING_DIR}" RPM_PATH="${BASE_PATH}/rpm" APT_PATH="${BASE_PATH}/apt" -EL_VERSIONS=("5" "6" "7" "8") - -mkdir -p ${RPM_PATH} ${APT_PATH} - # === download rhel packages ==== -cache_dir="/tmp/yum-virtualbox-el-cache/" -cfg="/tmp/virtualbox-el-yum.conf" -cat < ${cfg} -[main] -keepcache=0 -EOF - -for releasever in ${EL_VERSIONS[@]}; do -cat <> ${cfg} -[el${releasever}] -name=Oracle Linux / RHEL / CentOS-5 / x86_64 - VirtualBox -baseurl=${BASE_URL}/rpm/el/$releasever/x86_64 -repo_gpgcheck=0 -gpgcheck=0 -enabled=1 -EOF -done - -if [[ -z ${DRY_RUN:-} ]]; then - reposync -c $cfg -d -p ${RPM_PATH} -e $cache_dir - for releasever in ${EL_VERSIONS[@]}; do - createrepo --update -v -c $cache_dir -o ${RPM_PATH}/el$releasever ${RPM_PATH}/el$releasever - done -fi -rm $cfg +"$yum_sync" "${BASE_URL}/rpm/el/@{os_ver}/@{arch}" 5-8 VirtualBox x86_64 "el@{os_ver}" "$YUM_PATH" +echo "YUM finished" # === download deb packages ====