[
https://issues.jboss.org/browse/JBIDE-18742?page=com.atlassian.jira.plugi...
]
Mickael Istria commented on JBIDE-18742:
----------------------------------------
Well, I guess it would work, because the change I have in mind is just to replace
{code}
# @nick commented this out on 2015-03-12 because process never completes (even with vnc) -
build is stalled for over an hour :(
# use 64- or 32-bit version depending on slave's uname
#p2diff=/home/hudson/static_build_env/jbds/tools/p2diff$(uname -a | grep "64" |
sed -s "s#.*\(64\).*#_\1#")
#rm -f p2diff_snapshot
#${p2diff} file:${WORKSPACE}/sources/aggregate/site/target/repository/
http://download.jboss.org/jbosstools/mars/snapshots/builds/${JOB_NAME}/la... |
grep -e ^\< -e ^\> > p2diff_snapshot
#if [[ -s p2diff_snapshot ]]; then
# echo "Will publish: p2diff detected changes"
# export skipRevisionCheckWhenPublishing=true
#fi
if [[ ${skipRevisionCheckWhenPublishing} == "true" ]] || [[ $(.
${WORKSPACE}/sources/util/checkLatestPublishedSHA.sh -s
${WORKSPACE}/sources/aggregate/site/target/fullSite/all/repo -t
http://download.jboss.org/jbosstools/mars/snapshots/builds/${JOB_NAME}/la...)
== "true" ]]; then
. ${WORKSPACE}/sources/publish/rsync.sh -s
${WORKSPACE}/sources/aggregate/site/target/fullSite -t
mars/snapshots/builds/${JOB_NAME}/${BUILD_ID}-B${BUILD_NUMBER}
. ${WORKSPACE}/sources/publish/rsync.sh -s
${WORKSPACE}/sources/aggregate/site/target/fullSite/all/repo -t
mars/snapshots/updates/core/${jbosstools_site_stream}
else
echo "Publish cancelled (nothing to do). Skip this check with
skipRevisionCheckWhenPublishing=true"
BUILD_DESCRIPTION="NOT PUBLISHED: UNCHANGED"
fi
{code}
with its subpart
{code}
. ${WORKSPACE}/sources/publish/rsync.sh -s
${WORKSPACE}/sources/aggregate/site/target/fullSite -t
mars/snapshots/builds/${JOB_NAME}/${BUILD_ID}-B${BUILD_NUMBER}
. ${WORKSPACE}/sources/publish/rsync.sh -s
${WORKSPACE}/sources/aggregate/site/target/fullSite/all/repo -t
mars/snapshots/updates/core/${jbosstools_site_stream}
{code}
Ie removing all checks because rsync is a lazy enough operation to not guard it.
Only rely on rsync to publish new aggregate (remove other comparators
and checks)
---------------------------------------------------------------------------------
Key: JBIDE-18742
URL:
https://issues.jboss.org/browse/JBIDE-18742
Project: Tools (JBoss Tools)
Issue Type: Enhancement
Components: build
Reporter: Mickael Istria
Assignee: Mickael Istria
Fix For: 4.3.0.Beta1
Instead of the composite-install test to decide whether we aggregate or not, it would be
simpler to build aggregation in any case and then use p2diff (or other smart mechanism) to
decide whether we want to publish the new composite or not.
It's more or less just a matter of scripting
{code:none}
p2diff file:${WORKSPACE}/results/${JOB_NAME}/all/repo/
http://download.jboss.org/jbosstools/builds/staging/${JOB_NAME}/all/repo/ | grep -e ^\<
-e ^\> > p2diff_snapshot
if [[ -s p2diff_snapshot ]]; then
./publish.sh
fi
{code}
Another benefit is that it allows us to get rid of the composite (1 less couple of files
to maintain)
--
This message was sent by Atlassian JIRA
(v6.3.15#6346)