diff --git a/build-ubunturepo b/build-ubunturepo index 3623a6c45..f2b36320a 100755 --- a/build-ubunturepo +++ b/build-ubunturepo @@ -11,18 +11,18 @@ # uploaded to in sourceforge (e.g. devel, or 2.3). # - You probably also want to put root's pub key from the build machine onto sourceforge for # the upload user listed below, so you don't have to keep entering pw's. You can do this -# at https://sourceforge.net/account/ssh +# at https://xcat.org/setting/ssh # - make sure reprepro is installed on the build machine # - Run this script from the local svn repository you just created. It will create the other directories that are needed. # Usage: attr=value attr=value ... ./build-ubunturepo { -c | -d } # PROMOTE=1 - if the attribute "PROMOTE" is specified, means an official dot release. This does not -# actually build xcat, just uploads the most recent snap build to https://sourceforge.net/projects/xcat/files/xcat/ . -# If not specified, a snap build is assumed, which uploads to https://sourceforge.net/projects/xcat/files/yum/ -# or https://sourceforge.net/projects/xcat/files/aix/. +# actually build xcat, just uploads the most recent snap build to http://xcat.org/files/xcat/ . +# If not specified, a snap build is assumed, which uploads to https://xcat.org/files/yum/ +# or https://xcat.org/files/aix/. # PREGA=1 - use this option with PROMOTE=1 on a branch that already has a released dot release, but this build is # a GA candidate build, not to be released yet. This will result in the tarball being uploaded to -# https://sourceforge.net/projects/xcat/files/yum/ or https://sourceforge.net/projects/xcat/files/aix/ +# http://xcat.org/files/yum/ or http://xcat.org/files/aix/ # (but the tarball file name will be like a released tarball, not a snap build). When you are ready to # release this build, use PROMOTE=1 without PREGA # BUILDALL=1 - build all rpms, whether they changed or not. Should be used for snap builds that are in prep for a release. @@ -93,6 +93,9 @@ fi uploader="litingt" +user="xcat" +target_machine="xcat.org" +release="github.com/xcat2/xcat-core/releases" # Find where this script is located to set some build variables old_pwd=`pwd` cd `dirname $0` @@ -104,9 +107,7 @@ local_dep_repo_path="$curdir/../../xcat-dep/xcat-dep" #define the url used for creating the source list file #define the upload dir used for uploading packages -#sf_repo_url="https://sourceforge.net/projects/xcat/files/ubuntu" sf_repo_url="https://xcat.org/files/ubuntu" -#sf_dir="/home/frs/project/x/xc/xcat" sf_dir="/var/www/xcat.org/files" #use flock to only one person build at the same time @@ -369,25 +370,28 @@ __EOF__ if [ "$REL" = "devel" -o "$PREGA" != 1 ]; then i=0 echo "Uploading RPMs from $upload_dir to ${sf_dir}/ubuntu/${REL}/ ..." - # while [ $((i+=1)) -le 5 ] && ! rsync -urLv --delete $upload_dir ${uploader},xcat@web.sourceforge.net:${sf_dir}/ubuntu/${REL}/ - while [ $((i+=1)) -le 5 ] && ! rsync -urLv --delete $upload_dir xcat@xcat.org:${sf_dir}/ubuntu/${REL}/ + while [ $((i+=1)) -le 5 ] && ! rsync -urLv --delete $upload_dir $user@$target_machine:${sf_dir}/ubuntu/${REL}/ do : ; done fi #upload the tar ball - #for the GA build, upload to https://sourceforge.net/projects/xcat/files/xcat/.x_Ubuntu/ - #for other scenario, upload to https://sourceforge.net/projects/xcat/files/ubuntu/ + #for the GA build, upload to http://xcat.org/files/xcat/.x_Ubuntu/ and https://github.com/xcat2/xcat-core/releases + #for other scenario, upload to http://xcat.org/files/ubuntu/ if [ "$PROMOTE" = 1 -a "$REL" != "devel" -a "$PREGA" != 1 ]; then i=0 echo "Uploading $tar_name to ${sf_dir}/xcat/${REL}.x_Ubuntu/ ..." - #while [ $((i+=1)) -le 5 ] && ! rsync -v $tar_name ${uploader},xcat@web.sourceforge.net:${sf_dir}/xcat/${REL}.x_Ubuntu/ - while [ $((i+=1)) -le 5 ] && ! rsync -v --force $tar_name xcat@xcat.org:${sf_dir}/xcat/${REL}.x_Ubuntu/ + while [ $((i+=1)) -le 5 ] && ! rsync -v --force $tar_name $user@$target_machine:${sf_dir}/xcat/${REL}.x_Ubuntu/ + do : ; done + + #at the same time upload the GA build to github. + i=0 + echo "Uploading $tar_name to https://github.com/xcat2/xcat-core/releases ..." + while [ $((i+=1)) -le 5 ] && ! rsync -v --force $tar_name $uploader@$release/ do : ; done else i=0 echo "Uploading $tar_name to ${sf_dir}/ubuntu/${REL}/ ..." - #while [ $((i+=1)) -le 5 ] && ! rsync -v $tar_name ${uploader},xcat@web.sourceforge.net:${sf_dir}/ubuntu/${REL}/ - while [ $((i+=1)) -le 5 ] && ! rsync -v --force $tar_name xcat@xcat.org:${sf_dir}/ubuntu/${REL}/ + while [ $((i+=1)) -le 5 ] && ! rsync -v --force $tar_name $user@$target_machine:${sf_dir}/ubuntu/${REL}/ do : ; done fi @@ -506,22 +510,19 @@ __EOF__ #upload the dep packages i=0 echo "Uploading debs from xcat-dep to ${sf_dir}/ubuntu/xcat-dep/ ..." - #while [ $((i+=1)) -le 5 ] && ! rsync -urLv --delete xcat-dep ${uploader},xcat@web.sourceforge.net:${sf_dir}/ubuntu/ - while [ $((i+=1)) -le 5 ] && ! rsync -urLv --delete xcat-dep xcat@xcat.org:${sf_dir}/ubuntu/ + while [ $((i+=1)) -le 5 ] && ! rsync -urLv --delete xcat-dep $user@$target_machine:${sf_dir}/ubuntu/ do : ; done #upload the tarball i=0 echo "Uploading $dep_tar_name to ${sf_dir}/xcat-dep/2.x_Ubuntu/ ..." - #while [ $((i+=1)) -le 5 ] && ! rsync -v $dep_tar_name ${uploader},xcat@web.sourceforge.net:${sf_dir}/xcat-dep/2.x_Ubuntu/ - while [ $((i+=1)) -le 5 ] && ! rsync -v --force $dep_tar_name xcat@xcat.org:${sf_dir}/xcat-dep/2.x_Ubuntu/ + while [ $((i+=1)) -le 5 ] && ! rsync -v --force $dep_tar_name $user@$target_machine:${sf_dir}/xcat-dep/2.x_Ubuntu/ do : ; done #upload the README file cd debs i=0 echo "Uploading README to ${sf_dir}/xcat-dep/2.x_Ubuntu/ ..." - #while [ $((i+=1)) -le 5 ] && ! rsync -v README ${uploader},xcat@web.sourceforge.net:${sf_dir}/xcat-dep/2.x_Ubuntu/ - while [ $((i+=1)) -le 5 ] && ! rsync -v --force README xcat@xcat.org:${sf_dir}/xcat-dep/2.x_Ubuntu/ + while [ $((i+=1)) -le 5 ] && ! rsync -v --force README $user@$targe_machine:${sf_dir}/xcat-dep/2.x_Ubuntu/ do : ; done cd $old_pwd