From 6fa7e65e8ab2a9a3caceacf2a1178b75cd166ea3 Mon Sep 17 00:00:00 2001 From: Ronan Browne Date: Tue, 30 Apr 2024 16:34:01 +0100 Subject: [PATCH 1/3] ES-2329 : Disable 5.1 builds triggered via Cron job (#1628) --- .ci/nightly/JenkinsfileNightly | 2 +- .ci/nightly/JenkinsfileSnykScan | 1 + .ci/nightly/JenkinsfileWindowsCompatibility | 2 +- Jenkinsfile | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.ci/nightly/JenkinsfileNightly b/.ci/nightly/JenkinsfileNightly index a1b6dbf1f9..31dc959c6b 100644 --- a/.ci/nightly/JenkinsfileNightly +++ b/.ci/nightly/JenkinsfileNightly @@ -2,7 +2,7 @@ cordaPipelineKubernetesAgent( runIntegrationTests: false, - dailyBuildCron: 'H 02 * * *', + dailyBuildCron: '', gradleAdditionalArgs: '-Dscan.tag.Nightly-Build', generateSbom: true, javaVersion: '17' diff --git a/.ci/nightly/JenkinsfileSnykScan b/.ci/nightly/JenkinsfileSnykScan index c654195c7a..f0ffc25600 100644 --- a/.ci/nightly/JenkinsfileSnykScan +++ b/.ci/nightly/JenkinsfileSnykScan @@ -1,6 +1,7 @@ @Library('corda-shared-build-pipeline-steps@5.1') _ cordaSnykScanPipeline ( + dailyBuildCron: '', snykTokenId: 'r3-snyk-corda5', javaVersion: '17' ) diff --git a/.ci/nightly/JenkinsfileWindowsCompatibility b/.ci/nightly/JenkinsfileWindowsCompatibility index ee576237e9..70d02cc9c9 100644 --- a/.ci/nightly/JenkinsfileWindowsCompatibility +++ b/.ci/nightly/JenkinsfileWindowsCompatibility @@ -2,6 +2,6 @@ windowsCompatibility( runIntegrationTests: false, - dailyBuildCron: 'H 02 * * *', + dailyBuildCron: '', javaVersion: '17' ) diff --git a/Jenkinsfile b/Jenkinsfile index 80b286b560..b5030ca43c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,6 +1,7 @@ @Library('corda-shared-build-pipeline-steps@5.1') _ cordaPipelineKubernetesAgent( + dailyBuildCron: '', runIntegrationTests: false, dependentJobsNames: ['/Corda5/corda-runtime-os-version-compatibility/release%2Fos%2F5.1'], dependentJobsNonBlocking: ['/Corda5/corda-api-compatibility/'], From 0676461a6af41844a43f2ba6c745af755bd6bb80 Mon Sep 17 00:00:00 2001 From: Luke Browne <163148653+LukeBrowne-R3@users.noreply.github.com> Date: Wed, 1 May 2024 12:02:43 +0100 Subject: [PATCH 2/3] Update remove-stale-branches.yml (#1623) --- .github/workflows/remove-stale-branches.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/remove-stale-branches.yml b/.github/workflows/remove-stale-branches.yml index 83ccdea0fe..7cad01edfc 100644 --- a/.github/workflows/remove-stale-branches.yml +++ b/.github/workflows/remove-stale-branches.yml @@ -11,6 +11,8 @@ jobs: - uses: fpicalausa/remove-stale-branches@v1.5.8 with: dry-run: false + ignore-unknown-authors: true + default-recipient: "corda-jenkins-ci02" days-before-branch-stale: 30 days-before-branch-delete: 14 stale-branch-message: "@{author} The branch [{branchName}]({branchUrl}) hasn't been updated in the last 30 days and is marked as stale. It will be removed in 14 days.\r\nIf you want to keep this branch around, delete this comment or add new commits to this branch." From 6e0899a3afe264f452e4bcc724fb2c372ce3c118 Mon Sep 17 00:00:00 2001 From: Ronan Browne Date: Tue, 7 May 2024 17:03:34 +0100 Subject: [PATCH 3/3] ES-1946: Update CODEOWNERS for 5.2 (#1634) --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 08fd34e667..a43b9bb5be 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,2 +1,2 @@ # Code freeze reviewers -* @driessamyn @jasonbyrner3 @ronanbrowne @rick-r3 @simon-johnson-r3 @blsemo @Omar-awad @aditisdesai @vinir3 @vkolomeyko @thiagoviana @Sakpal @owenstanford +* @driessamyn @jasonbyrner3 @ronanbrowne @rick-r3 @simon-johnson-r3 @blsemo @Omar-awad @aditisdesai @vinir3 @vkolomeyko @Sakpal @owenstanford