Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSravan Kumar Lakkimsetti2018-03-15 08:00:24 -0400
committerSravan Kumar Lakkimsetti2018-03-15 08:00:24 -0400
commit52a5174489bf9b5defc0fa3e04752ffaa210c9e5 (patch)
tree98d50ce453e7cd5238e5e038b3e0c0717f1f5dc7
parent52741a61f256ef4159fe93def8f7af5da711d9e0 (diff)
downloadeclipse.platform.releng.aggregator-52a5174489bf9b5defc0fa3e04752ffaa210c9e5.tar.gz
eclipse.platform.releng.aggregator-52a5174489bf9b5defc0fa3e04752ffaa210c9e5.tar.xz
eclipse.platform.releng.aggregator-52a5174489bf9b5defc0fa3e04752ffaa210c9e5.zip
Bug 531437 - Move test executions to releng hipp
Change-Id: Id331265d1b02e61a28623c41edc177ee1b6b5234 Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/testResultsTablesPending.html4
-rwxr-xr-xproduction/createReports.sh2
-rw-r--r--production/sdk/collectTestResults.xml22
-rw-r--r--production/sdk/promotion/syncUpdateUtils.shsource6
-rwxr-xr-xproduction/sdk/promotion/updateDropLocation.sh6
-rw-r--r--production/testScripts/invokeTestsJSON.xml34
6 files changed, 27 insertions, 47 deletions
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/testResultsTablesPending.html b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/testResultsTablesPending.html
index 016464df..28185d3b 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/testResultsTablesPending.html
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/testResultsTablesPending.html
@@ -4,6 +4,6 @@ the real tests results are ready
-->
<h3 id="UnitTest">Unit Test Results</h3>
-<p>Unit tests are running on <a href="https://hudson.eclipse.org/shared/view/Eclipse%20and%20Equinox/">the Hudson shared instance</a>
-and <a href="https://hudson.eclipse.org/platform/view/Unit%20Tests/">the Hudson platform instance</a>.
+<p>Unit tests are running on <a href="https://ci.eclipse.org/shared/view/Eclipse%20and%20Equinox/">the Jenkins shared instance</a>
+and <a href="https://ci.eclipse.org/releng/view/Automated%20tests/">the Jenkins releng instance</a>.
The results will be summarized here as each platform completes.</p> \ No newline at end of file
diff --git a/production/createReports.sh b/production/createReports.sh
index 424a898c..b2fb67ad 100755
--- a/production/createReports.sh
+++ b/production/createReports.sh
@@ -157,7 +157,7 @@ then
# turned off proxy for now. Ideally would set proper environment variables!
# Let's fetch always. otherwise we'll miss any upgrades
- wget --no-proxy --no-verbose --no-cache -O "${TMP_DIR}/${tar_name}" https://hudson.eclipse.org/cbi/job/cbi.p2repo.analyzers_cleanAndDeploy/lastSuccessfulBuild/artifact/output/products/${tar_name} 2>&1
+ wget --no-proxy --no-verbose --no-cache -O "${TMP_DIR}/${tar_name}" https://ci.eclipse.org/cbi/job/cbi.p2repo.analyzers_cleanAndDeploy/lastSuccessfulBuild/artifact/output/products/${tar_name} 2>&1
# always extract anew each time.
if [[ -e ${report_app_area} ]]
diff --git a/production/sdk/collectTestResults.xml b/production/sdk/collectTestResults.xml
index 9891066a..0b02cf8b 100644
--- a/production/sdk/collectTestResults.xml
+++ b/production/sdk/collectTestResults.xml
@@ -95,29 +95,15 @@
<condition
property="env.HUDSON_ROOT_URI"
value="shared">
- <and>
- <contains
- string="${job}"
- substring="46M"
- casesensitive="yes" />
- <contains
- string="${job}"
- substring="gtk2"
- casesensitive="yes" />
- </and>
- </condition>
-
- <condition
- property="env.HUDSON_ROOT_URI"
- value="platform">
<contains
string="${job}"
- substring="gtk"
+ substring="win32"
casesensitive="yes" />
</condition>
+
<property
name="env.HUDSON_ROOT_URI"
- value="shared" />
+ value="releng" />
<!-- we set these "env" variables here not to effect the
environment, but that because we need some value for them,
@@ -140,7 +126,7 @@
<condition
property="hudsonHost"
value="${env.HUDSON_HOST}"
- else="hudson.eclipse.org">
+ else="ci.eclipse.org">
<isset property="env.HUDSON_HOST" />
</condition>
diff --git a/production/sdk/promotion/syncUpdateUtils.shsource b/production/sdk/promotion/syncUpdateUtils.shsource
index 2aec83e7..de2892cb 100644
--- a/production/sdk/promotion/syncUpdateUtils.shsource
+++ b/production/sdk/promotion/syncUpdateUtils.shsource
@@ -18,12 +18,12 @@ fi
# and are also defined in various Ant scripts.
# For production, use value for shared instance
HUDSON_PROTOCOL=${HUDSON_PROTOCOL:-"https"}
-HUDSON_HOST=${HUDSON_HOST:-"hudson.eclipse.org"}
+HUDSON_HOST=${HUDSON_HOST:-"ci.eclipse.org"}
# is standard port for "eclipse", but can not leave blank, since we use ':' in some URLs
HUDSON_PORT=${HUDSON_PORT:-"443"}
-HUDSON_ROOT_URI=${HUDSON_ROOT_URI:-"shared"}
+HUDSON_ROOT_URI=${HUDSON_ROOT_URI:-"releng"}
# For production, use the special performance machine at eclipse
-HUDSON_PERF_HOST=${HUDSON_PERF_HOST:-"hudson.eclipse.org"}
+HUDSON_PERF_HOST=${HUDSON_PERF_HOST:-"ci.eclipse.org"}
HUDSON_PERF_PORT=${HUDSON_PERF_PORT:-"443"}
HUDSON_PERF_PROTOCOL=${HUDSON_PERF_PROTOCOL:-"https"}
LINUX_PERF_SEGMENT=${LINUX_PERF_SEGMENT:-"perftests"}
diff --git a/production/sdk/promotion/updateDropLocation.sh b/production/sdk/promotion/updateDropLocation.sh
index d76043a4..765c0b86 100755
--- a/production/sdk/promotion/updateDropLocation.sh
+++ b/production/sdk/promotion/updateDropLocation.sh
@@ -258,11 +258,11 @@ function sendTestResultsMail ()
platform=$(echo ${JOB_NAME}|cut -b 12-16)
case "$platform" in
- "cen64")
- HUDSON_URL="${HUDSON_PROTOCOL}://${HUDSON_HOST}:${HUDSON_PORT}/platform/view/Unit Tests"
+ "win32")
+ HUDSON_URL="${HUDSON_PROTOCOL}://${HUDSON_HOST}:${HUDSON_PORT}/shared/view/Eclipse and Equinox"
;;
*)
- HUDSON_URL="${HUDSON_PROTOCOL}://${HUDSON_HOST}:${HUDSON_PORT}/${HUDSON_ROOT_URI}/view/Eclipse and Equinox"
+ HUDSON_URL="${HUDSON_PROTOCOL}://${HUDSON_HOST}:${HUDSON_PORT}/${HUDSON_ROOT_URI}/view/Automated tests"
;;
esac
diff --git a/production/testScripts/invokeTestsJSON.xml b/production/testScripts/invokeTestsJSON.xml
index f932994e..b231272b 100644
--- a/production/testScripts/invokeTestsJSON.xml
+++ b/production/testScripts/invokeTestsJSON.xml
@@ -48,7 +48,7 @@
for greater flexibility in what to test?)
-->
- <antcall target="triggerHudsonTests">
+ <antcall target="triggerHudsonWinTests">
<param
name="job"
value="ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-win32" />
@@ -60,31 +60,24 @@
value="ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-mac64" />
</antcall>
- </target>
-
- <target
- name="GTK3JUnitTests"
- depends="init">
-
<!--
currently we test on four platforms.
These GTK3 tests are "just like the others", except the URL to "send it to" differs.
-->
-
- <antcall target="triggerHudsonLinuxTests">
+ <antcall target="triggerHudsonTests">
<param
name="job"
value="ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk2" />
</antcall>
- <antcall target="triggerHudsonLinuxTests">
+ <antcall target="triggerHudsonTests">
<param
name="job"
value="ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3" />
</antcall>
- <antcall target="triggerHudsonLinuxTests">
+ <antcall target="triggerHudsonTests">
<param
name="job"
value="ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java9" />
@@ -204,8 +197,9 @@
value="${unitErrorOutput}" />
</antcall>
</target>
+
<target
- name="triggerHudsonLinuxTests"
+ name="triggerHudsonWinTests"
depends="init">
<!--
baseURL used to be "required parameter" for Hudson job, but seemed overly complicated so
@@ -236,10 +230,10 @@
<echo message="env.HUDSON_PROTOCOL: ${env.HUDSON_PROTOCOL}" />
<echo message="env.HUDSON_HOST: ${env.HUDSON_HOST}" />
<echo message="env.HUDSON_PORT: ${env.HUDSON_PORT}" />
- <echo message="env.HUDSON_GTK3_ROOT_URI: ${env.HUDSON_GTK3_ROOT_URI}" />
+ <echo message="env.HUDSON_WIN32_ROOT_URI: ${env.HUDSON_WIN32_ROOT_URI}" />
<echo message="json for unit curl post: ${json}" />
<echo message="job: ${job}" />
- <echo message="${env.HUDSON_PROTOCOL}://${env.HUDSON_HOST}:${env.HUDSON_PORT}/${env.HUDSON_GTK3_ROOT_URI}/job/${job}/build" />
+ <echo message="${env.HUDSON_PROTOCOL}://${env.HUDSON_HOST}:${env.HUDSON_PORT}/${env.HUDSON_WIN32_ROOT_URI}/job/${job}/build" />
<exec
executable="curl"
@@ -247,7 +241,7 @@
outputproperty="unitOutput"
errorproperty="unitErrorOutput">
<arg line="-X POST" />
- <arg value="${env.HUDSON_PROTOCOL}://${env.HUDSON_HOST}:${env.HUDSON_PORT}/${env.HUDSON_GTK3_ROOT_URI}/job/${job}/build" />
+ <arg value="${env.HUDSON_PROTOCOL}://${env.HUDSON_HOST}:${env.HUDSON_PORT}/${env.HUDSON_WIN32_ROOT_URI}/job/${job}/build" />
<arg line="-d token=${env.HUDSON_TOKEN}" />
<arg value="--fail" />
<arg value="--data-urlencode" />
@@ -406,7 +400,7 @@
<property
name="env.HUDSON_HOST"
- value="hudson.eclipse.org" />
+ value="ci.eclipse.org" />
<property
name="env.HUDSON_PROTOCOL"
value="https" />
@@ -415,13 +409,13 @@
value="443" />
<property
name="env.HUDSON_ROOT_URI"
- value="shared" />
+ value="releng" />
<property
- name="env.HUDSON_GTK3_ROOT_URI"
- value="platform" />
+ name="env.HUDSON_WIN32_ROOT_URI"
+ value="shared" />
<property
name="env.HUDSON_PERF_HOST"
- value="hudson.eclipse.org" />
+ value="ci.eclipse.org" />
<property
name="env.HUDSON_PERF_PROTOCOL"
value="https" />

Back to the top