Merge remote-tracking branch 'refs/remotes/origin/master'

Evolveum · Apr 26, 2022 · 7262790 · 7262790
2 parents cf9cdf3 + 7fc7460
commit 7262790
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 63 deletions.
diff --git a/.travis.yml b/.travis.yml
diff --git a/repo/system-init/src/main/java/com/evolveum/midpoint/init/StartupConfiguration.java b/repo/system-init/src/main/java/com/evolveum/midpoint/init/StartupConfiguration.java
@@ -100,14 +100,6 @@ public StartupConfiguration(String midPointHome, String configFilename) {
         this.configFilename = configFilename;
     }
 
-    /**
-     * Get current configuration file name
-     */
-    @SuppressWarnings("WeakerAccess")
-    public String getConfigFilename() {
-        return configFilename;
-    }
-
     @Override
     public String getMidpointHome() {
         return midPointHomePath;
@@ -254,7 +246,7 @@ private void setupInitialLoggingFromHomeDirectory() {
             configurator.setContext(context);
             configurator.doConfigure(logbackConfigFile);
         } catch (Exception e) {
-            // This will logged by default logging configuration
+            // This will be logged by default logging configuration
             LOGGER.error("Error loading additional logging configuration: {}", e.getMessage(), e);
             // If normal logging fails make sure it is logged by web container
             e.printStackTrace();
@@ -274,8 +266,7 @@ private void createXmlConfiguration(String filename) throws ConfigurationExcepti
                                 new Parameters()
                                         .xml()
                                         .setFileName(filename)
-                                        .setPrefixLookups(lookups)
-                        );
+                                        .setPrefixLookups(lookups));
         /*
         On debug level this shows stacktrace for:
         DEBUG org.apache.commons.beanutils.FluentPropertyBeanIntrospector - Exception is:

diff --git a/.../com/evolveum/midpoint/testing/conntest/ad/multidomain/AbstractAdLdapMultidomainTest.java b/.../com/evolveum/midpoint/testing/conntest/ad/multidomain/AbstractAdLdapMultidomainTest.java
@@ -2204,9 +2204,7 @@ public void test850ReconcileAccounts() throws Exception {
 //        assertLdapConnectorInstances(2);
     }
 
-    // DISABLED because we do not know how to properly configure sync privileges in a AD forrest.
-    // More experiments are needed, but only after we migrate our old AD servers.
-    @Test(enabled = false)
+    @Test
     public void test900ImportSyncTask() throws Exception {
         // GIVEN
         Task task = getTestTask();
@@ -2229,9 +2227,7 @@ public void test900ImportSyncTask() throws Exception {
         assertStepSyncToken(getSyncTaskOid(), 0, tsStart, tsEnd);
     }
 
-    // DISABLED because we do not know how to properly configure sync privileges in a AD forrest.
-    // More experiments are needed, but only after we migrate our old AD servers.
-    @Test(enabled = false)
+    @Test
     public void test901SyncAddAccountHt() throws Exception {
         // GIVEN
         Task task = getTestTask();
@@ -2267,7 +2263,7 @@ protected void assertStepSyncToken(String syncTaskOid, int step, long tsStart, l
                 (String) getRootSyncTokenRealValueRequired(task.getRawTaskObjectClonedIfNecessary().asObjectable());
         assertThat(StringUtils.isBlank(tokenRealValue))
                 .as("Empty sync token value")
-                .isTrue();
+                .isFalse();
         assertSuccess(result);
     }
 

diff --git a/...src/test/java/com/evolveum/midpoint/testing/conntest/ad/multidomain/TestAdLdapAd2019.java b/...src/test/java/com/evolveum/midpoint/testing/conntest/ad/multidomain/TestAdLdapAd2019.java
@@ -27,7 +27,8 @@
  * TODO: SSH
  * There is also a problem with CredSSP configuration on those servers.
  * Therefore "second-hop" CredSSP tests are skipped here.
- * There is still CreddSSP configured in ad01 server (top-level domain), therefore CredSSP is still tested in a way.
+ * There is still CreddSSP configured in ad01 server (top-level domain), therefore CredSSP could be tested somehow.
+ * However, we are not supporting powershell connector any more, therefore CredSSP is no longer part of this tests.
  * In case of need the old Chimera/Hydra environment is archived, therefore it can be restored and used for full CredSSP tests.
  *
  * @see AbstractAdLdapMultidomainTest

diff --git a/testing/conntest/src/test/resources/ad-ldap-multidomain/resource-ad2019.xml b/testing/conntest/src/test/resources/ad-ldap-multidomain/resource-ad2019.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=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/testing/conntest/src/test/resources/ad-ldap-multidomain/task-sync.xml b/testing/conntest/src/test/resources/ad-ldap-multidomain/task-sync.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2015-2020 Evolveum and contributors
+  ~ Copyright (c) 2015-2022 Evolveum and contributors
   ~
   ~ This work is dual-licensed under the Apache License 2.0
   ~ and European Union Public License. See LICENSE file for details.
@@ -9,6 +9,7 @@
 <task oid="0f93d8d4-5fb4-11ea-8571-a3f090bf921f"
     xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
     xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
+    xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:xsd="http://www.w3.org/2001/XMLSchema">
 
@@ -18,8 +19,17 @@
     <ownerRef oid="00000000-0000-0000-0000-000000000002"/>
     <executionState>runnable</executionState>
 
-    <handlerUri>http://midpoint.evolveum.com/xml/ns/public/model/synchronization/task/live-sync/handler-3</handlerUri>
-    <objectRef oid="eced6d24-73e3-11e5-8457-93eff15a6b85" xsi:type="c:ResourceType"/>
+    <activity>
+        <work>
+            <liveSynchronization>
+                <resourceObjects>
+                    <resourceRef oid="eced6d24-73e3-11e5-8457-93eff15a6b85" />
+                    <objectclass>ri:user</objectclass>
+                </resourceObjects>
+            </liveSynchronization>
+        </work>
+    </activity>
+
     <recurrence>recurring</recurrence>
     <schedule>
         <interval>3</interval>

diff --git a/tools/jenkins/midpoint-main-pipeline b/tools/jenkins/midpoint-main-pipeline
@@ -34,7 +34,7 @@ podTemplate(
 	                        mvn --version
 			            fi
 
-				        mvn clean install -P -dist -DskipTests
+				        mvn clean deploy -P -dist -DskipTests -DdeployAtEnd=true
                     """
                 } catch (err) {
                     echo "Caught: ${err}"
@@ -45,7 +45,7 @@ podTemplate(
         stage("tests-default") {
             container('maven') {
                 try {
-                    sh """mvn verify"""
+                    sh """mvn verify -Dmaven.test.failure.ignore=true"""
                 } catch (err) {
                     echo "Caught: ${err}"
                     currentBuild.result = 'FAILURE'
@@ -58,7 +58,7 @@ podTemplate(
             container('maven') {
                 try {
                     sh """
-                        mvn verify -P extratest -Dfailsafe.args="-Xms2g -Xmx6g -Duser.language=en --add-exports java.management/sun.management=ALL-UNNAMED"
+                        mvn verify -Dmaven.test.failure.ignore=true -P extratest -Dfailsafe.args="-Xms2g -Xmx6g -Duser.language=en --add-exports java.management/sun.management=ALL-UNNAMED"
                     """
                 } catch (err) {
                     echo "Caught: ${err}"