Disable basic auth for refimpl tests

Signed-off-by: Andrew Berezovskyi <[email protected]>

.github/workflows/maven.yml

@@ -40,13 +40,15 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-maven-
       - name: Build RefImpl
-        working-directory: refimpl/src/
         run: |
-          mvn -B clean package
-          docker-compose -f docker-compose.yml build
+          # disable basic auth
+          cp -f testsuite/config/refimpl2020/cm/web.xml refimpl/src/server-cm/src/main/webapp/WEB-INF/web.xml
+          mvn -B -f refimpl/src/server-cm/pom.xml clean package
+          docker-compose -f refimpl/src/docker-compose.yml build
       - name: Run Lyo Test Suite
         run: |
           docker-compose -f refimpl/src/docker-compose.yml up --detach
-          echo "Sleeping for 120 seconds"
-          sleep 120
+          >&2 echo "Sleeping for 20 seconds"
+          sleep 20
+          >&2 echo "Done sleeping"
           testsuite/scripts/run-suite.sh

org.eclipse.lyo.testsuite.server/config/refimpl2020/cm/suiteconfig.properties

@@ -19,13 +19,13 @@ useThisServiceProvider=http://localhost:8801/services/serviceProviders/sp_single
 # Implementation name (for identification purposes)
 implName=OSLC RefImpl 2020 CM
 # The authentication style (currently supports only BASIC, not FORM)
-# FIXME: no auth on CM now
-authMethod=BASIC
-# Only needed for Jazz-specific form-based authentification
-#formUri=https://quagmire.rtp.raleigh.ibm.com:9443/ccm/authenticated/j_security_check
-# The authentication credentials
-userId=admin
-pw=admin
+# FIXME: BASIC auth is broken in Testsuite
+# authMethod=BASIC
+# # Only needed for Jazz-specific form-based authentification
+# #formUri=https://quagmire.rtp.raleigh.ibm.com:9443/ccm/authenticated/j_security_check
+# # The authentication credentials
+# userId=admin
+# pw=admin
 
 # Defines which tests to run:
 # OSLC 2:
@@ -91,12 +91,12 @@ updateTemplateXmlFile=update.xml
 
 # How much a test would wait for a connection manager to return a new connection
 # in case thread pool is exhausted (ms), 10s by default
-# timeoutRequest=10000
+ timeoutRequest=500
 
 # How much a client would wait for initial TCP handshake (ms), 500ms by default
-# timeoutConnect=500
+ timeoutConnect=1000
 
 # How much a client would wait for a response from the server (ms). 5s by default
 # Most likely, this is the only setting you may want to adjust if your server is
 # slow to return a response.
-# timeoutSocket=5000
+ timeoutSocket=5000

org.eclipse.lyo.testsuite.server/config/refimpl2020/cm/web.xml

@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns="http://java.sun.com/xml/ns/javaee"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+    id="WebApp_ID" version="3.0">
+    <display-name>CM</display-name>
+    <context-param>
+        <description>Base URI for the adaptor.</description>
+        <param-name>co.oslc.refimpl.cm.gen.servlet.baseurl</param-name>
+        <param-value>http://localhost:8801/</param-value>
+        <!-- Start of user code webxml_baseurl
+        -->
+        <!-- TODO: Add additional configurations here to avoid them be overrriden upon future re-generation -->
+        <!-- End of user code
+        -->
+    </context-param>
+    <!-- Start of user code webxml1
+  -->
+  <!-- TODO: Add additional configurations here to avoid them be overrriden upon future re-generation -->
+  <!-- End of user code
+    -->
+    <listener>
+        <description>Listener for ServletContext lifecycle changes</description>
+        <listener-class>co.oslc.refimpl.cm.gen.servlet.ServletListener</listener-class>
+    </listener>
+    <!-- Start of user code webxml2
+  -->
+  <!-- TODO: Add additional configurations here to avoid them be overrriden upon future re-generation -->
+  <!-- End of user code
+    -->
+    <servlet>
+        <servlet-name>JAX-RS Servlet</servlet-name>
+        <servlet-class>org.glassfish.jersey.servlet.ServletContainer</servlet-class>
+        <init-param>
+            <param-name>javax.ws.rs.Application</param-name>
+            <param-value>co.oslc.refimpl.cm.gen.servlet.Application</param-value>
+        </init-param>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+    <!-- Start of user code webxml_servlet
+    -->
+    <!-- TODO: Add additional configurations here to avoid them be overridden upon future re-generation -->
+    <!-- End of user code
+    -->
+    <servlet-mapping>
+        <servlet-name>JAX-RS Servlet</servlet-name>
+        <url-pattern>/services/*</url-pattern>
+    </servlet-mapping>
+    <!-- <filter>
+        <display-name>CredentialsFilter</display-name>
+        <filter-name>CredentialsFilter</filter-name>
+        <filter-class>co.oslc.refimpl.cm.gen.servlet.CredentialsFilter</filter-class>
+    </filter>
+    <filter-mapping>
+        <filter-name>CredentialsFilter</filter-name>
+        <url-pattern>/services/*</url-pattern>
+    </filter-mapping> -->
+
+    <!-- Start of user code webxml_final
+    -->
+    <!-- TODO: Add additional configurations here to avoid them be overridden upon future re-generation -->
+    <!-- End of user code
+    -->
+</web-app>