Merge remote-tracking branch 'origin/master' into feature/adminlte3-u…

…pgrade
Evolveum · Apr 27, 2022 · a47df07 · a47df07
2 parents ffe8c16 + 694b5d2
commit a47df07
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 6 deletions.
diff --git a/...del-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java b/...del-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
@@ -28,6 +28,8 @@
 import javax.xml.datatype.XMLGregorianCalendar;
 import javax.xml.namespace.QName;
 
+import com.evolveum.midpoint.authentication.api.AuthModule;
+
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.mutable.MutableInt;
 import org.jetbrains.annotations.NotNull;
@@ -4550,6 +4552,23 @@ public Integer getOrder() {
             }
         };
         mpAuthentication.addAuthentications(moduleAuthentication);
+        AuthModule authModule = new AuthModule() {
+            @Override
+            public ModuleAuthentication getBaseModuleAuthentication() {
+                return moduleAuthentication;
+            }
+
+            @Override
+            public String getNameOfModule() {
+                return SecurityPolicyUtil.DEFAULT_MODULE_NAME;
+            }
+
+            @Override
+            public Integer getOrder() {
+                return 1;
+            }
+        };
+        mpAuthentication.setAuthModules(Collections.singletonList(authModule));
         mpAuthentication.setPrincipal(authentication.getPrincipal());
         return mpAuthentication;
     }

diff --git a/testing/conntest/src/test/resources/ad-ldap-multidomain/resource-ad2012-strange.xml b/testing/conntest/src/test/resources/ad-ldap-multidomain/resource-ad2012-strange.xml
@@ -47,7 +47,7 @@
             <icfcldap:enableExtraTests>true</icfcldap:enableExtraTests>
             <icfcldap:forcePasswordChangeAtNextLogon>false</icfcldap:forcePasswordChangeAtNextLogon>
             <icfcldap:useTreeDelete>always</icfcldap:useTreeDelete>
-            <icfcldap:baseContextToSynchronize>CN=Users,DC=ad2012,DC=lab,DC=evolveum,DC=com</icfcldap:baseContextToSynchronize>
+            <icfcldap:baseContextToSynchronize>DC=ad2012,DC=lab,DC=evolveum,DC=com</icfcldap:baseContextToSynchronize>
         </icfc:configurationProperties>
         <icfc:resultsHandlerConfiguration>
             <icfc:enableNormalizingResultsHandler>false</icfc:enableNormalizingResultsHandler>

diff --git a/testing/conntest/src/test/resources/ad-ldap-multidomain/resource-ad2012.xml b/testing/conntest/src/test/resources/ad-ldap-multidomain/resource-ad2012.xml
@@ -41,7 +41,7 @@
             <icfcldap:enableExtraTests>true</icfcldap:enableExtraTests>
             <icfcldap:forcePasswordChangeAtNextLogon>false</icfcldap:forcePasswordChangeAtNextLogon>
             <icfcldap:useTreeDelete>always</icfcldap:useTreeDelete>
-            <icfcldap:baseContextToSynchronize>CN=Users,DC=ad2012,DC=lab,DC=evolveum,DC=com</icfcldap:baseContextToSynchronize>
+            <icfcldap:baseContextToSynchronize>DC=ad2012,DC=lab,DC=evolveum,DC=com</icfcldap:baseContextToSynchronize>
         </icfc:configurationProperties>
         <icfc:resultsHandlerConfiguration>
             <icfc:enableNormalizingResultsHandler>false</icfc:enableNormalizingResultsHandler>

diff --git a/testing/conntest/src/test/resources/ad-ldap-multidomain/resource-ad2016.xml b/testing/conntest/src/test/resources/ad-ldap-multidomain/resource-ad2016.xml
@@ -40,7 +40,7 @@
             <icfcldap:enableExtraTests>true</icfcldap:enableExtraTests>
             <icfcldap:forcePasswordChangeAtNextLogon>false</icfcldap:forcePasswordChangeAtNextLogon>
             <icfcldap:useTreeDelete>always</icfcldap:useTreeDelete>
-            <icfcldap:baseContextToSynchronize>CN=Users,DC=ad2016,DC=lab,DC=evolveum,DC=com</icfcldap:baseContextToSynchronize>
+            <icfcldap:baseContextToSynchronize>DC=ad2016,DC=lab,DC=evolveum,DC=com</icfcldap:baseContextToSynchronize>
         </icfc:configurationProperties>
         <icfc:resultsHandlerConfiguration>
             <icfc:enableNormalizingResultsHandler>false</icfc:enableNormalizingResultsHandler>

diff --git a/testing/conntest/src/test/resources/ad-ldap-multidomain/resource-ad2019-strange.xml b/testing/conntest/src/test/resources/ad-ldap-multidomain/resource-ad2019-strange.xml
@@ -47,7 +47,7 @@
             <icfcldap:enableExtraTests>true</icfcldap:enableExtraTests>
             <icfcldap:forcePasswordChangeAtNextLogon>false</icfcldap:forcePasswordChangeAtNextLogon>
             <icfcldap:useTreeDelete>always</icfcldap:useTreeDelete>
-            <icfcldap:baseContextToSynchronize>CN=Users,DC=ad2019,DC=lab,DC=evolveum,DC=com</icfcldap:baseContextToSynchronize>
+            <icfcldap:baseContextToSynchronize>DC=ad2019,DC=lab,DC=evolveum,DC=com</icfcldap:baseContextToSynchronize>
         </icfc:configurationProperties>
         <icfc:resultsHandlerConfiguration>
             <icfc:enableNormalizingResultsHandler>false</icfc:enableNormalizingResultsHandler>

diff --git a/tools/jenkins/midpoint-main-pipeline b/tools/jenkins/midpoint-main-pipeline
@@ -2,7 +2,8 @@ podTemplate(
         activeDeadlineSeconds: 7200,
         idleMinutes: 1,
         nodeSelector: '${NODE_SELECTOR}',
-        workspaceVolume: dynamicPVC(requestsSize: "10Gi"),
+        volumes: [secretVolume(secretName: "jenkins-nexus",mountPath: "/root/jenkins-nexus")],
+        workspaceVolume: dynamicPVC(requestsSize: "20Gi"),
         yaml:'''
 spec:
   securityContext:
@@ -34,13 +35,22 @@ spec:
             container('maven') {
                 try {
                     sh """#!/bin/bash
+                        mkdir -p /root/.m2
+                        ln -s ../jenkins-nexus/settings.xml /root/.m2/settings.xml
+
                         if [ '${VERBOSE}' = '1' ]
                         then
 	                        env | sort
 	                        mvn --version
+	                        df -h
 			            fi
 
 				        mvn clean deploy -P -dist -DskipTests -DdeployAtEnd=true
+
+				        if [ '${VERBOSE}' = '1' ]
+                        then
+                            df -h
+                        fi
                     """
                 } catch (err) {
                     echo "Caught: ${err}"
@@ -51,7 +61,14 @@ spec:
         stage("tests-default") {
             container('maven') {
                 try {
-                    sh """mvn verify -Dmaven.test.failure.ignore=true"""
+                    sh """
+                        mvn verify -Dmaven.test.failure.ignore=true
+
+				        if [ '${VERBOSE}' = '1' ]
+                        then
+                            df -h
+                        fi
+                    """
                 } catch (err) {
                     echo "Caught: ${err}"
                     currentBuild.result = 'FAILURE'
@@ -65,6 +82,11 @@ spec:
                 try {
                     sh """
                         mvn verify -Dmaven.test.failure.ignore=true -P extratest -Dfailsafe.args="-Xms2g -Xmx6g -Duser.language=en --add-exports java.management/sun.management=ALL-UNNAMED"
+
+				        if [ '${VERBOSE}' = '1' ]
+                        then
+                            df -h
+                        fi
                     """
                 } catch (err) {
                     echo "Caught: ${err}"