@@ -103,18 +103,56 @@ build_re_weekly(){
103103 clean_and_zip_workspace
104104}
105105
106+ init_weekly (){
107+ BUILD_KIND=" weekly"
108+ require_env_var " GPG_PASSPHRASE"
109+
110+ ARCHIVE_PATH=${PRODUCT_GF} /${PRODUCT_VERSION_GF}
111+ if [ ${# BUILD_ID} -gt 0 ]
112+ then
113+ ARCHIVE_PATH=${ARCHIVE_PATH} /promoted
114+ else
115+ ARCHIVE_PATH=${ARCHIVE_PATH} /release
116+ fi
117+ ARCHIVE_MASTER_BUNDLES=${ARCHIVE_PATH} /${BUILD_ID} /archive/bundles
118+ export BUILD_ID BUILD_KIND ARCHIVE_PATH ARCHIVE_MASTER_BUNDLES
119+ init_bundles_dir
120+ init_version
121+ }
122+
123+ init_nightly (){
124+ BUILD_KIND=" nightly"
125+ ARCHIVE_PATH=${PRODUCT_GF} /${PRODUCT_VERSION_GF} /nightly
126+ ARCHIVE_MASTER_BUNDLES=${ARCHIVE_PATH} /${BUILD_ID} -${MDATE}
127+ export BUILD_KIND ARCHIVE_PATH ARCHIVE_MASTER_BUNDLES
128+ init_bundles_dir
129+ init_version
130+ NIGHTLY_PROMOTED_JOB=" ${HUDSON_URL} /job/${PROMOTED_JOB_NAME} /api/xml?xpath=//lastStableBuild/url/text()"
131+ NIGHTLY_PROMOTED_JOB_URL=` curl $NIGHTLY_PROMOTED_JOB `
132+ NIGHTLY_PROMOTED_BUNDLES=" ${NIGHTLY_PROMOTED_JOB_URL} artifact/bundles"
133+ export NIGHTLY_PROMOTED_BUNDLES
134+ }
135+
106136promote_init (){
107137 init_common
108- init_weekly
138+ if [ " nightly" == " ${1} " ]
139+ then
140+ init_nightly
141+ elif [ " weekly" == " ${1} " ]
142+ then
143+ init_weekly
144+ fi
145+
109146 export PROMOTION_SUMMARY=${WORKSPACE_BUNDLES} /${BUILD_KIND} -promotion-summary.txt
110- rm -f ${ PROMOTION_SUMMARY}
147+ rm -f $PROMOTION_SUMMARY
111148 export JNET_DIR=${JNET_USER} @${JNET_STORAGE_HOST} :/dlc/${ARCHIVE_PATH}
112149 export JNET_DIR_HTTP=http://download.java.net/${ARCHIVE_PATH}
113150 export ARCHIVE_STORAGE_BUNDLES=/java/re/${ARCHIVE_MASTER_BUNDLES}
114151 export SSH_MASTER=${RE_USER} @${HUDSON_MASTER_HOST}
115152 export SSH_STORAGE=${RE_USER} @${STORAGE_HOST}
116153 export SCP=${SSH_STORAGE} :${ARCHIVE_STORAGE_BUNDLES}
117154 export ARCHIVE_URL=http://${STORAGE_HOST_HTTP} /java/re/${ARCHIVE_MASTER_BUNDLES}
155+
118156 init_storage_area
119157}
120158
@@ -154,11 +192,25 @@ promote_weekly(){
154192 promote_finalize
155193}
156194
157- promote_dev (){
158- BUILD_KIND=" dev"
159- init_common
160- mkdir -p ${WORKSPACE} /dev-bundles
161- curl ${PROMOTED_BUNDLES} /version-info.txt > ${WORKSPACE} /dev-bundles/version-info.txt
195+ promote_nightly (){
196+ promote_init " nightly"
197+ promote_bundle ${PROMOTED_BUNDLES} /web.zip ${PRODUCT_GF} -${PRODUCT_VERSION_GF} -web-${BUILD_ID} -${MDATE} .zip
198+ promote_bundle ${PROMOTED_BUNDLES} /glassfish.zip ${PRODUCT_GF} -${PRODUCT_VERSION_GF} -${BUILD_ID} -${MDATE} .zip
199+ promote_bundle ${PROMOTED_BUNDLES} /nucleus-new.zip nucleus-${PRODUCT_VERSION_GF} -${BUILD_ID} -${MDATE} .zip
200+ promote_bundle ${PROMOTED_BUNDLES} /version-info.txt version-info-${PRODUCT_VERSION_GF} -${BUILD_ID} -${MDATE} .txt
201+ promote_bundle ${PROMOTED_BUNDLES} /changes.txt changes-${PRODUCT_VERSION_GF} -${BUILD_ID} -${MDATE} .txt
202+ VERSION_INFO=" ${WORKSPACE_BUNDLES} /version-info-${PRODUCT_VERSION_GF} -${BUILD_ID} -${MDATE} .txt"
203+ SVN_REVISION=` head -1 ${VERSION_INFO} | awk ' {print $2}' `
204+ # record_svn_rev ${SVN_REVISION}
205+ purge_old_nightlies
206+ # hook for the docker image of the nightly
207+ curl -H " Content-Type: application/json" \
208+ --data ' {"build": true}' \
209+ -X POST \
210+ -k \
211+ https://registry.hub.docker.com/u/glassfish/nightly/trigger/945d55fc-1d4c-4043-8221-74185d9a4d53/
212+ ssh $SSH_MASTER ` echo " echo $SVN_REVISION > /scratch/java_re/hudson/hudson_install/last_promoted_nightly_scm_revision" `
213+ promote_finalize
162214}
163215
164216init_weekly (){
@@ -193,9 +245,6 @@ init_common(){
193245 PRODUCT_VERSION_GF=$PRODUCT_VERSION_GF .${MICRO_VERSION}
194246 fi
195247
196- PROMOTED_JOB_URL=${HUDSON_URL} /job/${PROMOTED_JOB_NAME} /${PROMOTED_NUMBER}
197- PROMOTED_BUNDLES=${PROMOTED_JOB_URL} /artifact/bundles/
198-
199248 IPS_REPO_URL=http://localhost
200249 IPS_REPO_DIR=${WORKSPACE} /promorepo
201250 IPS_REPO_PORT=16500
0 commit comments