diff options
| author | Mickael Istria | 2021-11-02 21:26:43 +0000 |
|---|---|---|
| committer | Mickael Istria | 2021-11-04 19:18:19 +0000 |
| commit | 665926ae96c1eb40eb4150b2095dfea9c3677046 (patch) | |
| tree | 5d4ef74196b460031409d3694f292c43058e416c | |
| parent | d73935cdcb52f128b4b8db78c1c745d61c51779f (diff) | |
| download | eclipse.platform.releng.aggregator-665926ae96c1eb40eb4150b2095dfea9c3677046.tar.gz eclipse.platform.releng.aggregator-665926ae96c1eb40eb4150b2095dfea9c3677046.tar.xz eclipse.platform.releng.aggregator-665926ae96c1eb40eb4150b2095dfea9c3677046.zip | |
Bug 576895 - Add PGP signature for artifacts that aren't jarsigned
+ Improve configuration, use KEYRING_PASSPHRASE
Change-Id: I645d5c9ce6c3f034ed143526b0a48ee155cce778
Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.releng.aggregator/+/187249
Tested-by: Platform Bot <platform-bot@eclipse.org>
Reviewed-by: Mickael Istria <mistria@redhat.com>
| -rw-r--r-- | Jenkinsfile | 21 | ||||
| -rw-r--r-- | eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/pom.xml | 7 |
2 files changed, 16 insertions, 12 deletions
diff --git a/Jenkinsfile b/Jenkinsfile index 80387129e..15d89db07 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -22,18 +22,21 @@ pipeline { } stage('Build') { steps { - sh """ - mvn clean verify -Dmaven.repo.local=$WORKSPACE/.m2/repository \ - -Pbree-libs -Peclipse-sign \ - -Dmaven.test.skip=true -DskipTests=true -DaggregatorBuild=true \ - -DapiBaselineTargetDirectory=${WORKSPACE} \ - -Dproject.build.sourceEncoding=UTF-8 - """ + withCredentials([string(credentialsId: 'gpg-passphrase', variable: 'KEYRING_PASSPHRASE')]) { + sh ''' + mvn clean verify -Dmaven.repo.local=$WORKSPACE/.m2/repository \ + -Pbree-libs -Peclipse-sign \ + -Dmaven.test.skip=true -DskipTests=true -DaggregatorBuild=true \ + -DapiBaselineTargetDirectory=${WORKSPACE} \ + -Dgpg.passphrase="${KEYRING_PASSPHRASE}" \ + -Dproject.build.sourceEncoding=UTF-8 + ''' + } + } post { always { - archiveArtifacts artifacts: '.*log,*/target/work/data/.metadata/.*log,*/tests/target/work/data/.metadata/.*log,apiAnalyzer-workspace/.metadata/.*log', allowEmptyArchive: true - publishIssues issues:[scanForIssues(tool: java()), scanForIssues(tool: mavenConsole())] + archiveArtifacts artifacts: '.*log,*/target/work/data/.metadata/.*log,*/tests/target/work/data/.metadata/.*log,apiAnalyzer-workspace/.metadata/.*log,eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/target/repository/*', allowEmptyArchive: true } unstable { gerritReview labels: [Verified: -1], message: "Build UNSTABLE (test failures) $BUILD_URL" diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/pom.xml index 707168095..96e4cd924 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/pom.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/pom.xml @@ -421,12 +421,13 @@ <artifactId>tycho-gpg-plugin</artifactId> <version>${tycho.version}</version> <executions> - <!-- execution> Currently skipped, to be restored later + <execution> <goals><goal>sign-p2-artifacts</goal></goals> <configuration> - <keyname>platform-releng-dev@eclipse.org</keyname> + <keyname>b6d3ab9bcc641282</keyname> + <skipIfJarsigned>true</skipIfJarsigned> </configuration> - </execution --> + </execution> </executions> </plugin> <plugin> |