Call replace in travis

ome · Nov 11, 2015 · 37e8f3b · 37e8f3b
1 parent 3554304
commit 37e8f3b
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 17 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,6 +6,7 @@ services:
   - docker
 
 before_install:
+- ./rename.py travis
 - docker-compose build
 
 install:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -3,7 +3,7 @@ jenkins:
     volumes:
         - ./home:/var/jenkins_home
     environment:
-        - SERVICE_NAME=SPACENAME-ci
+        - SERVICE_NAME=test-ci
 
 git:
     build: git
@@ -33,4 +33,4 @@ nginx:
     volumes:
         - ./slave:home/jenkins-slave
     environment:
-        - SERVICE_NAME=SPACENAME-web
+        - SERVICE_NAME=test-web
diff --git a/home/jenkins.model.JenkinsLocationConfiguration.xml b/home/jenkins.model.JenkinsLocationConfiguration.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <jenkins.model.JenkinsLocationConfiguration>
   <adminAddress>address not configured yet &lt;nobody@nowhere&gt;</adminAddress>
-  <jenkinsUrl>http://SPACENAME-ci.docker.openmicroscopy.org:8080/</jenkinsUrl>
+  <jenkinsUrl>http://test-ci.docker.openmicroscopy.org:8080/</jenkinsUrl>
 </jenkins.model.JenkinsLocationConfiguration>
diff --git a/home/jobs/BIOFORMATS-maven/config.xml b/home/jobs/BIOFORMATS-maven/config.xml
@@ -13,7 +13,7 @@
     </userRemoteConfigs>
     <branches>
       <hudson.plugins.git.BranchSpec>
-        <name>SPACEBRANCH/merge/trigger</name>
+        <name>test/merge/trigger</name>
       </hudson.plugins.git.BranchSpec>
     </branches>
     <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -51,12 +51,12 @@
         <artifactoryName>1481416184@1436387151094</artifactoryName>
         <artifactoryUrl>http://artifacts.openmicroscopy.org/artifactory</artifactoryUrl>
         <deployReleaseRepository>
-          <keyFromText>ome.SPACENAME</keyFromText>
+          <keyFromText>ome.test</keyFromText>
           <keyFromSelect>ome.experimental</keyFromSelect>
           <dynamicMode>true</dynamicMode>
         </deployReleaseRepository>
         <deploySnapshotRepository>
-          <keyFromText>ome.SPACENAME</keyFromText>
+          <keyFromText>ome.test</keyFromText>
           <keyFromSelect>ome.experimental</keyFromSelect>
           <dynamicMode>true</dynamicMode>
         </deploySnapshotRepository>

diff --git a/home/jobs/BIOFORMATS-push/config.xml b/home/jobs/BIOFORMATS-push/config.xml
@@ -9,7 +9,7 @@
         <hudson.model.StringParameterDefinition>
           <name>MERGE_COMMAND</name>
           <description></description>
-          <defaultValue>merge SPACENAME --no-ask --reset</defaultValue>
+          <defaultValue>merge test --no-ask --reset</defaultValue>
         </hudson.model.StringParameterDefinition>
         <hudson.model.ChoiceParameterDefinition>
           <name>STATUS</name>
@@ -25,7 +25,7 @@
         <hudson.model.StringParameterDefinition>
           <name>PUSH_BRANCH</name>
           <description></description>
-          <defaultValue>SPACEBRANCH/merge/trigger</defaultValue>
+          <defaultValue>test/merge/trigger</defaultValue>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
@@ -39,7 +39,7 @@
     </userRemoteConfigs>
     <branches>
       <hudson.plugins.git.BranchSpec>
-        <name>SPACEBRANCH</name>
+        <name>test</name>
       </hudson.plugins.git.BranchSpec>
     </branches>
     <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>

diff --git a/home/jobs/OMERO-build/config.xml b/home/jobs/OMERO-build/config.xml
@@ -13,7 +13,7 @@
     </userRemoteConfigs>
     <branches>
       <hudson.plugins.git.BranchSpec>
-        <name>SPACEBRANCH/merge/trigger</name>
+        <name>test/merge/trigger</name>
       </hudson.plugins.git.BranchSpec>
     </branches>
     <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -42,7 +42,7 @@
 
 export PATH=/opt/texlive/bin/x86_64-linux:$PATH # for dockerfile
 cd src
-export OMERO_BRANCH=SPACEBRANCH
+export OMERO_BRANCH=test
 source docs/hudson/OMERO.sh
 </command>
     </hudson.tasks.Shell>

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 SPACENAME --no-ask --reset</defaultValue>
+          <defaultValue>merge test --no-ask --reset</defaultValue>
         </hudson.model.StringParameterDefinition>
         <hudson.model.ChoiceParameterDefinition>
           <name>STATUS</name>
@@ -25,7 +25,7 @@
         <hudson.model.StringParameterDefinition>
           <name>PUSH_BRANCH</name>
           <description></description>
-          <defaultValue>SPACEBRANCH/merge/trigger</defaultValue>
+          <defaultValue>test/merge/trigger</defaultValue>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
@@ -39,7 +39,7 @@
     </userRemoteConfigs>
     <branches>
       <hudson.plugins.git.BranchSpec>
-        <name>SPACEBRANCH</name>
+        <name>test</name>
       </hudson.plugins.git.BranchSpec>
     </branches>
     <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>

diff --git a/home/jobs/OMERO-start/config.xml b/home/jobs/OMERO-start/config.xml
@@ -64,7 +64,7 @@ bin/omero config set omero.data.dir $OMERO_DATA_DIR
 
 bin/omero config set omero.web.check_version false
 bin/omero config set omero.web.application_server.host 0.0.0.0
-bin/omero config set omero.web.server_list &apos;[[&quot;localhost&quot;, 4064, &quot;SPACENAME&quot;],[&quot;dogfish.openmicroscopy.org&quot;, 4064, &quot;dogfish&quot;]]&apos;
+bin/omero config set omero.web.server_list &apos;[[&quot;localhost&quot;, 4064, &quot;test&quot;],[&quot;dogfish.openmicroscopy.org&quot;, 4064, &quot;dogfish&quot;]]&apos;
 # DONE
 
 

diff --git a/jenkins/Dockerfile b/jenkins/Dockerfile
@@ -2,7 +2,7 @@ FROM jenkins
 MAINTAINER OME
 
 USER root
-RUN usermod -u SPACEUSER jenkins
+RUN usermod -u 1000 jenkins
 RUN chown -R jenkins /usr/share/jenkins/
 USER jenkins
 

diff --git a/slave/Dockerfile b/slave/Dockerfile
@@ -6,7 +6,7 @@ ENV JENKINS_SWARM_VERSION 1.24
 ENV HOME /home/jenkins-slave
 
 RUN useradd -c "Jenkins Slave user" -d $HOME -m jenkins-slave
-RUN usermod -u SPACEUSER jenkins-slave
+RUN usermod -u 1000 jenkins-slave
 RUN curl --create-dirs -sSLo /usr/share/jenkins/swarm-client-$JENKINS_SWARM_VERSION-jar-with-dependencies.jar http://maven.jenkins-ci.org/content/repositories/releases/org/jenkins-ci/plugins/swarm-client/$JENKINS_SWARM_VERSION/swarm-client-$JENKINS_SWARM_VERSION-jar-with-dependencies.jar \
   && chmod 755 /usr/share/jenkins