Introduce default-remote to add origin in git branches.

Fix building/compile to compile/packaging Fix centralzip location (should be parameterized in future)
jbosstools · Jul 22, 2015 · 50a9812 · 50a9812
1 parent 40f8526
commit 50a9812
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 7 deletions.
diff --git a/buildchow/templates/aggregate-site-template.yaml b/buildchow/templates/aggregate-site-template.yaml
@@ -62,7 +62,7 @@
           url: https://github.com/jbosstools/jbosstools-build-sites
           wipe-workspace: false
           branches: 
-            - '{branch}'
+            - '{default-remote}/{branch}'
           included-regions:
             - "aggregate/site/*"
             - "aggregate/*"

diff --git a/buildchow/templates/component-template.yaml b/buildchow/templates/component-template.yaml
@@ -22,7 +22,7 @@
       - string:
           name: TARGET_PLATFORM_VERSION
           default: "{target-platform-version}"
-          description: "Target platform used for building/compilation"
+          description: "Target platform used for compilation/packaging"
       - string:
           name: TARGET_PLATFORM_VERSION_MAXIMUM
           default: "{target-platform-version-maximum}"
@@ -48,7 +48,7 @@
           wipe-workspace: false
           basedir: "sources"
           branches: 
-            - '{branch}'
+            - '{default-remote}/{branch}'
 
     triggers:
       - pollscm: "{scm-schedule}"

diff --git a/buildchow/templates/core-jobs.yaml b/buildchow/templates/core-jobs.yaml
@@ -52,7 +52,7 @@
       9.0.mars
     target-platform-version: 4.50.0.Alpha2
     target-platform-version-maximum: 4.50.0.Alpha2
-    branch: jbosstools-4.3.0.Alpha2x
+    branch: jbosstools-4.3.0.Beta1x
     component: 
       *components  # reusing same component list but could use different one per stream if needed
     jobs:

diff --git a/buildchow/templates/defaults.yaml b/buildchow/templates/defaults.yaml
@@ -3,6 +3,7 @@
     disabled: false
     default-jdk: jdk1.8
     default-maven-version: maven-3.2.5
+    default-remote: origin
     jvm-memory: "-Xms512m -Xmx1024m -XX:PermSize=128m -XX:MaxPermSize=256m"
     tests-folder: tests # for some it is all-tests
     component-responsible: ""

diff --git a/buildchow/templates/product-template.yaml b/buildchow/templates/product-template.yaml
@@ -48,7 +48,7 @@
       - string:
           name: JBOSS_CENTRAL_ZIP
           description: "This should be overwritten by the value passed in from upstream job jbosstools-centraltarget_4.3.mars"
-          default: http://download.jboss.org/jbosstools/targetplatforms/jbtcentraltarget/4.50.0.Alpha1-SNAPSHOT/jbtcentraltarget-4.50.0.Alpha1-SNAPSHOT.zip
+          default: http://download.jboss.org/jbosstools/targetplatforms/jbtcentraltarget/4.50.0.Beta1-SNAPSHOT/jbtcentraltarget-4.50.0.Beta1-SNAPSHOT.zip
       - bool:
           name: skipRevisionCheckWhenPublishing
           default: false
@@ -61,7 +61,7 @@
       - git:
           url: git@github.com:jbdevstudio/jbdevstudio-product.git
           branches: 
-            - '{branch}'
+            - '{default-remote}/{branch}'
           browser: githubweb
           browser-url: https://github.com/jbdevstudio/jbdevstudio-product/
           basedir: "sources"

diff --git a/buildchow/templates/versionwatch-template.yaml b/buildchow/templates/versionwatch-template.yaml
@@ -28,7 +28,7 @@
       - git:
           url: git@github.com:jbdevstudio/jbdevstudio-qa.git
           branches: 
-            - '{branch}'
+            - '{default-remote}/{branch}'
           browser: githubweb
           browser-url: https://github.com/jbdevstudio/jbdevstudio-qa/
           basedir: "sources"