From 01461a6cb9b2c85cc1a9c243fdbbfe0804e14116 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Sebastian=20Ho=C3=9F?= <mail@shoss.de>
Date: Sun, 12 Mar 2017 10:38:53 +0100
Subject: [PATCH] simplify pipelines
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Sebastian Hoß <mail@shoss.de>
---
 build/jenkins/Preview | 37 ++-----------------------------------
 build/jenkins/Release | 37 ++-----------------------------------
 2 files changed, 4 insertions(+), 70 deletions(-)

diff --git a/build/jenkins/Preview b/build/jenkins/Preview
index 5ee915e..577f513 100644
--- a/build/jenkins/Preview
+++ b/build/jenkins/Preview
@@ -32,39 +32,6 @@ node {
         }
     }
 
-    stage('Install') {
-        withMaven(
-                maven: "${mavenVersion}",
-                mavenSettingsConfig: "${mavenSettings}",
-                mavenLocalRepo: "${repositoryLocation}") {
-            sh """
-                mvn --batch-mode \
-                    --show-version \
-                    clean install \
-                    -Drelease=${releaseTarget}
-            """
-        }
-    }
-
-    stage('Sign') {
-        withCredentials([
-                string(credentialsId: 'pgp.secretkey', variable: 'PGP_KEY'),
-                string(credentialsId: 'pgp.passphrase', variable: 'PGP_PASSPHRASE')]) {
-            withMaven(
-                    maven: "${mavenVersion}",
-                    mavenSettingsConfig: "${mavenSettings}",
-                    mavenLocalRepo: "${repositoryLocation}") {
-                sh """
-                    mvn --batch-mode \
-                        --show-version \
-                        pgp:sign \
-                        -Dpgp.secretKey=keyfile:${PGP_KEY} \
-                        -Dpgp.passphrase=literal:'${PGP_PASSPHRASE}'
-                """
-            }
-        }
-    }
-
     stage('Analyze') {
         withSonarQubeEnv('quality.metio.wtf') {
             withMaven(
@@ -87,9 +54,9 @@ node {
                     mavenLocalRepo: "${repositoryLocation}") {
                 sh """
                     mvn --batch-mode \
-                        --settings $MAVEN_SETTINGS \
                         --show-version \
-                        nexus-staging:deploy \
+                        --settings $MAVEN_SETTINGS \
+                        pgp:sign deploy \
                         -Drelease=${releaseTarget} \
                         -DskipLocalStaging=${skipLocalStaging}
                 """
diff --git a/build/jenkins/Release b/build/jenkins/Release
index f0d6384..aad6a7a 100644
--- a/build/jenkins/Release
+++ b/build/jenkins/Release
@@ -34,20 +34,6 @@ node {
         }
     }
 
-    stage('Install') {
-        withMaven(
-                maven: "${mavenVersion}",
-                mavenSettingsConfig: "${mavenSettings}",
-                mavenLocalRepo: "${repositoryLocation}") {
-            sh """
-                mvn --batch-mode \
-                    --show-version \
-                    clean install \
-                    -Drelease=${releaseTarget}
-            """
-        }
-    }
-
     stage('Analyze') {
         withSonarQubeEnv('quality.metio.wtf') {
             withMaven(
@@ -63,25 +49,6 @@ node {
         }
     }
 
-    stage('Sign') {
-        withCredentials([
-                string(credentialsId: 'pgp.secretkey', variable: 'PGP_KEY'),
-                string(credentialsId: 'pgp.passphrase', variable: 'PGP_PASSPHRASE')]) {
-            withMaven(
-                    maven: "${mavenVersion}",
-                    mavenSettingsConfig: "${mavenSettings}",
-                    mavenLocalRepo: "${repositoryLocation}") {
-                sh """
-                    mvn --batch-mode \
-                        --show-version \
-                        pgp:sign \
-                        -Dpgp.secretKey=keyfile:${PGP_KEY} \
-                        -Dpgp.passphrase=literal:'${PGP_PASSPHRASE}'
-                """
-            }
-        }
-    }
-
     stage('Deploy') {
         configFileProvider([configFile(fileId: "${mavenSettings}", variable: 'MAVEN_SETTINGS')]) {
             withMaven(
@@ -89,9 +56,9 @@ node {
                     mavenLocalRepo: "${repositoryLocation}") {
                 sh """
                     mvn --batch-mode \
-                        --settings $MAVEN_SETTINGS \
                         --show-version \
-                        nexus-staging:deploy \
+                        --settings $MAVEN_SETTINGS \
+                        pgp:sign deploy \
                         -Drelease=${releaseTarget} \
                         -DskipLocalStaging=${skipLocalStaging}
                 """
-- 
2.11.4.GIT