TMSS-138: Modify docker compose setup for testenv to include OIDC test provider

SAS/TMSS/docker/tmss-testenv/docker-compose.yml

@@ -15,4 +15,11 @@ services:
     container_name: tmss_test_nginx
     ports:
       - "5005:5005"
+  tmss_test_oidc:
+    build:
+      context: ../../test/oidc/docker-test-mozilla-django-oidc/
+      dockerfile: dockerfiles/oidc_testprovider
+    container_name: tmss_test_oidc
+    ports:
+      - "8088:8088"
 

SAS/TMSS/docker/tmss-testenv/nginx.conf

@@ -40,5 +40,9 @@ http {
       proxy_pass http://tmss_test:8008;
     }
 
+    location /openid/ {
+      proxy_pass http://tmss_test_oidc:8088;
+    }
+
   }
 }
\ No newline at end of file

SAS/TMSS/docker/tmss-testenv/tmss_testenv_Dockerfile

@@ -21,7 +21,7 @@ ENV PATH=$PATH:/usr/pgsql-9.4/bin/
 RUN echo "Checking out code base" && \
     git clone https://git.astron.nl/ro/lofar.git && \
     cd lofar && \
-    git checkout TMSS-134 && \
+    git checkout master && \
     . CMake/gen_LofarPackageList_cmake.sh && \
     PACKAGE=TMSS  && \
     VARIANT=gnucxx11_opt  && \

SAS/TMSS/test/oidc/docker-test-mozilla-django-oidc/testprovider/oidcprovider/management/commands/createuser.py

@@ -17,11 +17,13 @@ class Command(BaseCommand):
         parser.add_argument("username", help="account username")
         parser.add_argument("password", help="account password")
         parser.add_argument("email", help="account email address")
+        parser.add_argument("groups", help="account user groups", nargs='*')
 
     def handle(self, **options):
         username = options["username"]
         password = options["password"]
         email = options["email"]
+        groups = options["groups"]
 
         if User.objects.filter(username=username).exists():
             self.stdout.write("User {} already exists.".format(username))
@@ -29,5 +31,6 @@ class Command(BaseCommand):
 
         user = User.objects.create(username=username, email=email)
         user.set_password(password)
+        user.groups.set(groups)
         user.save()
         self.stdout.write("User {} created.".format(username))