First tests on JIRO
diff --git a/org.eclipse.emf.cdo.releng.promotion/build.xml b/org.eclipse.emf.cdo.releng.promotion/build.xml
index b2a227f..c69022a 100644
--- a/org.eclipse.emf.cdo.releng.promotion/build.xml
+++ b/org.eclipse.emf.cdo.releng.promotion/build.xml
@@ -38,8 +38,10 @@
</fileset>
</delete>
<java classpath="promoter.jar" classname="${config.classPromoter}">
- <sysproperty key="workingArea" value="${env.WORKSPACE}" />
+ <sysproperty key="JOB_NAME" value="${env.JOB_NAME}" />
+ <sysproperty key="JOB_URL" value="${env.JOB_URL}" />
<sysproperty key="ANT_HOME" value="${env.ANT_HOME}" />
+ <sysproperty key="workingArea" value="${env.WORKSPACE}" />
<sysproperty key="forcedPromotion" value="${promotion.force}" />
</java>
</target>
diff --git a/org.eclipse.emf.cdo.releng.promotion/config/promoter.properties b/org.eclipse.emf.cdo.releng.promotion/config/promoter.properties
index b0c474e..90b8b02 100644
--- a/org.eclipse.emf.cdo.releng.promotion/config/promoter.properties
+++ b/org.eclipse.emf.cdo.releng.promotion/config/promoter.properties
@@ -1,27 +1,26 @@
projectName=CDO
# Path to the directory where the web pages and downloadable contents for users are located
-projectPath=modeling/emf/cdo
+projectPath=modeling/emf/cdo/test
compositionPath=updates
compositionTempPath=temp
-# Path to the directory where the web application for release engineers is located
-projectRelengArea=/opt/public/modeling/emf/cdo
-projectCloneLocation=/jobs/genie.cdo/emf-cdo-integration/workspace/git
-
+# Path to the Git repository within the job workspace
+gitRepositoryPath=git
firstRelevantRevision=1494478feeb46fa6eff70887ea03f59a5a790683
-# SVN: firstRelevantRevision=4158
# Global infra structure
GIT_EXECUTABLE=/usr/local/bin/git
-JOBS_HOME=/shared/hipp/jobs/hipp8/genie.cdo
-JOBS_URL=https://ci.eclipse.org/cdo/job
+HELP_URL=http://help.eclipse.org/2021-03
+#JOBS_URL=https://ci-staging.eclipse.org/cdo/job
+
ARCHIVE_HOME=/home/data/httpd/archive.eclipse.org
ARCHIVE_URL=http://archive.eclipse.org
+
DOWNLOADS_HOME=/home/data/httpd/download.eclipse.org
DOWNLOADS_URL=http://download.eclipse.org
-HELP_URL=http://help.eclipse.org/2019-09
+# Classes
classPromoter=promoter.Promoter
classSourceCodeManager=promoter.Git
classIssueManager=promoter.Bugzilla
diff --git a/org.eclipse.emf.cdo.releng.promotion/src/promoter/Promoter.java b/org.eclipse.emf.cdo.releng.promotion/src/promoter/Promoter.java
index 1f2b6e5..e336296 100644
--- a/org.eclipse.emf.cdo.releng.promotion/src/promoter/Promoter.java
+++ b/org.eclipse.emf.cdo.releng.promotion/src/promoter/Promoter.java
@@ -92,7 +92,7 @@
System.out.println("ArchiveArea = " + PromoterConfig.INSTANCE.getArchiveArea());
System.out.println("ArchiveDropsArea = " + PromoterConfig.INSTANCE.getArchiveDropsArea());
System.out.println("WorkingArea = " + PromoterConfig.INSTANCE.getWorkingArea());
- System.out.println("ProjectRelengArea = " + PromoterConfig.INSTANCE.getProjectRelengArea());
+ // System.out.println("ProjectRelengArea = " + PromoterConfig.INSTANCE.getProjectRelengArea());
System.out.println("AntHome = " + PromoterConfig.INSTANCE.getAntHome());
System.out.println("GitExecutable = " + PromoterConfig.INSTANCE.getGitExecutable());
System.out.println("ProjectCloneLocation = " + PromoterConfig.INSTANCE.getProjectCloneLocation());
diff --git a/org.eclipse.emf.cdo.releng.promotion/src/promoter/PromoterConfig.java b/org.eclipse.emf.cdo.releng.promotion/src/promoter/PromoterConfig.java
index 3a54ba1..e90f6bc 100644
--- a/org.eclipse.emf.cdo.releng.promotion/src/promoter/PromoterConfig.java
+++ b/org.eclipse.emf.cdo.releng.promotion/src/promoter/PromoterConfig.java
@@ -33,9 +33,20 @@
return getFile("GIT_EXECUTABLE");
}
+ public String getGitRepositoryPath()
+ {
+ return getProperty("gitRepositoryPath");
+ }
+
public File getProjectCloneLocation()
{
- return getDirectory("projectCloneLocation");
+ String gitRepositoryPath = getGitRepositoryPath();
+ if (gitRepositoryPath != null)
+ {
+ return new File(getWorkingArea(), gitRepositoryPath);
+ }
+
+ return getDirectory("projectCloneLocation"); // Deprecated.
}
public File getAntHome()
@@ -128,6 +139,7 @@
return new File(getDownloadsHome(), getProjectPath());
}
+ @Deprecated
public File getProjectRelengArea()
{
return getDirectory("projectRelengArea");
@@ -145,7 +157,29 @@
public String getJobsURL()
{
- return getProperty("JOBS_URL");
+ String jobURL = getProperty("JOB_URL");
+ String jobName = getProperty("JOB_NAME");
+ if (jobURL != null && jobName != null)
+ {
+ if (jobURL.endsWith("/"))
+ {
+ jobURL = jobURL.substring(jobURL.length() - "/".length());
+ }
+
+ if (jobURL.endsWith(jobName))
+ {
+ jobURL = jobURL.substring(jobURL.length() - jobName.length());
+ }
+
+ if (jobURL.endsWith("/"))
+ {
+ jobURL = jobURL.substring(jobURL.length() - "/".length());
+ }
+
+ return jobURL;
+ }
+
+ return getProperty("JOBS_URL"); // Deprecated.
}
public String getHelpURL()
