431248: Don't promote during main build
Promotion should be triggered separately after release-testing the
build artifacts. This will be added to the Hudson build shortly.
Bug: 431248
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=431248
diff --git a/org.eclipse.epp.mpc-parent/pom.xml b/org.eclipse.epp.mpc-parent/pom.xml
index 0df05d8..8002ad4 100644
--- a/org.eclipse.epp.mpc-parent/pom.xml
+++ b/org.eclipse.epp.mpc-parent/pom.xml
@@ -32,7 +32,6 @@
1) tycho-pack200b-plugin:pack doesn't support it and doing it with profiles is a mess
2) pack has moved to the release profile so it won't happen in regular dev/ci builds anyway -->
<skip-pack>true</skip-pack>
- <skip-promote>true</skip-promote>
<test-args></test-args>
<test-app-args></test-app-args>
@@ -115,18 +114,6 @@
<!-- build type profiles -->
<profile>
- <id>publish</id>
- <activation>
- <property>
- <name>env.PUBLISH</name>
- <value>true</value>
- </property>
- </activation>
- <properties>
- <skip-promote>false</skip-promote>
- </properties>
- </profile>
- <profile>
<id>release</id>
<properties>
<skip-sign>false</skip-sign>
diff --git a/org.eclipse.epp.mpc.site/pack-and-sign/build.xml b/org.eclipse.epp.mpc.site/pack-and-sign/build.xml
index 681cdf1..7d5b4d2 100644
--- a/org.eclipse.epp.mpc.site/pack-and-sign/build.xml
+++ b/org.eclipse.epp.mpc.site/pack-and-sign/build.xml
@@ -15,7 +15,6 @@
<condition property="sign.skip" value="true"><equals arg1="${skipSign}" arg2="true"/></condition>
<condition property="pack.skip" value="true"><equals arg1="${skipPack}" arg2="true"/></condition>
- <condition property="promote.skip" value="true"><equals arg1="${skipPromote}" arg2="true"/></condition>
<!-- sign -->
@@ -67,10 +66,6 @@
<include name="**/*"/>
</fileset>
</zip>
-
- <!-- promote -->
-
- <antcall target="promote"/>
</target>
@@ -83,19 +78,6 @@
</exec>
</target>
- <target name="promote" unless="promote.skip">
- <chmod perm="755" file="${scriptdir}/promote.sh"/>
- <chmod perm="755" file="${scriptdir}/update-composite.sh"/>
- <exec executable="${scriptdir}/promote.sh" dir="${scriptdir}" failonerror="true">
- <arg value="${dist}"/>
- <arg value="${version}"/>
- <arg value="${qualifier}"/>
- <arg value="${projectDir}"/>
- <arg value="${archiveDir}"/>
- <arg value="${siteDir}"/>
- </exec>
- </target>
-
<target name="pack" unless="pack.skip">
<delete file="${site}/content.jar" />
<delete file="${site}/artifacts.jar" />
