From 5082a11f31ae10c69d23417d6466e24f4b2bcad6 Mon Sep 17 00:00:00 2001 From: Jessica Wagantall Date: Wed, 5 Jun 2024 12:20:58 -0700 Subject: [PATCH] Fix: Update gradle job for build and publish Build and publish should not run on a daily basis. They should only run on patchset created and patchset merged. Remove script variables which are set by the job caller. Removing them from the script since it was removing its values. Issue: RELENG-5405 Signed-off-by: Jessica Wagantall Change-Id: I8717fcc935d34952b5b608269a0e6f63ba9fd2a4 --- jjb/lf-gradle-jobs.yaml | 2 -- .../notes/gradle-update-triggers-fb1969cb37cc510c.yaml | 5 +++++ shell/nexus-upload.sh | 3 --- 3 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 releasenotes/notes/gradle-update-triggers-fb1969cb37cc510c.yaml diff --git a/jjb/lf-gradle-jobs.yaml b/jjb/lf-gradle-jobs.yaml index a7ba72be..1b1824d2 100644 --- a/jjb/lf-gradle-jobs.yaml +++ b/jjb/lf-gradle-jobs.yaml @@ -115,7 +115,6 @@ choosing-strategy: gerrit triggers: - - timed: "{obj:cron}" - gerrit: server-name: "{gerrit-server-name}" trigger-on: "{obj:gerrit_gradle_verify_triggers}" @@ -202,7 +201,6 @@ choosing-strategy: default triggers: - - timed: "{obj:cron}" - gerrit: server-name: "{gerrit-server-name}" trigger-on: "{obj:gerrit_gradle_merge_triggers}" diff --git a/releasenotes/notes/gradle-update-triggers-fb1969cb37cc510c.yaml b/releasenotes/notes/gradle-update-triggers-fb1969cb37cc510c.yaml new file mode 100644 index 00000000..ec293680 --- /dev/null +++ b/releasenotes/notes/gradle-update-triggers-fb1969cb37cc510c.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + Remove daily triggers for gradle build and publish jobs. + Remove env variables from script which are passed by the job caller. diff --git a/shell/nexus-upload.sh b/shell/nexus-upload.sh index 0141f24e..c765e0ee 100644 --- a/shell/nexus-upload.sh +++ b/shell/nexus-upload.sh @@ -3,9 +3,6 @@ # Copyright 2024 The LMinux Foundation # Uncomment to enable debugging # set -vx -# Initialise variables -DIRECTORY="." -FILE_EXTENSION="" # Count file upload successes/failures SUCCESSES="0"; FAILURES="0" # Shared functions