diff options
| author | Renato Botelho <renato@netgate.com> | 2016-04-21 16:34:40 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-04-21 16:34:52 -0300 |
| commit | 15333972e7916918be46c3d7c4e8ded240ac773a (patch) | |
| tree | 383beecf9a2b3c8e944ba4e778c980e07f09e9af /tools/builder_defaults.sh | |
| parent | 61b63ac04aeae6ddaefae3f0f793f5c6500dc148 (diff) | |
| download | pfsense-15333972e7916918be46c3d7c4e8ded240ac773a.zip pfsense-15333972e7916918be46c3d7c4e8ded240ac773a.tar.gz | |
Send pkg repos to staging server before move to final one
Diffstat (limited to 'tools/builder_defaults.sh')
| -rw-r--r-- | tools/builder_defaults.sh | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/tools/builder_defaults.sh b/tools/builder_defaults.sh index 54eb2bb..b5d8d4f 100644 --- a/tools/builder_defaults.sh +++ b/tools/builder_defaults.sh @@ -261,6 +261,8 @@ if [ -z "${BUILTDATESTRING}" ]; then fi echo "$BUILTDATESTRING" > $BUILTDATESTRINGFILE +STAGING_HOSTNAME=${STAGING_HOSTNAME:-"release-staging.netgate.com"} + # Poudriere export ZFS_TANK=${ZFS_TANK:-"zroot"} export ZFS_ROOT=${ZFS_ROOT:-"/poudriere"} @@ -271,10 +273,17 @@ export POUDRIERE_PORTS_GIT_URL=${POUDRIERE_PORTS_GIT_URL:-"${GIT_REPO_BASE}/free export POUDRIERE_PORTS_GIT_BRANCH=${POUDRIERE_PORTS_GIT_BRANCH:-"devel"} # Host to rsync pkg repos from poudriere +export PKG_RSYNC_HOSTNAME=${PKG_RSYNC_HOSTNAME:-${STAGING_HOSTNAME}} export PKG_RSYNC_USERNAME=${PKG_RSYNC_USERNAME:-"wwwsync"} export PKG_RSYNC_SSH_PORT=${PKG_RSYNC_SSH_PORT:-"22"} -export PKG_RSYNC_DESTDIR=${PKG_RSYNC_DESTDIR:-"/usr/local/www/beta/packages"} -export PKG_RSYNC_LOGS=${PKG_RSYNC_LOGS:-"/usr/local/www/beta"} +export PKG_RSYNC_DESTDIR=${PKG_RSYNC_DESTDIR:-"/staging/ce/packages"} +export PKG_RSYNC_LOGS=${PKG_RSYNC_LOGS:-"/staging/ce/packages/logs/${POUDRIERE_BRANCH}/${TARGET}"} + +# Final packages server +export PKG_FINAL_RSYNC_HOSTNAME=${PKG_FINAL_RSYNC_HOSTNAME:-"beta.pfsense.org"} +export PKG_FINAL_RSYNC_USERNAME=${PKG_FINAL_RSYNC_USERNAME:-"wwwsync"} +export PKG_FINAL_RSYNC_SSH_PORT=${PKG_FINAL_RSYNC_SSH_PORT:-"22"} +export PKG_FINAL_RSYNC_DESTDIR=${PKG_FINAL_RSYNC_DESTDIR:-"/usr/local/www/beta/packages"} unset _IS_RELEASE unset CORE_PKG_DATESTRING @@ -304,17 +313,16 @@ esac export USE_PKG_REPO_STAGING="1" export PKG_REPO_SERVER_DEVEL=${PKG_REPO_SERVER_DEVEL:-"pkg+https://beta.pfsense.org/packages"} export PKG_REPO_SERVER_RELEASE=${PKG_REPO_SERVER_RELEASE:-"pkg+https://beta.pfsense.org/packages"} +export PKG_REPO_SERVER_STAGING=${PKG_REPO_SERVER_STAGING:-"pkg+http://${STAGING_HOSTNAME}/ce/packages"} if [ -n "${_IS_RELEASE}" ]; then export PKG_REPO_BRANCH_RELEASE=${PKG_REPO_BRANCH_RELEASE:-${POUDRIERE_BRANCH}} export PKG_REPO_BRANCH_DEVEL=${PKG_REPO_BRANCH_DEVEL:-${POUDRIERE_BRANCH}} export PKG_REPO_BRANCH_STAGING=${PKG_REPO_BRANCH_STAGING:-${PKG_REPO_BRANCH_RELEASE}} - export PKG_REPO_SERVER_STAGING=${PKG_REPO_SERVER_STAGING:-"pkg+http://release-staging.netgate.com/ce/packages"} else export PKG_REPO_BRANCH_RELEASE=${PKG_REPO_BRANCH_RELEASE:-${POUDRIERE_BRANCH}} export PKG_REPO_BRANCH_DEVEL=${PKG_REPO_BRANCH_DEVEL:-${POUDRIERE_BRANCH}} export PKG_REPO_BRANCH_STAGING=${PKG_REPO_BRANCH_STAGING:-${PKG_REPO_BRANCH_DEVEL}} - export PKG_REPO_SERVER_STAGING=${PKG_REPO_SERVER_STAGING:-"pkg+http://beta.pfsense.org/packages"} fi # Command used to sign pkg repo |
