refresh of pipelines to use simpler ?: params check

Evolveum · Jun 1, 2022 · 16d0bc5 · 16d0bc5
1 parent 59d0430
commit 16d0bc5
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 38 deletions.
diff --git a/tools/jenkins/midpoint-main-generic-pg-pipeline b/tools/jenkins/midpoint-main-generic-pg-pipeline
@@ -5,10 +5,7 @@
  * and European Union Public License. See LICENSE file for details.
  */
 
-def verbose = 0
-try {
-    verbose = Integer.parseInt(params.VERBOSE ?: '0')
-} catch (Exception e) { /* ignored */ }
+def verbose = params.VERBOSE ?: '0'
 
 podTemplate(
         activeDeadlineSeconds: 21600, // 6h total build limit
@@ -24,7 +21,7 @@ podTemplate(
                         resourceRequestMemory: '1Gi',
                         resourceLimitMemory: '1Gi'),
                 containerTemplate(name: 'postgres',
-                        image: "${params.POSTGRES_IMAGE ?: 'postgres:13-alpine'}",
+                        image: params.POSTGRES_IMAGE ?: 'postgres:13-alpine',
                         runAsUser: '0',
                         ttyEnabled: true,
                         resourceRequestCpu: '2',
@@ -39,19 +36,19 @@ podTemplate(
                         ],
                         ports: [portMapping(name: 'postgres', containerPort: 5432)]),
                 containerTemplate(name: 'maven',
-                        image: "${params.BUILDER_IMAGE ?: 'maven:3.8.5-openjdk-11'}",
+                        image: params.BUILDER_IMAGE ?: 'maven:3.8.5-openjdk-11',
                         runAsUser: '0',
                         ttyEnabled: true,
                         command: 'cat',
-                        resourceRequestCpu: "${params.BUILDER_CPU ?: '4'}",
-                        resourceLimitCpu: "${params.BUILDER_CPU ?: '4'}",
+                        resourceRequestCpu: params.BUILDER_CPU ?: '4',
+                        resourceLimitCpu: params.BUILDER_CPU ?: '4',
                         resourceRequestMemory: '8Gi',
                         resourceLimitMemory: '8Gi') // see also -Xmx flag lower
         ]
 ) {
     node(POD_LABEL) {
         stage("checkout") {
-            git branch: "${params.BRANCH ?: 'master'}",
+            git branch: params.BRANCH ?: 'master',
                     url: 'https://github.com/Evolveum/midpoint.git'
         }
         stage("db-init") {

diff --git a/tools/jenkins/midpoint-main-generic-sql-server-pipeline b/tools/jenkins/midpoint-main-generic-sql-server-pipeline
@@ -6,10 +6,7 @@
  */
 
 // Our MS SQL Server docs: https://docs.evolveum.com/midpoint/reference/repository/generic/ms-sql/
-def verbose = 0
-try {
-    verbose = Integer.parseInt(params.VERBOSE ?: '0')
-} catch (Exception e) { /* ignored */ }
+def verbose = params.VERBOSE ?: '0'
 
 // ; needs to be escaped with \ for bash below (that is \\ in Groovy string)
 def dbprops = '-Dmidpoint.repository.jdbcUrl=jdbc:sqlserver://localhost:1433\\;database=midtest\\;trustServerCertificate=true' +

diff --git a/tools/jenkins/midpoint-main-nativepg-pipeline b/tools/jenkins/midpoint-main-nativepg-pipeline
@@ -5,10 +5,7 @@
  * and European Union Public License. See LICENSE file for details.
  */
 
-def verbose = 0
-try {
-    verbose = Integer.parseInt(params.VERBOSE ?: '0')
-} catch (Exception e) { /* ignored */ }
+def verbose = params.VERBOSE ?: '0'
 
 podTemplate(
         activeDeadlineSeconds: 21600, // 6h total build limit
@@ -24,7 +21,7 @@ podTemplate(
                         resourceRequestMemory: '1Gi',
                         resourceLimitMemory: '1Gi'),
                 containerTemplate(name: 'postgres',
-                        image: "${params.POSTGRES_IMAGE ?: 'postgres:13-alpine'}",
+                        image: params.POSTGRES_IMAGE ?: 'postgres:13-alpine',
                         runAsUser: '0',
                         ttyEnabled: true,
                         resourceRequestCpu: '2',
@@ -39,19 +36,19 @@ podTemplate(
                         ],
                         ports: [portMapping(name: 'postgres', containerPort: 5432)]),
                 containerTemplate(name: 'maven',
-                        image: "${params.BUILDER_IMAGE ?: 'maven:3.8.5-openjdk-11'}",
+                        image: params.BUILDER_IMAGE ?: 'maven:3.8.5-openjdk-11',
                         runAsUser: '0',
                         ttyEnabled: true,
                         command: 'cat',
-                        resourceRequestCpu: "${params.BUILDER_CPU ?: '4'}",
-                        resourceLimitCpu: "${params.BUILDER_CPU ?: '4'}",
+                        resourceRequestCpu: params.BUILDER_CPU ?: '4',
+                        resourceLimitCpu: params.BUILDER_CPU ?: '4',
                         resourceRequestMemory: '8Gi',
                         resourceLimitMemory: '8Gi') // see also -Xmx flag lower
         ]
 ) {
     node(POD_LABEL) {
         stage("checkout") {
-            git branch: "${params.BRANCH ?: 'master'}",
+            git branch: params.BRANCH ?: 'master',
                     url: 'https://github.com/Evolveum/midpoint.git'
         }
         stage("db-init") {

diff --git a/tools/jenkins/midpoint-main-pipeline b/tools/jenkins/midpoint-main-pipeline
@@ -5,10 +5,7 @@
  * and European Union Public License. See LICENSE file for details.
  */
 
-def verbose = 0
-try {
-    verbose = Integer.parseInt(params.VERBOSE ?: '0')
-} catch (Exception e) { /* ignored */ }
+def verbose = params.VERBOSE ?: '0'
 
 podTemplate(
         activeDeadlineSeconds: 21600, // 6h total build limit
@@ -25,19 +22,19 @@ podTemplate(
                         resourceRequestMemory: '1Gi',
                         resourceLimitMemory: '1Gi'),
                 containerTemplate(name: 'maven',
-                        image: "${params.BUILDER_IMAGE ?: 'maven:3.8.5-openjdk-11'}",
+                        image: params.BUILDER_IMAGE ?: 'maven:3.8.5-openjdk-11',
                         runAsUser: '0',
                         ttyEnabled: true,
                         command: 'cat',
-                        resourceRequestCpu: '4',
-                        resourceLimitCpu: '4',
+                        resourceRequestCpu: params.BUILDER_CPU ?: '4',
+                        resourceLimitCpu: params.BUILDER_CPU ?: '4',
                         resourceRequestMemory: '8Gi',
                         resourceLimitMemory: '8Gi') // see also -Xmx flag lower
         ]
 ) {
     node(POD_LABEL) {
         stage("checkout") {
-            git branch: "${params.BRANCH ?: 'master'}",
+            git branch: params.BRANCH ?: 'master',
                     url: 'https://github.com/Evolveum/midpoint.git'
         }
         stage("build") {

diff --git a/tools/jenkins/midpoint-quick-pipeline b/tools/jenkins/midpoint-quick-pipeline
@@ -5,10 +5,7 @@
  * and European Union Public License. See LICENSE file for details.
  */
 
-def verbose = 0
-try {
-    verbose = Integer.parseInt(params.VERBOSE ?: '0')
-} catch (Exception e) { /* ignored */ }
+def verbose = params.VERBOSE ?: '0'
 
 podTemplate(
         activeDeadlineSeconds: 7200,
@@ -24,19 +21,19 @@ podTemplate(
                         resourceRequestMemory: '1Gi',
                         resourceLimitMemory: '1Gi'),
                 containerTemplate(name: 'maven',
-                        image: "${params.BUILDER_IMAGE ?: 'maven:3.8.5-openjdk-11'}",
+                        image: params.BUILDER_IMAGE ?: 'maven:3.8.5-openjdk-11',
                         runAsUser: '0',
                         ttyEnabled: true,
                         command: 'cat',
-                        resourceRequestCpu: "${params.BUILDER_CPU ?: '4'}",
-                        resourceLimitCpu: "${params.BUILDER_CPU ?: '4'}",
+                        resourceRequestCpu: params.BUILDER_CPU ?: '4',
+                        resourceLimitCpu: params.BUILDER_CPU ?: '4',
                         resourceRequestMemory: '6Gi',
                         resourceLimitMemory: '6Gi') // by default -Xmx4g is set in main POM
         ]
 ) {
     node(POD_LABEL) {
         stage("checkout") {
-            git branch: "${params.BRANCH ?: 'master'}",
+            git branch: params.BRANCH ?: 'master',
                     url: 'https://github.com/Evolveum/midpoint.git'
         }
         stage("build") {