mirror of
https://github.com/xcp-ng/xenadmin.git
synced 2025-01-20 07:19:18 +01:00
Merge pull request #1259 from kc284/master
Changes for CP-18097 and some removal of obsolete code.
This commit is contained in:
Gabor Apati-Nagy
GitHub
commit
4087365afb
@ -30,36 +30,12 @@
|
||||
|
||||
set -eu
|
||||
|
||||
DISABLE_PUSH=1
|
||||
source "$( cd -P "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/declarations.sh"
|
||||
|
||||
source ${XENADMIN_DIR}/mk/copy-build-output.sh
|
||||
|
||||
if [ ${XS_BRANCH} = "trunk" ]
|
||||
then
|
||||
TRUNK_COLOUR=$(sh ${REPO}/mk/colour.sh)
|
||||
TRUNK_COLOUR_L=$(echo ${TRUNK_COLOUR} | tr [:upper:] [:lower:])
|
||||
if [ ${TRUNK_COLOUR_L} != "green" ]
|
||||
then
|
||||
echo "trunk is not green, disabling push"
|
||||
DISABLE_PUSH=1
|
||||
fi
|
||||
fi
|
||||
|
||||
#update local xenadmin-ref.hg repository
|
||||
cp ${OUTPUT_DIR}/{manifest,latest-*-build,xcversion} ${ROOT}/xenadmin-ref.hg
|
||||
cd ${ROOT}/xenadmin-ref.hg && hg commit -u Jenkins -m "Latest successful build ${get_BUILD_ID}"
|
||||
|
||||
if [ ${XS_BRANCH} = "trunk" ]
|
||||
then
|
||||
echo "Pushes are disabled on trunk."
|
||||
else
|
||||
if [ -z "${DISABLE_PUSH+xxx}" ]
|
||||
then
|
||||
cd ${ROOT}/xenadmin-ref.hg && hg push
|
||||
else
|
||||
echo "pushing to ssh://hg has been disabled"
|
||||
fi
|
||||
fi
|
||||
|
||||
set +u
|
||||
|
||||
54
mk/colour.sh
54
mk/colour.sh
@ -1,54 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
# Copyright (c) Citrix Systems Inc.
|
||||
# All rights reserved.
|
||||
#
|
||||
# Redistribution and use in source and binary forms,
|
||||
# with or without modification, are permitted provided
|
||||
# that the following conditions are met:
|
||||
#
|
||||
# * Redistributions of source code must retain the above
|
||||
# copyright notice, this list of conditions and the
|
||||
# following disclaimer.
|
||||
# * Redistributions in binary form must reproduce the above
|
||||
# copyright notice, this list of conditions and the
|
||||
# following disclaimer in the documentation and/or other
|
||||
# materials provided with the distribution.
|
||||
#
|
||||
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
|
||||
# CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
|
||||
# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||
# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||
# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
|
||||
# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
||||
# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
||||
# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||
# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
||||
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
|
||||
# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
# SUCH DAMAGE.
|
||||
|
||||
#####################################
|
||||
# Determine the colour of the trunk #
|
||||
#####################################
|
||||
|
||||
#Setup:
|
||||
ROOTURL=https://xenbuilder.uk.xensource.com
|
||||
DEFAULT_OUTPUT=Red
|
||||
|
||||
#Get the cookie
|
||||
curl -n -s -k $ROOTURL/plainlogin -o /dev/null -c /tmp/cookie$$
|
||||
|
||||
#If this fails then declare the trunk red as there is a problem with the server
|
||||
#otherwise try to work out the actual color of the trunk
|
||||
if [ $? -ne 0 ]; then
|
||||
echo $DEFAULT_OUTPUT
|
||||
exit 1
|
||||
else
|
||||
curl -n -s -k $ROOTURL/ -o - -b /tmp/cookie$$ | sed -ne 's/.*Trunk is.*\(Green\|Red\|Orange\).*/\1/Ip'
|
||||
rm /tmp/cookie$$
|
||||
fi
|
||||
|
||||
exit 0
|
||||
@ -1,65 +0,0 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<project>
|
||||
<actions/>
|
||||
<description></description>
|
||||
<logRotator>
|
||||
<daysToKeep>-1</daysToKeep>
|
||||
<numToKeep>30</numToKeep>
|
||||
<artifactDaysToKeep>-1</artifactDaysToKeep>
|
||||
<artifactNumToKeep>-1</artifactNumToKeep>
|
||||
</logRotator>
|
||||
<keepDependencies>false</keepDependencies>
|
||||
<properties/>
|
||||
<scm class="hudson.plugins.mercurial.MercurialSCM">
|
||||
<source>http://hg.uk.xensource.com/carbon/trunk/xenadmin.hg/</source>
|
||||
<modules></modules>
|
||||
<subdir>xenadmin.hg</subdir>
|
||||
<clean>true</clean>
|
||||
<forest>false</forest>
|
||||
<browser class="hudson.plugins.mercurial.browser.HgWeb">
|
||||
<url>http://hg.uk.xensource.com/carbon/trunk/xenadmin.hg/</url>
|
||||
</browser>
|
||||
</scm>
|
||||
<quietPeriod>300</quietPeriod>
|
||||
<canRoam>true</canRoam>
|
||||
<disabled>false</disabled>
|
||||
<blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
|
||||
<blockBuildWhenUpstreamBuilding>true</blockBuildWhenUpstreamBuilding>
|
||||
<triggers class="vector">
|
||||
<hudson.triggers.SCMTrigger>
|
||||
<spec>0-59/2 * * * *</spec>
|
||||
</hudson.triggers.SCMTrigger>
|
||||
</triggers>
|
||||
<concurrentBuild>false</concurrentBuild>
|
||||
<builders>
|
||||
<hudson.tasks.Shell>
|
||||
<command>xenadmin.hg/mk/bumpBuildNumber.sh</command>
|
||||
</hudson.tasks.Shell>
|
||||
<hudson.tasks.Shell>
|
||||
<command>xenadmin.hg/devtools/check-roaming.sh && xenadmin.hg/devtools/i18ncheck/i18ncheck.sh && xenadmin.hg/devtools/deadcheck/deadcheck.sh && xenadmin.hg/devtools/spellcheck/spellcheck.sh</command>
|
||||
</hudson.tasks.Shell>
|
||||
<hudson.tasks.Shell>
|
||||
<command>xenadmin.hg/mk/xenadmin-build.sh</command>
|
||||
</hudson.tasks.Shell>
|
||||
<hudson.tasks.Shell>
|
||||
<command>xenadmin.hg/mk/tests-checks.sh</command>
|
||||
</hudson.tasks.Shell>
|
||||
<hudson.tasks.Shell>
|
||||
<command>xenadmin.hg/mk/archive-push.sh</command>
|
||||
</hudson.tasks.Shell>
|
||||
</builders>
|
||||
<publishers>
|
||||
<hudson.plugins.nunit.NUnitPublisher>
|
||||
<testResultsPattern>output/XenAdminTests.xml</testResultsPattern>
|
||||
<debug>false</debug>
|
||||
<keepJUnitReports>false</keepJUnitReports>
|
||||
<skipJUnitArchiver>false</skipJUnitArchiver>
|
||||
</hudson.plugins.nunit.NUnitPublisher>
|
||||
<hudson.tasks.Mailer>
|
||||
<recipients>#xencenter@citrite.net</recipients>
|
||||
<dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
|
||||
<sendToIndividuals>true</sendToIndividuals>
|
||||
</hudson.tasks.Mailer>
|
||||
</publishers>
|
||||
<buildWrappers/>
|
||||
</project>
|
||||
@ -275,6 +275,9 @@ mkdir_clean ${ISO_DIR}
|
||||
install -m 755 ${EN_CD_DIR}/${BRANDING_BRAND_CONSOLE}Setup.exe ${ISO_DIR}/${BRANDING_BRAND_CONSOLE}Setup.exe
|
||||
cp ${REPO}/mk/ISO_files/* ${ISO_DIR}
|
||||
cp ${EN_CD_DIR}/${BRANDING_BRAND_CONSOLE}.ico ${ISO_DIR}/${BRANDING_BRAND_CONSOLE}.ico
|
||||
#CP-18097
|
||||
mkdir_clean ${OUTPUT_DIR}/installer
|
||||
tar cjf ${OUTPUT_DIR}/installer/${BRANDING_BRAND_CONSOLE}.installer.tar.bz2 -C ${ISO_DIR} .
|
||||
mkisofs -J -r -v -publisher "${BRANDING_COMPANY_NAME_LEGAL}" -p "${BRANDING_COMPANY_NAME_LEGAL}" -V "${BRANDING_BRAND_CONSOLE}" -o "${OUTPUT_DIR}/${BRANDING_BRAND_CONSOLE}.iso" "${ISO_DIR}"
|
||||
|
||||
echo "INFO: Create l10n iso file"
|
||||
@ -284,6 +287,9 @@ mkdir_clean ${L10N_ISO_DIR}
|
||||
install -m 755 ${L10N_CD_DIR}/${BRANDING_BRAND_CONSOLE}Setup.l10n.exe ${L10N_ISO_DIR}/${BRANDING_BRAND_CONSOLE}Setup.exe
|
||||
cp ${REPO}/mk/ISO_files/* ${L10N_ISO_DIR}
|
||||
cp ${EN_CD_DIR}/${BRANDING_BRAND_CONSOLE}.ico ${L10N_ISO_DIR}/${BRANDING_BRAND_CONSOLE}.ico
|
||||
#CP-18097
|
||||
mkdir_clean ${OUTPUT_DIR}/installer.l10n
|
||||
tar cjf ${OUTPUT_DIR}/installer.l10n/${BRANDING_BRAND_CONSOLE}.installer.l10n.tar.bz2 -C ${L10N_ISO_DIR} .
|
||||
mkisofs -J -r -v -publisher "${BRANDING_COMPANY_NAME_LEGAL}" -p "${BRANDING_COMPANY_NAME_LEGAL}" -V "${BRANDING_BRAND_CONSOLE}" -o "${OUTPUT_DIR}/${BRANDING_BRAND_CONSOLE}.l10n.iso" "${L10N_ISO_DIR}"
|
||||
|
||||
# Create a tarball containing the XenCenter ISO, to be installed by the host installer
|
||||
|
||||
Loading…
Reference in New Issue
Block a user