Running tests with random user, to check that containers can also run

in OpenShift or non-sudo envs.

Author: diemol

.travis.yml

@@ -6,20 +6,24 @@ services:
   - docker
 
 notifications:
-    slack: seleniumhq:Kx5MB7T51SPMpbBMYfvxNW4q
+  slack: seleniumhq:Kx5MB7T51SPMpbBMYfvxNW4q
 
-before_install:
-  - docker info
-  - VERSION="$TRAVIS_BRANCH" make build
-
-script:
-  - VERSION="$TRAVIS_BRANCH" make test
-
-# only push up tags
-after_success:
-  - if [ "$TRAVIS_TAG" != "" ]; then
-    docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD";
-    VERSION="$TRAVIS_TAG" make release;
-    VERSION="$TRAVIS_TAG" make tag_latest;
-    VERSION="latest" make release_latest;
-    fi
+jobs:
+  include:
+    - stage: Build and integration tests
+      env: step=build_and_test
+      script:
+      - docker info
+      - VERSION="$TRAVIS_BRANCH" make ci
+    - env: step=build_and_test_random_user
+      script:
+      - docker info
+      - USE_RANDOM_USER_ID=true VERSION="$TRAVIS_BRANCH" make ci
+    - stage: Release
+      if: branch = master AND type != pull_request AND tag IS present
+      script:
+      - docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
+      - VERSION="${TRAVIS_TAG}" make build
+      - VERSION="${TRAVIS_TAG}" make release
+      - VERSION="${TRAVIS_TAG}" make tag_latest
+      - VERSION="${TRAVIS_TAG}" make release_latest

tests/bootstrap.sh

@@ -1,7 +1,19 @@
 #!/usr/bin/env bash
 cd tests
-pip install selenium===3.14.0 \
+
+if [ "${TRAVIS:-false}" = "false" ]; then
+  pip install virtualenv | grep -v 'Requirement already satisfied'
+  virtualenv docker-selenium-tests
+  source docker-selenium-tests/bin/activate
+fi
+
+
+pip install selenium===3.14.1 \
             docker===3.5.0 \
             | grep -v 'Requirement already satisfied'
 
 python test.py $1 $2
+
+if [ "${TRAVIS:-false}" = "false" ]; then
+  deactivate
+fi

tests/test.py

@@ -3,6 +3,7 @@
 import unittest
 import logging
 import sys
+import random
 
 from docker.errors import NotFound
 
@@ -15,6 +16,7 @@
 
 NAMESPACE = os.environ.get('NAMESPACE')
 VERSION = os.environ.get('VERSION')
+USE_RANDOM_USER_ID = os.environ.get('USE_RANDOM_USER_ID')
 
 IMAGE_NAME_MAP = {
     # Hub
@@ -70,7 +72,13 @@ def launch_hub():
             logger.debug("hub killed")
         existing_hub.remove()
         logger.debug("hub removed")
-    hub_container_id = launch_container('Hub', ports={'4444': 4444})
+
+
+    if use_random_user_id:
+        hub_container_id = launch_container('Hub', ports={'4444': 4444}, user=random_user_id)
+    else:
+        hub_container_id = launch_container('Hub', ports={'4444': 4444})
+
     logger.info("Hub Launched")
     return hub_container_id
 
@@ -101,6 +109,12 @@ def launch_container(container, **kwargs):
     # The container to test against
     image = sys.argv[1]
 
+    use_random_user_id = USE_RANDOM_USER_ID == 'true'
+    random_user_id = random.randint(100000,2147483647)
+
+    if use_random_user_id:
+        logger.info("Running tests with a random user ID -> %s" % random_user_id)
+
     standalone = 'standalone' in image.lower()
 
     # Flag for failure (for posterity)
@@ -113,14 +127,20 @@ def launch_container(container, **kwargs):
         Standalone Configuration
         """
         smoke_test_class = 'StandaloneTest'
-        test_container_id = launch_container(image, ports={'4444': 4444})
+        if use_random_user_id:
+            test_container_id = launch_container(image, ports={'4444': 4444}, user=random_user_id)
+        else:
+            test_container_id = launch_container(image, ports={'4444': 4444})
     else:
         """
         Hub / Node Configuration
         """
         smoke_test_class = 'NodeTest'
         hub_id = launch_hub()
-        test_container_id = launch_container(image, links={hub_id: 'hub'}, ports={'5555': 5555})
+        if use_random_user_id:
+            test_container_id = launch_container(image, links={hub_id: 'hub'}, ports={'5555': 5555}, user=random_user_id)
+        else:
+            test_container_id = launch_container(image, links={hub_id: 'hub'}, ports={'5555': 5555})
 
     logger.info('========== / Containers ready to go ==========')