commit 797f8c8564df1dee944a0ca3ea3622d518e1ba71
author Maxim Nesen <maxim.nesen@oracle.com> Thu Dec 05 08:59:17 2019 +0100
committer Lukas Jungmann <lukas.jungmann@oracle.com> Thu Dec 05 09:18:49 2019 +0100
tree 88bae92fd368a20c7e001a2dd25fc059949cc50f
parent c5b2f2c2e6c924f61732094439bb053a70e2323c

JIPP migration

Signed-off-by: Maxim Nesen <maxim.nesen@oracle.com>

etc/jenkins/continuous.groovy

diff --git a/etc/jenkins/continuous.groovy b/etc/jenkins/continuous.groovy
index 786cd89..8055c92 100644
--- a/etc/jenkins/continuous.groovy
+++ b/etc/jenkins/continuous.groovy
@@ -20,11 +20,9 @@
 //   GIT_USER_EMAIL      - Git user e-mail (for commits)
 //   SSH_CREDENTIALS_ID  - Jenkins ID of SSH credentials
 //   GPG_CREDENTIALS_ID  - Jenkins ID of GPG credentials (stored as KEYRING variable)
-//   SETTINGS_XML_ID     - Jenkins ID of settings.xml file
-//   SETTINGS_SEC_XML_ID - Jenkins ID of settings-security.xml file
 
 pipeline {
-    
+
     agent any
 
     tools {
@@ -63,26 +61,16 @@
         // Perform release
         stage('Build') {
             steps {
-                configFileProvider([
-                        configFile(
-                            fileId: SETTINGS_XML_ID,
-                            targetLocation: '/home/jenkins/.m2/settings.xml'
-                        ), 
-                        configFile(
-                            fileId: SETTINGS_SEC_XML_ID, 
-                            targetLocation: '/home/jenkins/.m2/'
-                        )]) {
-                    sshagent([SSH_CREDENTIALS_ID]) {
-                        sh '''
-                            etc/jenkins/continuous.sh
-                        '''
-                    }
+                sshagent([SSH_CREDENTIALS_ID]) {
+                    sh '''
+                        etc/jenkins/continuous.sh
+                    '''
                 }
                 junit '**/target/surefire-reports/*.xml'
                 recordIssues(tools: [spotBugs(useRankAsPriority: true)])
             }
         }
-      
+
     }
 
 }

etc/jenkins/release.groovy

diff --git a/etc/jenkins/release.groovy b/etc/jenkins/release.groovy
index 765b656..104dd57 100644
--- a/etc/jenkins/release.groovy
+++ b/etc/jenkins/release.groovy
@@ -18,11 +18,9 @@
 //   GIT_USER_EMAIL      - Git user e-mail (for commits)
 //   SSH_CREDENTIALS_ID  - Jenkins ID of SSH credentials
 //   GPG_CREDENTIALS_ID  - Jenkins ID of GPG credentials (stored as KEYRING variable)
-//   SETTINGS_XML_ID     - Jenkins ID of settings.xml file
-//   SETTINGS_SEC_XML_ID - Jenkins ID of settings-security.xml file
 
 pipeline {
-    
+
     agent any
 
     tools {
@@ -60,25 +58,14 @@
         // Perform release
         stage('Release') {
             steps {
-                configFileProvider([
-                        configFile(
-                            fileId: SETTINGS_XML_ID,
-                            targetLocation: '/home/jenkins/.m2/settings.xml'
-                        ), 
-                        configFile(
-                            fileId: SETTINGS_SEC_XML_ID, 
-                            targetLocation: '/home/jenkins/.m2/'
-                        )]) {
-                    sshagent([SSH_CREDENTIALS_ID]) {
-                        sh '''
-                            etc/jenkins/release.sh "${API_VERSION}" "${NEXT_API_VERSION}" \
-                                                   "${DRY_RUN}" "${OVERWRITE}"
-                        '''
-                    }
-                }
+              sshagent([SSH_CREDENTIALS_ID]) {
+                sh '''
+                  etc/jenkins/release.sh "${API_VERSION}" "${NEXT_API_VERSION}" \
+                                         "${DRY_RUN}" "${OVERWRITE}"
+                   '''
+              }
             }
         }
-      
     }
 
 }