From 8324c5b29fd40c72e4ddee0cc687452433e647ea Mon Sep 17 00:00:00 2001 From: Axel Richard Date: Tue, 19 Apr 2016 09:10:05 +0200 Subject: [PATCH] [RCPTT Tests] simplify create AUT shell script Change-Id: I227bb6fa43f4cd55d886c3aa85d4933815c7c623 Signed-off-by: Axel Richard --- .../createAUT.sh | 149 +++++++++++---------- 1 file changed, 76 insertions(+), 73 deletions(-) diff --git a/plugins/org.eclipse.emf.compare.rcptt.tests/createAUT.sh b/plugins/org.eclipse.emf.compare.rcptt.tests/createAUT.sh index d6f150b6d..bee10371d 100644 --- a/plugins/org.eclipse.emf.compare.rcptt.tests/createAUT.sh +++ b/plugins/org.eclipse.emf.compare.rcptt.tests/createAUT.sh @@ -32,28 +32,31 @@ else fi PLATFORM_SPECIFIER="${OSWS}.${ARCH}" - -P2_ADMIN_VERSION="1.1.0" -P2_ADMIN_ZIPNAME="p2-admin-${P2_ADMIN_VERSION}-${PLATFORM_SPECIFIER}.${FILE_EXT}" -P2_ADMIN_URL="https://github.com/mbarbero/p2-admin/releases/download/v${P2_ADMIN_VERSION}/${P2_ADMIN_ZIPNAME}" -P2_ADMIN_ZIPPATH=$workdir/$P2_ADMIN_ZIPNAME -P2_ADMIN_PATH=$workdir/p2-admin - -if [[ ! -f "$P2_ADMIN_ZIPPATH" ]]; then - echo "Downloading $P2_ADMIN_URL" - wget --no-check-certificate -q $P2_ADMIN_URL -O - > $P2_ADMIN_ZIPPATH -fi - -if [[ -d $P2_ADMIN_PATH ]]; then - echo "Removing old p2-admin folder" - rm -rf "p2-admin" -fi -echo "Unzipping $P2_ADMIN_ZIPNAME" -if [[ "$FILE_EXT" == "zip" ]]; then - unzip -q "$P2_ADMIN_ZIPPATH" -d $workdir -else - tar zxf "$P2_ADMIN_ZIPPATH" -C $workdir -fi +###################################################################### +#We do not use profiles that need p2-admin anymore +#Uncomment if you need mars, luna or kepler profile ($simrel) +###################################################################### +#P2_ADMIN_VERSION="1.1.0" +#P2_ADMIN_ZIPNAME="p2-admin-${P2_ADMIN_VERSION}-${PLATFORM_SPECIFIER}.${FILE_EXT}" +#P2_ADMIN_URL="https://github.com/mbarbero/p2-admin/releases/download/v${P2_ADMIN_VERSION}/${P2_ADMIN_ZIPNAME}" +#P2_ADMIN_ZIPPATH=$workdir/$P2_ADMIN_ZIPNAME +#P2_ADMIN_PATH=$workdir/p2-admin +# +#if [[ ! -f "$P2_ADMIN_ZIPPATH" ]]; then +# echo "Downloading $P2_ADMIN_URL" +# wget --no-check-certificate -q $P2_ADMIN_URL -O - > $P2_ADMIN_ZIPPATH +#fi +# +#if [[ -d $P2_ADMIN_PATH ]]; then +# echo "Removing old p2-admin folder" +# rm -rf "p2-admin" +#fi +#echo "Unzipping $P2_ADMIN_ZIPNAME" +#if [[ "$FILE_EXT" == "zip" ]]; then +# unzip -q "$P2_ADMIN_ZIPPATH" -d $workdir +#else +# tar zxf "$P2_ADMIN_ZIPPATH" -C $workdir +#fi if [[ "$simrel" == "collaborative-modeling-luna"* ]]; then simrel_zip_name="Collaborative-Modeling-Luna-${PLATFORM_SHORT_SPECIFIER}.${FILE_EXT}" @@ -65,51 +68,51 @@ elif [[ "$simrel" == "collaborative-modeling"* ]]; then simrel_zip_url="http://download.eclipse.org/modeling/emf/compare/collaborative-modeling-package/nightly/$simrel_zip_name" p2_repositories="" p2_installIUs="" -elif [[ "$simrel" == "mars"* ]]; then - simrel_zip_name="eclipse-SDK-4.5-${PLATFORM_SHORT_SPECIFIER}.${FILE_EXT}" - simrel_zip_url="http://download.eclipse.org/eclipse/downloads/drops4/R-4.5-201506032000/$simrel_zip_name" - p2_repositories="http://download.eclipse.org/releases/mars/,\ -http://download.eclipse.org/modeling/emf/compare/updates/nightly/latest/,\ -http://download.eclipse.org/modeling/emf/compare/updates/egit-logical/nightly/" - p2_installIUs="org.eclipse.emf.compare.ide.ui.feature.group,\ -org.eclipse.egit.feature.group,\ -org.eclipse.emf.sdk.feature.group,\ -org.eclipse.uml2.uml.feature.group,\ -org.eclipse.papyrus.sdk.feature.feature.group,\ -org.eclipse.emf.compare.uml2.feature.group,\ -org.eclipse.emf.compare.diagram.gmf.feature.group,\ -org.eclipse.emf.compare.diagram.papyrus.feature.group,\ -org.eclipse.emf.compare.egit.feature.group" -elif [[ "$simrel" == "luna"* ]]; then - simrel_zip_name="eclipse-SDK-4.4.2-${PLATFORM_SHORT_SPECIFIER}.${FILE_EXT}" - simrel_zip_url="http://download.eclipse.org/eclipse/downloads/drops4/R-4.4.2-201502041700/$simrel_zip_name" - p2_repositories="http://download.eclipse.org/releases/luna/,\ -http://download.eclipse.org/modeling/emf/compare/updates/nightly/latest/,\ -http://download.eclipse.org/modeling/emf/compare/updates/egit-logical/nightly/" - p2_installIUs="org.eclipse.emf.compare.ide.ui.feature.group,\ -org.eclipse.egit.feature.group,\ -org.eclipse.emf.sdk.feature.group,\ -org.eclipse.uml2.uml.feature.group,\ -org.eclipse.papyrus.sdk.feature.feature.group,\ -org.eclipse.emf.compare.uml2.feature.group,\ -org.eclipse.emf.compare.diagram.gmf.feature.group,\ -org.eclipse.emf.compare.diagram.papyrus.feature.group,\ -org.eclipse.emf.compare.egit.feature.group" -elif [[ "$simrel" == "kepler"* ]]; then - simrel_zip_name="eclipse-SDK-4.3.2-${PLATFORM_SHORT_SPECIFIER}.${FILE_EXT}" - simrel_zip_url="http://archive.eclipse.org/eclipse/downloads/drops4/R-4.3.2-201402211700/$simrel_zip_name" - p2_repositories="http://download.eclipse.org/releases/kepler/,\ -http://download.eclipse.org/releases/luna/,\ -http://download.eclipse.org/modeling/emf/compare/updates/nightly/latest/,\ -http://download.eclipse.org/modeling/emf/compare/updates/egit-logical/nightly/" - p2_installIUs="org.eclipse.emf.compare.ide.ui.feature.group,\ -org.eclipse.egit.feature.group,\ -org.eclipse.emf.sdk.feature.group,\ -org.eclipse.uml2.uml.feature.group,\ -org.eclipse.papyrus.uml.feature.feature.group,\ -org.eclipse.emf.compare.uml2.feature.group,\ -org.eclipse.emf.compare.diagram.gmf.feature.group,\ -org.eclipse.emf.compare.diagram.papyrus.feature.group" +#elif [[ "$simrel" == "mars"* ]]; then +# simrel_zip_name="eclipse-SDK-4.5-${PLATFORM_SHORT_SPECIFIER}.${FILE_EXT}" +# simrel_zip_url="http://download.eclipse.org/eclipse/downloads/drops4/R-4.5-201506032000/$simrel_zip_name" +# p2_repositories="http://download.eclipse.org/releases/mars/,\ +#http://download.eclipse.org/modeling/emf/compare/updates/nightly/latest/,\ +#http://download.eclipse.org/modeling/emf/compare/updates/egit-logical/nightly/" +# p2_installIUs="org.eclipse.emf.compare.ide.ui.feature.group,\ +#org.eclipse.egit.feature.group,\ +#org.eclipse.emf.sdk.feature.group,\ +#org.eclipse.uml2.uml.feature.group,\ +#org.eclipse.papyrus.sdk.feature.feature.group,\ +#org.eclipse.emf.compare.uml2.feature.group,\ +#org.eclipse.emf.compare.diagram.gmf.feature.group,\ +#org.eclipse.emf.compare.diagram.papyrus.feature.group,\ +#org.eclipse.emf.compare.egit.feature.group" +#elif [[ "$simrel" == "luna"* ]]; then +# simrel_zip_name="eclipse-SDK-4.4.2-${PLATFORM_SHORT_SPECIFIER}.${FILE_EXT}" +# simrel_zip_url="http://download.eclipse.org/eclipse/downloads/drops4/R-4.4.2-201502041700/$simrel_zip_name" +# p2_repositories="http://download.eclipse.org/releases/luna/,\ +#http://download.eclipse.org/modeling/emf/compare/updates/nightly/latest/,\ +#http://download.eclipse.org/modeling/emf/compare/updates/egit-logical/nightly/" +# p2_installIUs="org.eclipse.emf.compare.ide.ui.feature.group,\ +#org.eclipse.egit.feature.group,\ +#org.eclipse.emf.sdk.feature.group,\ +#org.eclipse.uml2.uml.feature.group,\ +#org.eclipse.papyrus.sdk.feature.feature.group,\ +#org.eclipse.emf.compare.uml2.feature.group,\ +#org.eclipse.emf.compare.diagram.gmf.feature.group,\ +#org.eclipse.emf.compare.diagram.papyrus.feature.group,\ +#org.eclipse.emf.compare.egit.feature.group" +#elif [[ "$simrel" == "kepler"* ]]; then +# simrel_zip_name="eclipse-SDK-4.3.2-${PLATFORM_SHORT_SPECIFIER}.${FILE_EXT}" +# simrel_zip_url="http://archive.eclipse.org/eclipse/downloads/drops4/R-4.3.2-201402211700/$simrel_zip_name" +# p2_repositories="http://download.eclipse.org/releases/kepler/,\ +#http://download.eclipse.org/releases/luna/,\ +#http://download.eclipse.org/modeling/emf/compare/updates/nightly/latest/,\ +#http://download.eclipse.org/modeling/emf/compare/updates/egit-logical/nightly/" +# p2_installIUs="org.eclipse.emf.compare.ide.ui.feature.group,\ +#org.eclipse.egit.feature.group,\ +#org.eclipse.emf.sdk.feature.group,\ +#org.eclipse.uml2.uml.feature.group,\ +#org.eclipse.papyrus.uml.feature.feature.group,\ +#org.eclipse.emf.compare.uml2.feature.group,\ +#org.eclipse.emf.compare.diagram.gmf.feature.group,\ +#org.eclipse.emf.compare.diagram.papyrus.feature.group" else echo "Unknown 'simrel'=$simrel." exit 1 @@ -157,9 +160,9 @@ if [[ -d "$simrel_path/Collaborative-Modeling-Luna-${PLATFORM_SHORT_SPECIFIER}" mv "$simrel_path/Collaborative-Modeling-Luna-${PLATFORM_SHORT_SPECIFIER}" "$simrel_path/eclipse" fi -echo "Provisioning AUT" -echo " Repositories: $p2_repositories" -echo " IUs: $p2_installIUs" -if [ -n "$p2_repositories" ]; then - $P2_ADMIN_PATH/p2-admin -vm $JAVA_HOME/bin/java -application org.eclipse.equinox.p2.director -repository "$p2_repositories" -installIU "$p2_installIUs" -tag RCPTT_AUT -destination "$simrel_path/eclipse" -profile SDKProfile -fi +#echo "Provisioning AUT" +#echo " Repositories: $p2_repositories" +#echo " IUs: $p2_installIUs" +#if [ -n "$p2_repositories" ]; then +# $P2_ADMIN_PATH/p2-admin -vm $JAVA_HOME/bin/java -application org.eclipse.equinox.p2.director -repository "$p2_repositories" -installIU "$p2_installIUs" -tag RCPTT_AUT -destination "$simrel_path/eclipse" -profile SDKProfile +#fi -- 2.11.4.GIT