Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[I/Y-Build] Simplify GPG-signing in I/Y-builds #2751

Merged
merged 1 commit into from
Jan 16, 2025
Merged

[I/Y-Build] Simplify GPG-signing in I/Y-builds #2751

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 0 additions & 18 deletions JenkinsJobs/Builds/build.jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,24 +97,6 @@ spec:
}
}
}
stage('Load PGP keys'){
environment {
KEYRING = credentials('secret-subkeys-releng.asc')
KEYRING_PASSPHRASE = credentials('secret-subkeys-releng.asc-passphrase')
}
steps {
dir("${CJE_ROOT}/mbscripts") {
sh '''
./mb011_loadPGPKeys.sh 2>&1 | tee $logDir/mb011_loadPGPKeys.sh.log
if [[ ${PIPESTATUS[0]} -ne 0 ]]
then
echo "Failed in Load PGP keys"
exit 1
fi
'''
}
}
}
stage('Export environment variables stage 1'){
steps {
script {
Expand Down
19 changes: 0 additions & 19 deletions JenkinsJobs/YBuilds/P_build.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,25 +105,6 @@ spec:
}
}
}
stage('Load PGP keys'){
environment {
KEYRING = credentials('secret-subkeys-releng.asc')
KEYRING_PASSPHRASE = credentials('secret-subkeys-releng.asc-passphrase')
}
steps {
container('jnlp') {
sh \'\'\'
cd ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/mbscripts
./mb011_loadPGPKeys.sh 2>&1 | tee $logDir/mb011_loadPGPKeys.sh.log
if [[ ${PIPESTATUS[0]} -ne 0 ]]
then
echo "Failed in Load PGP keys"
exit 1
fi
\'\'\'
}
}
}
stage('Export environment variables stage 1'){
steps {
container('jnlp') {
Expand Down
1 change: 1 addition & 0 deletions cje-production/P-build/mb220_buildSdkPatch.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ mvn -f eclipse.platform.releng.tychoeclipsebuilder/${PATCH_OR_BRANCH_LABEL}/pom.
-Dtycho.debug.artifactcomparator \
-Dtycho.localArtifacts=ignore \
-Dcbi.jarsigner.continueOnFail=true \
-Dtycho.pgp.signer=bc -Dtycho.pgp.signer.bc.secretKeys="${KEYRING}" \
-Djgit.dirtyWorkingTree=error \
-Dmaven.repo.local=$LOCAL_REPO \
-Djava.io.tmpdir=$CJE_ROOT/$TMP_DIR \
Expand Down
8 changes: 0 additions & 8 deletions cje-production/mbscripts/mb011_loadPGPKeys.sh
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions cje-production/mbscripts/mb220_buildSdkPatch.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ mvn clean verify -DskipTests=true ${MVN_ARGS} \
-Dtycho.debug.artifactcomparator \
-Dtycho.localArtifacts=ignore \
-Dcbi.jarsigner.continueOnFail=true \
-Dtycho.pgp.signer=bc -Dtycho.pgp.signer.bc.secretKeys="${KEYRING}" \
-Djgit.dirtyWorkingTree=error \
-Dmaven.repo.local=$LOCAL_REPO \
-Djava.io.tmpdir=$CJE_ROOT/$TMP_DIR \
Expand Down
9 changes: 9 additions & 0 deletions eclipse.platform.releng.tychoeclipsebuilder/eclipse/extras/produceChecksum.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,15 @@ echo "[DEBUG] Producing GPG signatures starting."
set -e
if [ ! -z "${KEYRING_PASSPHRASE}" ]
then
#import gpg keys in fresh gpg-homedir
gpg_home="${WORKSPACE}/tools/${client}/gpg/"
mkdir -p ${gpg_home}
alias gpg='gpg --homedir "${gpg_home}"'
gpg --batch --import "${KEYRING}"
for fpr in $(gpg --list-keys --with-colons | awk -F: '/fpr:/ {print $10}' | sort -u); do
echo -e "5\ny\n" | gpg --batch --command-fd 0 --expert --edit-key "${fpr}" trust;
done

gpg --detach-sign --armor --output ${allCheckSumsSHA512}.asc --batch --pinentry-mode loopback --passphrase-fd 0 ${allCheckSumsSHA512} <<< "${KEYRING_PASSPHRASE}"
else
# We don't treat as ERROR since would be normal in a "local build".
Expand Down
2 changes: 0 additions & 2 deletions eclipse.platform.releng.tychoeclipsebuilder/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@
<artifactId>tycho-gpg-plugin</artifactId>
<version>${tycho.version}</version>
<configuration>
<signer>bc</signer>
<keyname>b6d3ab9bcc641282</keyname>
<skipIfJarsigned>false</skipIfJarsigned>
<skipIfJarsignedAndAnchored>true</skipIfJarsignedAndAnchored>
<pgpKeyBehavior>skip</pgpKeyBehavior>
Expand Down
Loading