Merge pull request #147 from sbesson/SPACENAME

Remove usage of SPACEBRANCH
ome · Jun 13, 2019 · a10bf9a · a10bf9a
2 parents 0f2b58c + 4a16819
commit a10bf9a
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 47 deletions.
diff --git a/home/config.xml b/home/config.xml
@@ -70,7 +70,7 @@
           </default>
           <int>1</int>
           <string>MERGE_PUSH_BRANCH</string>
-          <string>SPACEBRANCH_merge_trigger</string>
+          <string>SPACENAME_ci</string>
         </tree-map>
       </envVars>
     </hudson.slaves.EnvironmentVariablesNodeProperty>

diff --git a/home/jobs/BIOFORMATS-build-docs/config.xml b/home/jobs/BIOFORMATS-build-docs/config.xml
@@ -14,12 +14,6 @@
     </jenkins.model.BuildDiscarderProperty>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
-        <hudson.model.StringParameterDefinition>
-          <name>PUSH_BRANCH</name>
-          <description></description>
-          <defaultValue>SPACEBRANCH_merge_trigger</defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
         <hudson.model.BooleanParameterDefinition>
           <name>SKIP_DOCS_VALIDATION</name>
           <description></description>
@@ -37,7 +31,7 @@
     </userRemoteConfigs>
     <branches>
       <hudson.plugins.git.BranchSpec>
-        <name>$PUSH_BRANCH</name>
+        <name>$MERGE_PUSH_BRANCH</name>
       </hudson.plugins.git.BranchSpec>
     </branches>
     <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>

diff --git a/home/jobs/BIOFORMATS-build/config.xml b/home/jobs/BIOFORMATS-build/config.xml
@@ -14,12 +14,6 @@
     </jenkins.model.BuildDiscarderProperty>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
-        <hudson.model.StringParameterDefinition>
-          <name>PUSH_BRANCH</name>
-          <description></description>
-          <defaultValue>SPACEBRANCH_merge_trigger</defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
         <hudson.model.BooleanParameterDefinition>
           <name>SKIP_DOCS_VALIDATION</name>
           <description></description>
@@ -37,7 +31,7 @@
     </userRemoteConfigs>
     <branches>
       <hudson.plugins.git.BranchSpec>
-        <name>$PUSH_BRANCH</name>
+        <name>$MERGE_PUSH_BRANCH</name>
       </hudson.plugins.git.BranchSpec>
     </branches>
     <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>

diff --git a/home/jobs/BIOFORMATS-image/config.xml b/home/jobs/BIOFORMATS-image/config.xml
@@ -4,7 +4,7 @@
   <description></description>
   <keepDependencies>false</keepDependencies>
   <properties/>
-  <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.1">
+  <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0-rc">
     <configVersion>2</configVersion>
     <userRemoteConfigs>
       <hudson.plugins.git.UserRemoteConfig>
@@ -13,7 +13,7 @@
     </userRemoteConfigs>
     <branches>
       <hudson.plugins.git.BranchSpec>
-        <name>SPACEBRANCH_merge_trigger</name>
+        <name>$MERGE_PUSH_BRANCH</name>
       </hudson.plugins.git.BranchSpec>
     </branches>
     <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -28,12 +28,11 @@
   <disabled>false</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
   <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
-  <jdk>(System)</jdk>
   <triggers/>
   <concurrentBuild>false</concurrentBuild>
   <builders>
     <hudson.tasks.Shell>
-      <command>TAG=openmicroscopy/bioformats:SPACENAME
+      <command>TAG=SPACEUSER/bioformats:$MERGE_PUSH_BRANCH
 sudo docker build -t $TAG .
 #sudo docker tag $TAG scc-docker-docker.bintray.io/$TAG
 #sudo docker push scc-docker-docker.bintray.io/$TAG</command>

diff --git a/home/jobs/BIOFORMATS-push/config.xml b/home/jobs/BIOFORMATS-push/config.xml
@@ -23,12 +23,6 @@
             </a>
           </choices>
         </hudson.model.ChoiceParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>PUSH_BRANCH</name>
-          <description></description>
-          <defaultValue>SPACEBRANCH_merge_trigger</defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
         <hudson.model.StringParameterDefinition>
           <name>BASE_BRANCH</name>
           <description></description>
@@ -38,7 +32,7 @@
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
   </properties>
-  <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.1">
+  <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0-rc">
     <configVersion>2</configVersion>
     <userRemoteConfigs>
       <hudson.plugins.git.UserRemoteConfig>
@@ -94,7 +88,7 @@ git submodule update --remote --recursive
 
 echo &quot;Merge all submodules using repository configuration:&quot;
 cat &quot;scripts/repositories.yml&quot;
-scc merge &quot;--repository-config=$(pwd)/scripts/repositories.yml&quot; $MERGE_OPTIONS --update-gitmodules --push $PUSH_BRANCH master
+scc merge &quot;--repository-config=$(pwd)/scripts/repositories.yml&quot; $MERGE_OPTIONS --update-gitmodules --push $MERGE_PUSH_BRANCH master
 
 echo &quot;Update maven component versions&quot;
 update-versions
@@ -105,13 +99,13 @@ git submodule foreach &quot;git commit -m &apos;Update component versions&apos;
 
 echo &quot;Push all branches&quot;
 user=$(git config github.user)
-git submodule foreach &quot;git push -f [email protected]:$user/&quot;&apos;${path}.git&apos;&quot; HEAD:$PUSH_BRANCH&quot;
+git submodule foreach &quot;git push -f [email protected]:$user/&quot;&apos;${path}.git&apos;&quot; HEAD:$MERGE_PUSH_BRANCH&quot;
 
 echo &quot;Commit all component version changes&quot;
 git add -u
 git commit -m &apos;Update component versions&apos; || true
 
-git push -f [email protected]:$user/bio-formats-build.git HEAD:$PUSH_BRANCH</command>
+git push -f [email protected]:$user/bio-formats-build.git HEAD:$MERGE_PUSH_BRANCH</command>
     </hudson.tasks.Shell>
     <hudson.tasks.Shell>
       <command># TODO: move to Jenkinsfile

diff --git a/home/jobs/BIOFORMATS-test-folder/config.xml b/home/jobs/BIOFORMATS-test-folder/config.xml
@@ -47,9 +47,9 @@
     exit 0
 fi
 if [ $(date +%u) -le 1 ]; then
-    DOCKER_ARGS="$DOCKER_ARGS -Duser.language=fr -Duser.country=FR"
+    DOCKER_ARGS=&quot;$DOCKER_ARGS -Duser.language=fr -Duser.country=FR&quot;
 fi
-sudo docker run --rm --name ${JOB_NAME}_${BUILD_NUMBER}_SPACENAME -v $DATA_PATH:/data -v $CONFIG_PATH:/config openmicroscopy/bioformats:SPACENAME $DOCKER_ARGS</command>
+sudo docker run --rm --name ${JOB_NAME}_${BUILD_NUMBER}_${MERGE_PUSH_BRANCH} -v $DATA_PATH:/data -v $CONFIG_PATH:/config SPACEUSER/bioformats:${MERGE_PUSH_BRANCH} $DOCKER_ARGS</command>
     </hudson.tasks.Shell>
   </builders>
   <publishers/>

diff --git a/home/jobs/OMERO-build/config.xml b/home/jobs/OMERO-build/config.xml
@@ -22,7 +22,7 @@
     </userRemoteConfigs>
     <branches>
       <hudson.plugins.git.BranchSpec>
-        <name>SPACEBRANCH_merge_trigger</name>
+        <name>$MERGE_PUSH_BRANCH</name>
       </hudson.plugins.git.BranchSpec>
     </branches>
     <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -62,7 +62,7 @@
 
 export PATH=/opt/texlive/bin/x86_64-linux:$PATH # for dockerfile
 cd src
-export OMERO_BRANCH=SPACEBRANCH
+export OMERO_BRANCH=$MERGE_PUSH_BRANCH
 virtualenv $WORKSPACE/omero-virtualenv --system-site-packages
 source $WORKSPACE/omero-virtualenv/bin/activate
 pip install -U setuptools

diff --git a/home/jobs/OMERO-docs/config.xml b/home/jobs/OMERO-docs/config.xml
@@ -17,7 +17,7 @@
         <hudson.model.StringParameterDefinition>
           <name>MERGE_COMMAND</name>
           <description></description>
-          <defaultValue>merge SPACEBRANCH --no-ask --reset</defaultValue>
+          <defaultValue>merge develop --no-ask --reset</defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>

diff --git a/home/jobs/OMERO-push/config.xml b/home/jobs/OMERO-push/config.xml
@@ -9,7 +9,7 @@
         <hudson.model.StringParameterDefinition>
           <name>MERGE_COMMAND</name>
           <description></description>
-          <defaultValue>merge SPACEBRANCH --no-ask --reset --shallow</defaultValue>
+          <defaultValue>merge develop --no-ask --reset --shallow</defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
         <hudson.model.ChoiceParameterDefinition>
@@ -23,12 +23,6 @@
             </a>
           </choices>
         </hudson.model.ChoiceParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>PUSH_BRANCH</name>
-          <description></description>
-          <defaultValue>SPACEBRANCH_merge_trigger</defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
   </properties>
@@ -104,7 +98,7 @@ echo &quot;$line&quot; &gt;&gt; etc/omero.properties
 
 cat $WORKSPACE/version.properties &gt;&gt; etc/omero.properties
 git commit -a -m &quot;Add version.properties to etc/omero.properties&quot;
-git push -f [email protected]:$user/openmicroscopy.git HEAD:$PUSH_BRANCH</command>
+git push -f [email protected]:$user/openmicroscopy.git HEAD:refs/heads/$MERGE_PUSH_BRANCH</command>
     </hudson.tasks.Shell>
   </builders>
   <publishers/>

diff --git a/pipeline-configs.yaml b/pipeline-configs.yaml
@@ -10,19 +10,19 @@ jobs:
   OMERO-gradle-plugins-build:
     description: Build omero-gradle-plugins
     repository: SPACEUSER/omero-gradle-plugins
-    branch: SPACEBRANCH_merge_trigger
+    branch: SPACENAME_ci
 
   OMERO-build-build:
     description: Build omero-build
     repository: SPACEUSER/omero-build
-    branch: SPACEBRANCH_merge_trigger
+    branch: SPACENAME_ci
 
   OMERO-insight-build:
     description: Build omero-insight
     repository: SPACEUSER/omero-insight
-    branch: SPACEBRANCH_merge_trigger
+    branch: SPACENAME_ci
 
   OMERO-matlab-build:
     description: Build omero-matlab
     repository: SPACEUSER/omero-matlab
-    branch: SPACEBRANCH_merge_trigger
+    branch: SPACENAME_ci
diff --git a/rename.py b/rename.py
@@ -27,7 +27,6 @@ def replace(name, branch, uid, user):
         if regexp.search(line) is not None:
           cnt += 1
           line = line.replace("SPACENAME", name)
-          line = line.replace("SPACEBRANCH", name)
           line = line.replace("SPACEUSER", user)
           line = line.replace("1000", str(uid))
         print line,