From 5f41e6372b08ff7eff1beb4bd0f02aaf584203cb Mon Sep 17 00:00:00 2001 From: Fiete Ostkamp Date: Mon, 3 Jul 2023 12:21:38 +0000 Subject: [PATCH] Feat: Switch gerrit-gradle-build template to the gradle builder Issue: RELENG-4763 Change-Id: Id31d9e23c8df1470c41eab58a91a005b5bd9a4db Signed-off-by: Fiete Ostkamp --- docs/jjb/lf-gradle-jobs.rst | 1 + jjb/lf-gradle-jobs.yaml | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/docs/jjb/lf-gradle-jobs.rst b/docs/jjb/lf-gradle-jobs.rst index 354edb9f..f4a1d5b2 100644 --- a/docs/jjb/lf-gradle-jobs.rst +++ b/docs/jjb/lf-gradle-jobs.rst @@ -21,6 +21,7 @@ Runs a gradle build command to perform the verification. :java-version: Version of Java to execute Maven build. (default: openjdk17) :jenkins-ssh-credential: Credential to use for SSH. (Generally configured in defaults.yaml) :mvn-settings: Maven settings.xml file containing credentials to use. + :wrapper: Use the gradle wrapper (default: false) :Optional parameters: diff --git a/jjb/lf-gradle-jobs.yaml b/jjb/lf-gradle-jobs.yaml index 4db41f28..b7b93702 100644 --- a/jjb/lf-gradle-jobs.yaml +++ b/jjb/lf-gradle-jobs.yaml @@ -21,6 +21,7 @@ submodule-timeout: 10 submodule-disable: false cron: "@daily" + wrapper: true archive-artifacts: > **/*.log @@ -83,8 +84,11 @@ - lf-infra-docker-login: global-settings-file: "global-settings" settings-file: "{mvn-settings}" - - shell: | - ./gradlew build + - gradle: + wrapper: "{wrapper}" + executable: true + tasks: | + build scm: - lf-infra-gerrit-scm: -- 2.16.6