JIPP migration Signed-off-by: Maxim Nesen <maxim.nesen@oracle.com>
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)]) } } - + } }
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}" + ''' + } } } - } }