From a0bd49c8889c8ed1f25e7605cc21cde27da23867 Mon Sep 17 00:00:00 2001 From: Samantha Dawley Date: Fri, 21 Oct 2022 12:02:57 -0700 Subject: [PATCH] Update sshAgent to use IDs so jobs are configured correctly. --- JenkinsJobs/Builds/AddToPComposite.groovy | 2 +- JenkinsJobs/Builds/markStable.groovy | 2 +- JenkinsJobs/Builds/markUnstable.groovy | 2 +- JenkinsJobs/Cleanup/cleanupDLsite.groovy | 2 +- JenkinsJobs/Cleanup/cleanupReleaseArtifacts.groovy | 2 +- JenkinsJobs/Cleanup/dailyCleanOldBuilds.groovy | 2 +- JenkinsJobs/Releng/CBIaggregator.groovy | 4 ++-- JenkinsJobs/Releng/PublishJDTtoMaven.groovy | 2 +- JenkinsJobs/Releng/PublishPDEToMaven.groovy | 2 +- JenkinsJobs/Releng/PublishPlatformToMaven.groovy | 2 +- JenkinsJobs/Releng/checkCompositesValidity.groovy | 2 +- JenkinsJobs/Releng/cleanupReleaseArtifacts.groovy | 2 +- JenkinsJobs/Releng/collectResults.groovy | 2 +- JenkinsJobs/Releng/createGenericComposites.groovy | 2 +- JenkinsJobs/Releng/createMaintenanceBranch.groovy | 2 +- JenkinsJobs/Releng/makeVisible.groovy | 2 +- JenkinsJobs/Releng/newStreamRepos.groovy | 2 +- JenkinsJobs/Releng/renameAndPromote.groovy | 2 +- JenkinsJobs/Releng/tagEclipseRelease.groovy | 2 +- JenkinsJobs/Releng/updateIndex.groovy | 2 +- JenkinsJobs/YBuilds/collectYbuildResults.groovy | 2 +- 21 files changed, 22 insertions(+), 22 deletions(-) diff --git a/JenkinsJobs/Builds/AddToPComposite.groovy b/JenkinsJobs/Builds/AddToPComposite.groovy index d9b582b6269..72d8a3b9d30 100644 --- a/JenkinsJobs/Builds/AddToPComposite.groovy +++ b/JenkinsJobs/Builds/AddToPComposite.groovy @@ -21,7 +21,7 @@ for (STREAM in STREAMS){ wrappers { //adds pre/post actions timestamps() - sshAgent('ssh://genie.releng@projects-storage.eclipse.org') + sshAgent('projects-storage.eclipse.org-bot-ssh') } steps { diff --git a/JenkinsJobs/Builds/markStable.groovy b/JenkinsJobs/Builds/markStable.groovy index 094a9897b92..1113535c69d 100644 --- a/JenkinsJobs/Builds/markStable.groovy +++ b/JenkinsJobs/Builds/markStable.groovy @@ -17,7 +17,7 @@ job('Builds/markStable'){ wrappers { //adds pre/post actions timestamps() - sshAgent('ssh://genie.releng@projects-storage.eclipse.org') + sshAgent('projects-storage.eclipse.org-bot-ssh') } steps { diff --git a/JenkinsJobs/Builds/markUnstable.groovy b/JenkinsJobs/Builds/markUnstable.groovy index 6515e4532e7..79de5ec16b6 100644 --- a/JenkinsJobs/Builds/markUnstable.groovy +++ b/JenkinsJobs/Builds/markUnstable.groovy @@ -19,7 +19,7 @@ job('Builds/markUnstable'){ wrappers { //adds pre/post actions timestamps() - sshAgent('ssh://genie.releng@projects-storage.eclipse.org') + sshAgent('projects-storage.eclipse.org-bot-ssh') } steps { diff --git a/JenkinsJobs/Cleanup/cleanupDLsite.groovy b/JenkinsJobs/Cleanup/cleanupDLsite.groovy index 1c2faa12531..5d3d65e1ada 100644 --- a/JenkinsJobs/Cleanup/cleanupDLsite.groovy +++ b/JenkinsJobs/Cleanup/cleanupDLsite.groovy @@ -12,7 +12,7 @@ job('rt.equinox.releng.cleanupDLsite'){ wrappers { //adds pre/post actions timestamps() - sshAgent('ssh://genie.releng@projects-storage.eclipse.org') + sshAgent('projects-storage.eclipse.org-bot-ssh') } steps { diff --git a/JenkinsJobs/Cleanup/cleanupReleaseArtifacts.groovy b/JenkinsJobs/Cleanup/cleanupReleaseArtifacts.groovy index 419f54d4415..fbd646d7de5 100644 --- a/JenkinsJobs/Cleanup/cleanupReleaseArtifacts.groovy +++ b/JenkinsJobs/Cleanup/cleanupReleaseArtifacts.groovy @@ -34,7 +34,7 @@ job('Cleanup/cleanupReleaseArtifacts'){ wrappers { //adds pre/post actions preBuildCleanup() timestamps() - sshAgent('ssh://genie.releng@projects-storage.eclipse.org') + sshAgent('projects-storage.eclipse.org-bot-ssh') } steps { diff --git a/JenkinsJobs/Cleanup/dailyCleanOldBuilds.groovy b/JenkinsJobs/Cleanup/dailyCleanOldBuilds.groovy index 8c2591198ee..ffbf582cc85 100644 --- a/JenkinsJobs/Cleanup/dailyCleanOldBuilds.groovy +++ b/JenkinsJobs/Cleanup/dailyCleanOldBuilds.groovy @@ -26,7 +26,7 @@ and other such scripts. wrappers { //adds pre/post actions timestamps() preBuildCleanup() - sshAgent('ssh://genie.releng@projects-storage.eclipse.org') + sshAgent('projects-storage.eclipse.org-bot-ssh') timeout { absolute(30) } diff --git a/JenkinsJobs/Releng/CBIaggregator.groovy b/JenkinsJobs/Releng/CBIaggregator.groovy index bf59ae0c975..5f91e2db571 100644 --- a/JenkinsJobs/Releng/CBIaggregator.groovy +++ b/JenkinsJobs/Releng/CBIaggregator.groovy @@ -19,7 +19,7 @@ job('Releng/CBIaggregator'){ remote{ name('origin') url('git@github.com:eclipse-platform/eclipse.platform.releng.git') - credentials('GitHub bot (SSH)') + credentials('github-bot-ssh') } branch('master') browser { @@ -41,7 +41,7 @@ job('Releng/CBIaggregator'){ wrappers { //adds pre/post actions preBuildCleanup() timestamps() - sshAgent('ssh://genie.releng@projects-storage.eclipse.org', 'ssh://genie.releng@git.eclipse.org', 'GitHub bot (SSH)') + sshAgent('projects-storage.eclipse.org-bot-ssh', 'git.eclipse.org-bot-ssh', 'github-bot-ssh') } steps { diff --git a/JenkinsJobs/Releng/PublishJDTtoMaven.groovy b/JenkinsJobs/Releng/PublishJDTtoMaven.groovy index febe55d1a0f..d9095c9c235 100644 --- a/JenkinsJobs/Releng/PublishJDTtoMaven.groovy +++ b/JenkinsJobs/Releng/PublishJDTtoMaven.groovy @@ -20,7 +20,7 @@ job('Releng/PublishJDTtoMaven'){ file('KEYRING', 'secret-subkeys.asc (secret-subkeys.asc fpr JDT') } timestamps() - sshAgent( 'ssh://genie.releng@git.eclipse.org', 'GitHub bot (SSH)') + sshAgent('git.eclipse.org-bot-ssh', 'github-bot-ssh') } steps { diff --git a/JenkinsJobs/Releng/PublishPDEToMaven.groovy b/JenkinsJobs/Releng/PublishPDEToMaven.groovy index 8f359c9d878..a32ed2ad573 100644 --- a/JenkinsJobs/Releng/PublishPDEToMaven.groovy +++ b/JenkinsJobs/Releng/PublishPDEToMaven.groovy @@ -20,7 +20,7 @@ job('Releng/PublishPDEToMaven'){ file('KEYRING', 'secret-subkeys.asc (secret-subkeys.asc fpr JDT') } timestamps() - sshAgent( 'ssh://genie.releng@git.eclipse.org', 'GitHub bot (SSH)') + sshAgent('git.eclipse.org-bot-ssh', 'github-bot-ssh') } steps { diff --git a/JenkinsJobs/Releng/PublishPlatformToMaven.groovy b/JenkinsJobs/Releng/PublishPlatformToMaven.groovy index 1218eae6e19..36be535c21f 100644 --- a/JenkinsJobs/Releng/PublishPlatformToMaven.groovy +++ b/JenkinsJobs/Releng/PublishPlatformToMaven.groovy @@ -20,7 +20,7 @@ job('Releng/PublishPlatformToMaven'){ file('KEYRING', 'secret-subkeys.asc (secret-subkeys.asc fpr JDT') } timestamps() - sshAgent( 'ssh://genie.releng@git.eclipse.org', 'GitHub bot (SSH)') + sshAgent('git.eclipse.org-bot-ssh', 'github-bot-ssh') } steps { diff --git a/JenkinsJobs/Releng/checkCompositesValidity.groovy b/JenkinsJobs/Releng/checkCompositesValidity.groovy index 2a5d01344af..e7143a0f453 100644 --- a/JenkinsJobs/Releng/checkCompositesValidity.groovy +++ b/JenkinsJobs/Releng/checkCompositesValidity.groovy @@ -18,7 +18,7 @@ job('Releng/checkCompositesValidity'){ wrappers { //adds pre/post actions timestamps() - sshAgent('ssh://genie.releng@projects-storage.eclipse.org') + sshAgent('projects-storage.eclipse.org-bot-ssh') buildTimeoutWrapper{ strategy { absoluteTimeOutStrategy { diff --git a/JenkinsJobs/Releng/cleanupReleaseArtifacts.groovy b/JenkinsJobs/Releng/cleanupReleaseArtifacts.groovy index 1463cf67fdd..4e5be08a364 100644 --- a/JenkinsJobs/Releng/cleanupReleaseArtifacts.groovy +++ b/JenkinsJobs/Releng/cleanupReleaseArtifacts.groovy @@ -34,7 +34,7 @@ job('Releng/cleanupReleaseArtifacts'){ wrappers { //adds pre/post actions preBuildCleanup() timestamps() - sshAgent('ssh://genie.releng@projects-storage.eclipse.org') + sshAgent('projects-storage.eclipse.org-bot-ssh') } steps { diff --git a/JenkinsJobs/Releng/collectResults.groovy b/JenkinsJobs/Releng/collectResults.groovy index 8d84e157633..2f583c74c73 100644 --- a/JenkinsJobs/Releng/collectResults.groovy +++ b/JenkinsJobs/Releng/collectResults.groovy @@ -25,7 +25,7 @@ job('Releng/ep-collectResults'){ wrappers { //adds pre/post actions timestamps() preBuildCleanup() - sshAgent('ssh://genie.releng@git.eclipse.org', 'ssh://genie.releng@projects-storage.eclipse.org') + sshAgent('git.eclipse.org-bot-ssh', 'projects-storage.eclipse.org-bot-ssh') timeout { absolute(30) } diff --git a/JenkinsJobs/Releng/createGenericComposites.groovy b/JenkinsJobs/Releng/createGenericComposites.groovy index 16678afde6d..63862ccd955 100644 --- a/JenkinsJobs/Releng/createGenericComposites.groovy +++ b/JenkinsJobs/Releng/createGenericComposites.groovy @@ -18,7 +18,7 @@ job('Releng/createGenericComposites'){ wrappers { //adds pre/post actions timestamps() - sshAgent('ssh://genie.releng@projects-storage.eclipse.org') + sshAgent('projects-storage.eclipse.org-bot-ssh') } steps { diff --git a/JenkinsJobs/Releng/createMaintenanceBranch.groovy b/JenkinsJobs/Releng/createMaintenanceBranch.groovy index e8a635d47ff..0a10affd341 100644 --- a/JenkinsJobs/Releng/createMaintenanceBranch.groovy +++ b/JenkinsJobs/Releng/createMaintenanceBranch.groovy @@ -18,7 +18,7 @@ job('Releng/createMaintenanceBranch'){ wrappers { //adds pre/post actions timestamps() - sshAgent('ssh://genie.releng@git.eclipse.org', 'GitHub bot (SSH)') + sshAgent('git.eclipse.org-bot-ssh', 'github-bot-ssh') } steps { diff --git a/JenkinsJobs/Releng/makeVisible.groovy b/JenkinsJobs/Releng/makeVisible.groovy index fe3b716af1d..c7d43a95ade 100644 --- a/JenkinsJobs/Releng/makeVisible.groovy +++ b/JenkinsJobs/Releng/makeVisible.groovy @@ -32,7 +32,7 @@ I-builds promote to 'S' until 'R'. wrappers { //adds pre/post actions timestamps() - sshAgent('ssh://genie.releng@projects-storage.eclipse.org', 'ssh://genie.releng@git.eclipse.org', 'GitHub bot (SSH)') + sshAgent('projects-storage.eclipse.org-bot-ssh', 'git.eclipse.org-bot-ssh', 'github-bot-ssh') timeout { absolute(60) } diff --git a/JenkinsJobs/Releng/newStreamRepos.groovy b/JenkinsJobs/Releng/newStreamRepos.groovy index 8dd7097cac6..6d7a14c1042 100644 --- a/JenkinsJobs/Releng/newStreamRepos.groovy +++ b/JenkinsJobs/Releng/newStreamRepos.groovy @@ -15,7 +15,7 @@ job('Releng/newStreamRepos'){ wrappers { //adds pre/post actions timestamps() - sshAgent('ssh://genie.releng@projects-storage.eclipse.org') + sshAgent('projects-storage.eclipse.org-bot-ssh') } steps { diff --git a/JenkinsJobs/Releng/renameAndPromote.groovy b/JenkinsJobs/Releng/renameAndPromote.groovy index 21aeee9e5a4..4c3b8255adc 100644 --- a/JenkinsJobs/Releng/renameAndPromote.groovy +++ b/JenkinsJobs/Releng/renameAndPromote.groovy @@ -32,7 +32,7 @@ I-builds promote to 'S' until 'R'. wrappers { //adds pre/post actions timestamps() - sshAgent('ssh://genie.releng@projects-storage.eclipse.org') + sshAgent('projects-storage.eclipse.org-bot-ssh') timeout { absolute(60) } diff --git a/JenkinsJobs/Releng/tagEclipseRelease.groovy b/JenkinsJobs/Releng/tagEclipseRelease.groovy index 0175dc883ff..90ed00daed6 100644 --- a/JenkinsJobs/Releng/tagEclipseRelease.groovy +++ b/JenkinsJobs/Releng/tagEclipseRelease.groovy @@ -25,7 +25,7 @@ GitHub issue (or legacy bugzilla bug ID) to track tagging the release, for examp wrappers { //adds pre/post actions timestamps() - sshAgent('ssh://genie.releng@git.eclipse.org', 'GitHub bot (SSH)') + sshAgent('git.eclipse.org-bot-ssh', 'github-bot-ssh') preBuildCleanup() } diff --git a/JenkinsJobs/Releng/updateIndex.groovy b/JenkinsJobs/Releng/updateIndex.groovy index d8baf8c752e..16b2e355981 100644 --- a/JenkinsJobs/Releng/updateIndex.groovy +++ b/JenkinsJobs/Releng/updateIndex.groovy @@ -12,7 +12,7 @@ job('Releng/updateIndex'){ wrappers { //adds pre/post actions timestamps() - sshAgent('ssh://genie.releng@projects-storage.eclipse.org') + sshAgent('projects-storage.eclipse.org-bot-ssh') } steps { diff --git a/JenkinsJobs/YBuilds/collectYbuildResults.groovy b/JenkinsJobs/YBuilds/collectYbuildResults.groovy index 3bfd995da7f..dc734275c49 100644 --- a/JenkinsJobs/YBuilds/collectYbuildResults.groovy +++ b/JenkinsJobs/YBuilds/collectYbuildResults.groovy @@ -25,7 +25,7 @@ job('Releng/ep-collectYbuildResults'){ wrappers { //adds pre/post actions timestamps() preBuildCleanup() - sshAgent('ssh://genie.releng@git.eclipse.org', 'ssh://genie.releng@projects-storage.eclipse.org') + sshAgent('git.eclipse.org-bot-ssh', 'projects-storage.eclipse.org-bot-ssh') xvnc { useXauthority() }