Merge branch 'master' into feature/synchronization-definition-update

Evolveum · Apr 28, 2022 · 3cfcbb6 · 3cfcbb6
2 parents 3a6fdc7 + 6a9dbc1
commit 3cfcbb6
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 9 deletions.
diff --git a/...n-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogDetails.java b/...n-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogDetails.java
@@ -439,7 +439,8 @@ private List<ObjectDeltaOperationType> connectDeltas(List<ObjectDeltaOperationTy
         Map<PolyStringType, ObjectDeltaOperationType> focusDeltas = new HashMap<>();
         List<ObjectDeltaOperationType> otherDeltas = new ArrayList<>();
         for (ObjectDeltaOperationType delta : deltas) {
-            if (delta != null && delta.getObjectDelta() != null && FocusType.class.isAssignableFrom(WebComponentUtil.qnameToClass(getPrismContext(), delta.getObjectDelta().getObjectType()))) {
+            var deltaType = WebComponentUtil.qnameToClass(getPrismContext(), delta.getObjectDelta().getObjectType());
+            if (delta != null && delta.getObjectDelta() != null && deltaType != null && FocusType.class.isAssignableFrom(deltaType)) {
                 if (focusDeltas.containsKey(delta.getObjectName())) {
                     focusDeltas.get(delta.getObjectName()).setResourceName(null);
                     focusDeltas.get(delta.getObjectName()).setResourceOid(null);
@@ -458,6 +459,9 @@ private List<ObjectDeltaOperationType> connectDeltas(List<ObjectDeltaOperationTy
                 } else {
                     focusDeltas.put(delta.getObjectName(), delta);
                 }
+            } else if (deltaType == null) {
+                // MID-7913 Intentionally we skip this delta for now, since we do not have object definition
+                // type was deprecated and removed.
             } else {
                 otherDeltas.add(delta);
             }

diff --git a/tools/jenkins/midpoint-main-pipeline b/tools/jenkins/midpoint-main-pipeline
@@ -1,14 +1,9 @@
 podTemplate(
         activeDeadlineSeconds: 7200,
         idleMinutes: 1,
-        nodeSelector: '${NODE_SELECTOR}',
+        // Secret volume with maven settings.xml for deploy, see also sim-link in "build" stage.
         volumes: [secretVolume(secretName: "jenkins-nexus",mountPath: "/root/jenkins-nexus")],
         workspaceVolume: dynamicPVC(requestsSize: "20Gi"),
-        yaml:'''
-spec:
-  securityContext:
-    fsGroup: 1000
-''',
         containers: [
                 containerTemplate(name: 'jnlp',
                         image: 'jenkins/inbound-agent:4.10-3-alpine',
@@ -22,7 +17,7 @@ spec:
                         ttyEnabled: true,
                         command: 'cat',
                         resourceLimitCpu: '4',
-                        resourceLimitMemory: '8Gi')
+                        resourceLimitMemory: '8Gi') // see also -Xmx flag lower
         ]
 ) {
     node(POD_LABEL) {
@@ -35,6 +30,7 @@ spec:
             container('maven') {
                 try {
                     sh """#!/bin/bash
+                        # .m2 is mutable and short-term, we just sym-link the settings.xml there.
                         mkdir -p /root/.m2
                         ln -s ../jenkins-nexus/settings.xml /root/.m2/settings.xml
 
@@ -45,7 +41,7 @@ spec:
 	                        df -h
 			            fi
 
-				        mvn clean deploy -P -dist -DskipTests -DdeployAtEnd=true
+				        mvn clean deploy -DskipTests -DdeployAtEnd=true
 
 				        if [ '${VERBOSE}' = '1' ]
                         then
@@ -80,6 +76,7 @@ spec:
         stage("tests-extra") {
             container('maven') {
                 try {
+                    // -Xmx6g should fit into 8GB of RAM, 4g is on the edge for some tests
                     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"
 

diff --git a/tools/jenkins/midpoint-quick-pipeline b/tools/jenkins/midpoint-quick-pipeline
@@ -0,0 +1,49 @@
+podTemplate(
+        activeDeadlineSeconds: 7200,
+        idleMinutes: 1,
+        // No need for secret volume, no mvn deploy done here.
+        workspaceVolume: dynamicPVC(requestsSize: "10Gi"),
+        containers: [
+                containerTemplate(name: 'jnlp',
+                        image: 'jenkins/inbound-agent:4.10-3-alpine',
+                        runAsUser: '0',
+                        resourceLimitCpu: '900m',
+                        resourceLimitMemory: '1Gi',
+                        resourceRequestCpu: '900m',
+                        resourceRequestMemory: '1Gi'),
+                containerTemplate(name: 'maven',
+                        image: 'maven:3.8.5-openjdk-11-slim',
+                        ttyEnabled: true,
+                        command: 'cat',
+                        resourceLimitCpu: '4',
+                        resourceLimitMemory: '8Gi') // see also -Xmx flag lower
+        ]
+) {
+    node(POD_LABEL) {
+        stage("checkout") {
+            git branch: "${BRANCH}",
+                    url: 'https://github.com/Evolveum/midpoint.git'
+            echo "git checkout done..."
+        }
+        stage("build") {
+            container('maven') {
+                try {
+                    sh """#!/bin/bash
+                        if [ '${VERBOSE}' = '1' ]
+                        then
+	                        env | sort
+	                        mvn --version
+			            fi
+
+				        mvn clean install -Dmaven.test.failure.ignore=true -P -dist -DintegrationTestSuite=fast
+                    """
+                } catch (err) {
+                    echo "Caught: ${err}"
+                    currentBuild.result = 'FAILURE'
+                } finally {
+                    step([$class: 'Publisher', reportFilenamePattern: '**/testng-results.xml'])
+                }
+            }
+        }
+    }
+}