Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-11-25 14:27:26 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #292 from xenserver/master_revert_mk

Browse Source 
Resetting mk/ files (to pre-17-Dec-2014 state) in order to make master t...
This commit is contained in:
Gabor Apati-Nagy 2015-01-19 16:42:49 +00:00
commit df888942cb
4 changed files with 31 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mk/archive-push.sh
View File

@ -30,7 +30,7 @@
set -eu
#DISABLE_PUSH=1
DISABLE_PUSH=1
source "$( cd -P "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/declarations.sh"
if [ ${XS_BRANCH} = "trunk" ]

15
mk/bumpBuildNumber.sh
View File

@ -37,8 +37,15 @@ fi
source "$( cd -P "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/declarations.sh"
url="${JENKINS_URL}/job/${get_JOB_NAME}/"
if wget --no-check-certificate --secure-protocol=SSLv2 -nv --method=head "${url}"; then
if [ "${BUILD_KIND:+$BUILD_KIND}" = production ]
then
JENKINS_SERVER=http://tizon-1.xs.cbg.ccsi.eng.citrite.net:8080
else
JENKINS_SERVER=http://tocco.uk.xensource.com:8080
fi
url="${JENKINS_SERVER}/job/${get_JOB_NAME}/"
if curl -s --head --fail "${url}"; then
echo "URL exists: ${url}"
else
echo "URL does not exist: ${url}"
@ -49,8 +56,6 @@ NEXT_BN=$(curl "http://hg.uk.xensource.com/cgi/next-xenadmin?job=$get_JOB_NAME&n
echo NEXT_BN=${NEXT_BN}
set +x
wget --auth-no-challenge --http-user=user --http-password=$(cat ~/api.token) --no-check-certificate --secure-protocol=SSLv2 --post-data "nextBuildNumber=${NEXT_BN}" --header "Content-Type: application/x-www-form-urlencoded" ${JENKINS_URL}/job/${get_JOB_NAME}/nextbuildnumber/submit
curl --data "nextBuildNumber=${NEXT_BN}" --header "Content-Type: application/x-www-form-urlencoded" ${JENKINS_SERVER}/job/${get_JOB_NAME}/nextbuildnumber/submit
set +u
set -x

13
mk/declarations.sh
View File

@ -135,7 +135,7 @@ SCRATCH_DIR=${ROOT}/scratch
OUTPUT_DIR=${ROOT}/output
TEST_DIR=/cygdrive/c/cygwin/tmp
BUILD_ARCHIVE=${ROOT}/../builds/${get_BUILD_ID}/archive
SECURE_BUILD_ARCHIVE_UNC=//10.80.13.10/distfiles/distfiles/WindowsBuilds
SECURE_BUILD_ARCHIVE_UNC=//10.80.13.10/distfiles/distfiles/windowsbuilds/WindowsBuilds/$get_JOB_NAME/$BUILD_NUMBER/
#XENCENTER_LOGDIR="/cygdrive/c/Users/Administrator/AppData/Roaming/Citrix/XenCenter/logs"
XENCENTER_LOGDIR="/cygdrive/c/Citrix/XenCenter/logs"
@ -154,15 +154,8 @@ fi
WEB_XE_PHASE_1=${WEB_LATEST_BUILD}/xe-phase-1
WEB_XE_PHASE_2=${WEB_LATEST_BUILD}/xe-phase-2
# This is where the build will find stuff from the latest
# dotnet-packages build. Taking the latest build will mean that
# rebuilding old versions of xenadmin will break in surprising ways,
# because they will originally have been build with the latest version
# at the time. This is not the time to persuade the GUI group to
# change their ways, but I include this note as a public service for
# when it all breaks. --Peter, 2014-12-16.
DOTNET_BASE=${SECURE_BUILD_ARCHIVE_UNC}/carbon_creedence_dotnet-packages
DOTNET_LOC=$DOTNET_BASE/$(ls $DOTNET_BASE | /usr/bin/sort -n | tail -n 1)
#this is where the build will find stuff from the latest dotnet-packages build
WEB_DOTNET="http://localhost:8080/job/carbon_${XS_BRANCH}_dotnet-packages/lastSuccessfulBuild/artifact"
# used to copy results out of the secure build enclave
BUILD_TOOLS_REPO=git://admin/git/closed/windows/buildtools.git

37
mk/xenadmin-build.sh
View File

@ -34,10 +34,7 @@ set -eu
source "$( cd -P "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/declarations.sh"
WGET_OPT="-q -N --no-check-certificate --secure-protocol=SSLv2"
WGET_VERBOSE_OPT="-N --no-check-certificate --secure-protocol=SSLv2"
WGET_OPT="-q ${WGET_VERBOSE_OPT}"
WGET_OPT="-q -N"
UNZIP="unzip -q -o"
mkdir_clean()
@ -96,22 +93,17 @@ SHARPZIPLIB_DIR=${REPO}/sharpziplib/bin
DISCUTILS_DIR=${REPO}/DiscUtils/src/bin/Release
MICROSOFT_DOTNET_FRAMEWORK_INSTALLER_DIR=${REPO}/dotNetFx40_Full_setup
cp ${DOTNET_LOC}/manifest ${SCRATCH_DIR}/dotnet-packages-manifest
mkdir_clean ${XMLRPC_DIR} && cp ${DOTNET_LOC}/CookComputing.XmlRpcV2.dll ${XMLRPC_DIR}
mkdir_clean ${LOG4NET_DIR} && cp ${DOTNET_LOC}/log4net.dll ${LOG4NET_DIR}
mkdir_clean ${SHARPZIPLIB_DIR} && cp ${DOTNET_LOC}/ICSharpCode.SharpZipLib.dll ${SHARPZIPLIB_DIR}
mkdir_clean ${DOTNETZIP_DIR} && cp ${DOTNET_LOC}/Ionic.Zip.dll ${DOTNETZIP_DIR}
mkdir_clean ${DISCUTILS_DIR} && cp ${DOTNET_LOC}/DiscUtils.dll ${DISCUTILS_DIR}
mkdir_clean ${MICROSOFT_DOTNET_FRAMEWORK_INSTALLER_DIR} && cp ${DOTNET_LOC}/dotNetFx40_Full_setup.exe ${MICROSOFT_DOTNET_FRAMEWORK_INSTALLER_DIR}
wget ${WGET_OPT} ${WEB_DOTNET}/manifest -O ${SCRATCH_DIR}/dotnet-packages-manifest
mkdir_clean ${XMLRPC_DIR} && wget ${WGET_OPT} ${WEB_DOTNET}/CookComputing.XmlRpcV2.dll -P ${XMLRPC_DIR}
mkdir_clean ${LOG4NET_DIR} && wget ${WGET_OPT} ${WEB_DOTNET}/log4net.dll -P ${LOG4NET_DIR}
mkdir_clean ${SHARPZIPLIB_DIR} && wget ${WGET_OPT} ${WEB_DOTNET}/ICSharpCode.SharpZipLib.dll -P ${SHARPZIPLIB_DIR}
mkdir_clean ${DOTNETZIP_DIR} && wget ${WGET_OPT} ${WEB_DOTNET}/Ionic.Zip.dll -P ${DOTNETZIP_DIR}
mkdir_clean ${DISCUTILS_DIR} && wget ${WGET_OPT} ${WEB_DOTNET}/DiscUtils.dll -P ${DISCUTILS_DIR}
mkdir_clean ${MICROSOFT_DOTNET_FRAMEWORK_INSTALLER_DIR} && wget ${WGET_OPT} ${WEB_DOTNET}/dotNetFx40_Full_setup.exe -P ${MICROSOFT_DOTNET_FRAMEWORK_INSTALLER_DIR}
#<<<<<<< HEAD
#temporarily disabling signing
#wget ${WGET_OPT} ${WEB_DOTNET}/sign.bat -P ${REPO} && chmod a+x ${REPO}/sign.bat
#echo @echo signing disabled > ${REPO}/sign.bat && chmod a+x ${REPO}/sign.bat
#=======
#
cp ${DOTNET_LOC}/sign.bat ${REPO} && chmod a+x ${REPO}/sign.bat
#>>>>>>> master
echo @echo signing disabled > ${REPO}/sign.bat && chmod a+x ${REPO}/sign.bat
#bring in stuff from xencenter-ovf latest xe-phase-1
wget ${WGET_OPT} ${WEB_XE_PHASE_1}/XenCenterOVF.zip -P ${SCRATCH_DIR}
@ -121,7 +113,7 @@ ${UNZIP} -d ${REPO}/XenOvfApi ${SCRATCH_DIR}/XenCenterOVF.zip
wget ${WGET_OPT} ${WEB_XE_PHASE_1}/manifest -O ${SCRATCH_DIR}/xe-phase-1-manifest
#bring XenServer.NET from latest xe-phase-2
wget ${WGET_VERBOSE_OPT} ${WEB_XE_PHASE_2}/XenServer-SDK.zip -P ${REPO} && ${UNZIP} -j ${REPO}/XenServer-SDK.zip XenServer-SDK/XenServer.NET/bin/XenServer.dll XenServer-SDK/XenServer.NET/bin/CookComputing.XmlRpcV2.dll -d ${REPO}/XenServer.NET
wget ${WGET_OPT} ${WEB_XE_PHASE_2}/XenServer-SDK.zip -P ${REPO} && ${UNZIP} -j ${REPO}/XenServer-SDK.zip XenServer-SDK/XenServer.NET/bin/XenServer.dll XenServer-SDK/XenServer.NET/bin/CookComputing.XmlRpcV2.dll -d ${REPO}/XenServer.NET
#bring in some more libraries
mkdir_clean ${REPO}/NUnit && wget ${WEB_LIB}/{nunit.framework.dll,Moq_dotnet4.dll} -P ${REPO}/NUnit
@ -420,7 +412,7 @@ rm -rf ${OUTPUT_DIR}/PACKAGES.main/opt
#bring in the pdbs from dotnet-packages latest build
for pdb in CookComputing.XmlRpcV2.pdb DiscUtils.pdb ICSharpCode.SharpZipLib.pdb Ionic.Zip.pdb log4net.pdb
do
cp ${DOTNET_LOC}/${pdb} ${OUTPUT_DIR}
wget ${WGET_OPT} ${WEB_DOTNET}/${pdb} -P ${OUTPUT_DIR}
done
#create manifest
@ -430,7 +422,12 @@ cat ${SCRATCH_DIR}/xe-phase-1-manifest | grep xencenter-ovf >> ${OUTPUT_DIR}/man
cat ${SCRATCH_DIR}/xe-phase-1-manifest | grep chroot-lenny >> ${OUTPUT_DIR}/manifest
cat ${SCRATCH_DIR}/xe-phase-1-manifest | grep branding >> ${OUTPUT_DIR}/manifest
cat ${SCRATCH_DIR}/dotnet-packages-manifest >> ${OUTPUT_DIR}/manifest
echo /usr/groups/xen/carbon/windowsbuilds/WindowsBuilds/${get_JOB_NAME}/${BUILD_NUMBER} >> ${OUTPUT_DIR}/latest-successful-build
if [ "${BUILD_KIND:+$BUILD_KIND}" = production ]
then
echo ${get_BUILD_URL} >> ${OUTPUT_DIR}/latest-secure-build
else
echo ${get_BUILD_URL} >> ${OUTPUT_DIR}/latest-successful-build
fi
echo "Build phase succeeded at "
date