enable web and nginx slaves

.gitignore

@@ -1,6 +1,7 @@
 .*un~
 home/.*
 home/*.log
+home/cache/
 home/fingerprints/
 home/identity.key.enc
 home/init.groovy.d/
@@ -35,3 +36,4 @@ slave/.matplotlib
 slave/.oracle_jre_usage
 slave/.local
 slave/.ssh
+web/.jenkins

.travis.yml

@@ -5,12 +5,29 @@ language: java
 services:
   - docker
 
+env:
+  global:
+    - DOCKER_VERSION=1.10.1-0~trusty
+    - DOCKER_COMPOSE_VERSION=1.6.0
+
 before_install:
-- ./rename.py travis
+  - sudo apt-get update
+  - sudo DEBIAN_FRONTEND=noninteractive apt-get -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confnew" install docker-engine=${DOCKER_VERSION}
+  - sudo gpasswd -a $USER docker
+  - export USER_ID=`id -u $USER`
+  - docker -v
+
+  - sudo rm /usr/local/bin/docker-compose
+  - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
+  - chmod +x docker-compose
+  - sudo mv docker-compose /usr/local/bin
+  - docker-compose -v
+
+  - ./rename.py travis
 
 install:
-- docker-compose build
+  - docker-compose -f docker-compose.yml -f docker-compose.unix.yml build
 
 script:
-- docker-compose up -d slave
-- docker-compose stop
+  - docker-compose -f docker-compose.yml -f docker-compose.unix.yml up -d
+  - docker-compose -f docker-compose.yml -f docker-compose.unix.yml stop

docker-compose.osx.yml

@@ -5,3 +5,21 @@ jenkins:
     user: "1000"
 slave:
     user: "1000"
+omero:
+    privileged: true
+web:
+    ports:
+        - "4080:4080"
+    privileged: true
+nginx:
+    ports:
+        - "8888:80"
+    privileged: true
+redis:
+    ports:
+        - "6379:6379"
+seleniumhub:
+    ports:
+        - "4444:4444"
+robot:
+    privileged: true

docker-compose.unix.yml

@@ -0,0 +1,22 @@
+jenkins:
+    user: ${USER_ID}
+
+omero:
+    volumes:
+        - /sys/fs/cgroup:/sys/fs/cgroup:ro
+        - /run
+
+web:
+    volumes:
+        - /sys/fs/cgroup:/sys/fs/cgroup:ro
+        - /run
+
+nginx:
+    volumes:
+        - /sys/fs/cgroup:/sys/fs/cgroup:ro
+        - /run
+
+robot:
+    volumes:
+        - /sys/fs/cgroup:/sys/fs/cgroup:ro
+        - /run

docker-compose.yml

@@ -21,18 +21,84 @@ slave:
         - jenkins
     volumes:
         - ./slave:/home/slave
-    volumes_from:
-        - git
     environment:
         - JAVA_HOME=/etc/alternatives/java_sdk
-        - SERVICE_NAME=SPACENAME-omero
         - DOCKER_FIX='   '
+    command: -labels centos6 -labels slave -executors 4
 
-nginx:
-    image: nginx
+omero:
+    build: server
     links:
+        - jenkins
+        - pg
+    volumes:
+        - ./server:/home/omero
+    environment:
+        - JENKINS_LABEL=/etc/alternatives/java_sdk
+        - JENKINS_MODE=exclusive
+        - SERVICE_NAME=SPACENAME-omero
+
+web:
+    build: web
+    links:
+        - jenkins
+        - redis
         - slave
+        - omero
     volumes:
-        - ./slave:/home/jenkins-slave
+        - ./web:/home/omero
+        - ./nginx/conf.d:/home/omero/nginx
+    environment:
+        - JENKINS_LABEL=/etc/alternatives/java_sdk
+        - JENKINS_MODE=exclusive
+
+nginx:
+    build: nginx
+    links:
+        - jenkins
+        - web
+    volumes:
+        - ./nginx/conf.d:/etc/nginx/conf.d
+        - ./web/static/web:/home/omero/static/web
+    environment:
+        - JENKINS_LABEL=/etc/alternatives/java_sdk
+        - JENKINS_MODE=exclusive
+        - SERVICE_NAME=SPACENAME-nginx
+
+redis:
+    image: redis
+    environment:
+        - SERVICE_NAME=SPACENAME-redis
+
+seleniumhub:
+    image: selenium/hub
+    environment:
+        - "JAVA_OPTS: -d64 -Xmx512m -Djava.security.egd=file:/dev/./urandom"
+        - SERVICE_NAME=SPACENAME-seleniumhub
+        - GRID_BROWSER_TIMEOUT=5000
+        - GRID_TIMEOUT=5000
+seleniumfirefox:
+    image: selenium/node-firefox
+    links:
+        - seleniumhub:hub
+    environment:
+        - "JAVA_OPTS: -d64 -Xmx512m -Djava.security.egd=file:/dev/./urandom"
+seleniumchrome:
+    image: selenium/node-chrome
+    links:
+        - seleniumhub:hub
+    environment:
+        - "JAVA_OPTS: -d64 -Xmx512m -Djava.security.egd=file:/dev/./urandom"
+
+robot:
+    build: robot
+    links:
+        - jenkins
+        - slave
+        - omero
+        - nginx
+        - seleniumhub
     environment:
-        - SERVICE_NAME=SPACENAME-web
+        - JENKINS_LABEL=/etc/alternatives/java_sdk
+        - JENKINS_MODE=exclusive
+        - SERVICE_NAME=SPACENAME-robot

ds

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
-EXTRA=${EXTRA:-"docker-compose.osx.yml"}
-exec docker-compose -f docker-compose.yml -f "$EXTRA" "$@"
+EXTRA=${EXTRA:-"docker-compose.unix.yml"}
+exec env USER_ID=$UID docker-compose -f docker-compose.yml -f "$EXTRA" "$@"

home/hudson.plugins.git.GitSCM.xml

@@ -4,4 +4,4 @@
   <globalConfigName></globalConfigName>
   <globalConfigEmail></globalConfigEmail>
   <createAccountBasedOnEmail>false</createAccountBasedOnEmail>
-</hudson.plugins.git.GitSCM_-DescriptorImpl>
+</hudson.plugins.git.GitSCM_-DescriptorImpl>

home/hudson.plugins.git.GitTool.xml

@@ -7,4 +7,4 @@
       <properties/>
     </hudson.plugins.git.GitTool>
   </installations>
-</hudson.plugins.git.GitTool_-DescriptorImpl>
+</hudson.plugins.git.GitTool_-DescriptorImpl>

home/hudson.tasks.Shell.xml

@@ -1,2 +1,4 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<hudson.tasks.Shell_-DescriptorImpl/>
+<hudson.tasks.Shell_-DescriptorImpl>
+  <shell>/bin/bash</shell>
+</hudson.tasks.Shell_-DescriptorImpl>

home/jobs/BIOFORMATS-maven/config.xml

@@ -20,7 +20,8 @@
     <submoduleCfg class="list"/>
     <extensions/>
   </scm>
-  <canRoam>true</canRoam>
+  <assignedNode>slave</assignedNode>
+  <canRoam>false</canRoam>
   <disabled>false</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
   <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>

home/jobs/BIOFORMATS-push/config.xml

@@ -16,9 +16,9 @@
           <description></description>
           <choices class="java.util.Arrays$ArrayList">
             <a class="string-array">
-              <string>success-only</string>
               <string>no-error</string>
               <string>none</string>
+              <string>success-only</string>
             </a>
           </choices>
         </hudson.model.ChoiceParameterDefinition>
@@ -57,7 +57,8 @@
       </hudson.plugins.git.extensions.impl.CloneOption>
     </extensions>
   </scm>
-  <canRoam>true</canRoam>
+  <assignedNode>slave</assignedNode>
+  <canRoam>false</canRoam>
   <disabled>false</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
   <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>

home/jobs/OMERO-build/config.xml

@@ -30,7 +30,8 @@
       <hudson.plugins.git.extensions.impl.CleanCheckout/>
     </extensions>
   </scm>
-  <canRoam>true</canRoam>
+  <assignedNode>slave</assignedNode>
+  <canRoam>false</canRoam>
   <disabled>false</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
   <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
@@ -54,6 +55,7 @@ source docs/hudson/OMERO.sh
       <onlyIfSuccessful>false</onlyIfSuccessful>
       <fingerprint>false</fingerprint>
       <defaultExcludes>true</defaultExcludes>
+      <caseSensitive>true</caseSensitive>
     </hudson.tasks.ArtifactArchiver>
   </publishers>
   <buildWrappers/>

home/jobs/OMERO-push/config.xml

@@ -53,7 +53,8 @@
       </hudson.plugins.git.extensions.impl.RelativeTargetDirectory>
     </extensions>
   </scm>
-  <canRoam>true</canRoam>
+  <assignedNode>slave</assignedNode>
+  <canRoam>false</canRoam>
   <disabled>false</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
   <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
@@ -68,4 +69,4 @@ $HOME/.local/bin/scc $MERGE_COMMAND -S $STATUS --push $PUSH_BRANCH</command>
   </builders>
   <publishers/>
   <buildWrappers/>
-</project>
+</project>

home/jobs/OMERO-robot/config.xml

@@ -0,0 +1,99 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+  <actions/>
+  <description></description>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>HOSTNAME</name>
+          <description></description>
+          <defaultValue>omero</defaultValue>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+  </properties>
+  <scm class="hudson.scm.NullSCM"/>
+  <assignedNode>robot</assignedNode>
+  <canRoam>false</canRoam>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <triggers/>
+  <concurrentBuild>false</concurrentBuild>
+  <builders>
+    <hudson.tasks.Shell>
+      <command>rm -rf src</command>
+    </hudson.tasks.Shell>
+    <hudson.plugins.copyartifact.CopyArtifact plugin="[email protected]">
+      <project>OMERO-build</project>
+      <filter>src/target/openmicroscopy*zip</filter>
+      <target></target>
+      <excludes></excludes>
+      <selector class="hudson.plugins.copyartifact.StatusBuildSelector"/>
+      <flatten>true</flatten>
+      <doNotFingerprintArtifacts>false</doNotFingerprintArtifacts>
+    </hudson.plugins.copyartifact.CopyArtifact>
+    <hudson.plugins.copyartifact.CopyArtifact plugin="[email protected]">
+      <project>OMERO-build</project>
+      <filter>src/target/OMERO.server*zip</filter>
+      <target></target>
+      <excludes></excludes>
+      <selector class="hudson.plugins.copyartifact.StatusBuildSelector"/>
+      <flatten>true</flatten>
+      <doNotFingerprintArtifacts>false</doNotFingerprintArtifacts>
+    </hudson.plugins.copyartifact.CopyArtifact>
+    <hudson.tasks.Shell>
+      <command>SRC=$WORKSPACE/src
+
+# Setup configuration for robot job
+ZIP_SRC=$(ls openmicroscopy*zip)
+unzip $ZIP_SRC
+rm -f $ZIP_SRC
+mv $WORKSPACE/${ZIP_SRC%.zip} $SRC
+
+ZIP_DIST=$(ls OMERO.server*.zip)
+unzip $ZIP_DIST
+rm -f $ZIP_DIST
+mv $WORKSPACE/${ZIP_DIST%.zip} $SRC/dist
+
+source $HOME/omero-virtualenv/bin/activate
+
+pip install --upgrade --no-deps --force-reinstall -r $SRC/dist/share/web/requirements-py27-nginx.txt
+
+$SRC/dist/bin/omero config set omero.web.prefix &quot;/web&quot;
+
+cd $SRC/dist
+bash ../components/tests/ui/robot_setup.sh
+mv $SRC/dist/robot_ice.config $SRC/components/tests/ui/resources/
+export ICE_CONFIG=$SRC/components/tests/ui/resources/robot_ice.config
+$SRC/dist/bin/omero --path $SRC/components/tests/ui/plugins robot config --protocol http --webhost &apos;SPACENAME-nginx.docker.openmicroscopy.org&apos; --remoteurl &apos;http://seleniumhub:4444/wd/hub&apos; --dc &apos;browserName:${BROWSER},javascriptEnabled:True&apos; &gt; $SRC/components/tests/ui/resources/config.txt
+
+echo Running the UI tests
+
+$SRC/build.py -f components/tests/ui/build.xml -Dtest.with.fail=false ui-test-web
+
+#aggregate the various output files.
+$SRC/build.py -f components/tests/ui/build.xml aggregate-results
+</command>
+    </hudson.tasks.Shell>
+  </builders>
+  <publishers>
+    <hudson.plugins.robot.RobotPublisher plugin="[email protected]">
+      <outputPath>$WORKSPACE/src/components/tests/ui/target/reports</outputPath>
+      <reportFileName>report.html</reportFileName>
+      <logFileName>log.html</logFileName>
+      <outputFileName>output.xml</outputFileName>
+      <disableArchiveOutput>false</disableArchiveOutput>
+      <passThreshold>100.0</passThreshold>
+      <unstableThreshold>80.0</unstableThreshold>
+      <otherFiles>
+        <string></string>
+      </otherFiles>
+      <enableCache>true</enableCache>
+      <onlyCritical>true</onlyCritical>
+    </hudson.plugins.robot.RobotPublisher>
+  </publishers>
+  <buildWrappers/>
+</project>