Bug 562908 - Populate the JustJ Git clones with initial content

Prepare for generating JREs to a permanent location.

Signed-off-by: Ed Merks <ed.merks@gmail.com>

4 files changed, 20 insertions, 21 deletions

diff --git a/model/org.eclipse.justj.model/justj.jregen b/model/org.eclipse.justj.model/justj.jregen
index dbf8e38..5f9a398 100644
--- a/model/org.eclipse.justj.model/justj.jregen
+++ b/model/org.eclipse.justj.model/justj.jregen
@@ -8,7 +8,7 @@
     provider="Eclipse JustJ"
     providerImageName="justj32.png"
     target="jre-gen"
-    source="https://download.eclipse.org/justj/sandbox/jres/14/downloads/latest/justj.manifest"
+    source="https://download.eclipse.org/justj/jres/14/downloads/latest/justj.manifest"
     localCache="local-cache">
   <touchpoints
       phase="uninstall">
diff --git a/releng/org.eclipse.justj.releng/Jenkinsfile b/releng/org.eclipse.justj.releng/Jenkinsfile
index 1e392d8..483a95e 100644
--- a/releng/org.eclipse.justj.releng/Jenkinsfile
+++ b/releng/org.eclipse.justj.releng/Jenkinsfile
@@ -5,13 +5,15 @@ def pipelineVersion = '1'
 
 def justjURL = 'https://download.eclipse.org/justj'
 
-def testPrefix = "sandbox-test/jres"
+def testPrefix = "jres-test"
+def testExtraPrefix = "archive/jres-test"
+def defaultPrefix = "jres"
 
 def java11 = [
-  label: 'Java 11 (test)',
-  BUILD_DESCRIPTION: 'Build jdk.java.net Java 11 (-test)',
-  PUBLISH_LOCATION_PREFIX: "${testPrefix}",
-  JUSTJ_MANIFEST_URL: "${justjURL}/${testPrefix}/11/downloads/latest/justj.manifest",
+  label: 'Java 11',
+  BUILD_DESCRIPTION: 'Build jdk.java.net Java 11',
+  PUBLISH_LOCATION_PREFIX: "${defaultPrefix}",
+  JUSTJ_MANIFEST_URL: "${justjURL}/${defaultPrefix}/11/downloads/latest/justj.manifest",
   JDK_URLS_WINDOWS: '''
     https://download.java.net/java/GA/jdk11/9/GPL/openjdk-11.0.2_windows-x64_bin.zip
     ''',
@@ -43,8 +45,6 @@ def java14 = [
   PROMOTE: 'true'
 ]
 
-def testExtraPrefix = "archive/sandbox/jres"
-
 def java14Extra = [
   label: 'Java 14 (++test)',
   BUILD_DESCRIPTION: 'Build jdk.java.net and adoptopenjdk.net Java 14 (++test)',
@@ -119,8 +119,6 @@ def parambuilds = [
   java15
 ]
 
-def defaultPrefix = "sandbox/jres"
-
 def javaDefault = update(java14, [
     BUILD_DESCRIPTION: 'Build jdk.java.net Java 14',
     PUBLISH_LOCATION_PREFIX: "${defaultPrefix}",
diff --git a/releng/org.eclipse.justj.releng/build-jre.sh b/releng/org.eclipse.justj.releng/build-jre.sh
index e8d7ae3..07d572c 100755
--- a/releng/org.eclipse.justj.releng/build-jre.sh
+++ b/releng/org.eclipse.justj.releng/build-jre.sh
@@ -221,17 +221,18 @@ jres=(
   $simrel_modules
   "--compress=2 $strip_debug"
 
-"$vendor_prefix.jre.installer"
-  "JRE Minimal for Installer"
-  "Provides the minimal modules needed to satisfy all of the bundles of the installer."
-  $installer_modules
-  "--compress=2"
+#"$vendor_prefix.jre.installer"
+#  "JRE Minimal for Installer"
+#  "Provides the minimal modules needed to satisfy all of the bundles of the installer."
+#  $installer_modules
+#  "--compress=2"
+
+#"$vendor_prefix.jre.installer.stripped"
+#  "JRE Minimal for Installer Stripped"
+#  "Provides the minimal modules needed to satisfy all of the bundles of the installer, stripped of debug information."
+#  $installer_modules
+#  "--compress=2 $strip_debug"
 
-"$vendor_prefix.jre.installer.stripped"
-  "JRE Minimal for Installer Stripped"
-  "Provides the minimal modules needed to satisfy all of the bundles of the installer, stripped of debug information."
-  $installer_modules
-  "--compress=2 $strip_debug"
 )
 
 # Iterate over the tuples.
diff --git a/releng/org.eclipse.justj.releng/generate-build-jres-url.sh b/releng/org.eclipse.justj.releng/generate-build-jres-url.sh
index 90ef26e..198aa39 100644
--- a/releng/org.eclipse.justj.releng/generate-build-jres-url.sh
+++ b/releng/org.eclipse.justj.releng/generate-build-jres-url.sh
@@ -4,7 +4,7 @@
 
 
 ###
-PUBLISH_LOCATION_PREFIX="sandbox-test/jres"
+PUBLISH_LOCATION_PREFIX="jres-test"
 #
 PUBLISH_LOCATION_PREFIX_ENCODED="$(perl -MURI::Escape -e 'print uri_escape($ARGV[0]);' "$PUBLISH_LOCATION_PREFIX")"