From abe174f9c468492df40ac902460e025bd698be92 Mon Sep 17 00:00:00 2001 From: Carlos Konstanski Date: Wed, 4 Oct 2017 13:15:32 -0600 Subject: added switches to gradle commands --- jjb/yaml/admin-api-server.yaml | 4 ++++ jjb/yaml/admin-web-ui.yaml | 4 ++++ jjb/yaml/customer-api-server.yaml | 4 ++++ jjb/yaml/customer-web-ui.yaml | 4 ++++ jjb/yaml/job-scheduler-server.yaml | 4 ++++ jjb/yaml/workflow-server.yaml | 4 ++++ salt/openbook/ansible/files/gradle.yaml | 3 +++ 7 files changed, 27 insertions(+) diff --git a/jjb/yaml/admin-api-server.yaml b/jjb/yaml/admin-api-server.yaml index 2082873..7a6a0b3 100644 --- a/jjb/yaml/admin-api-server.yaml +++ b/jjb/yaml/admin-api-server.yaml @@ -26,6 +26,10 @@ builders: - gradle: build-file: "build.gradle" + switches: + - "-P build.number=4.1.$BUILD_NUMBER" + - "-P prodBuild=buildProd" + - "-D org.gradle.daemon=false" tasks: | clean shadowJar diff --git a/jjb/yaml/admin-web-ui.yaml b/jjb/yaml/admin-web-ui.yaml index 03c4ec0..50f454d 100644 --- a/jjb/yaml/admin-web-ui.yaml +++ b/jjb/yaml/admin-web-ui.yaml @@ -26,6 +26,10 @@ builders: - gradle: build-file: "build.gradle" + switches: + - "-P build.number=4.1.$BUILD_NUMBER" + - "-P prodBuild=buildProd" + - "-D org.gradle.daemon=false" tasks: | clean shadowJar diff --git a/jjb/yaml/customer-api-server.yaml b/jjb/yaml/customer-api-server.yaml index cb8e39e..29834df 100644 --- a/jjb/yaml/customer-api-server.yaml +++ b/jjb/yaml/customer-api-server.yaml @@ -26,6 +26,10 @@ builders: - gradle: build-file: "build.gradle" + switches: + - "-P build.number=4.1.$BUILD_NUMBER" + - "-P prodBuild=buildProd" + - "-D org.gradle.daemon=false" tasks: | clean shadowJar diff --git a/jjb/yaml/customer-web-ui.yaml b/jjb/yaml/customer-web-ui.yaml index b32718e..b86f18d 100644 --- a/jjb/yaml/customer-web-ui.yaml +++ b/jjb/yaml/customer-web-ui.yaml @@ -26,6 +26,10 @@ builders: - gradle: build-file: "build.gradle" + switches: + - "-P build.number=4.1.$BUILD_NUMBER" + - "-P prodBuild=buildProd" + - "-D org.gradle.daemon=false" tasks: | clean shadowJar diff --git a/jjb/yaml/job-scheduler-server.yaml b/jjb/yaml/job-scheduler-server.yaml index 8024b35..9dc4900 100644 --- a/jjb/yaml/job-scheduler-server.yaml +++ b/jjb/yaml/job-scheduler-server.yaml @@ -26,6 +26,10 @@ builders: - gradle: build-file: "build.gradle" + switches: + - "-P build.number=4.1.$BUILD_NUMBER" + - "-P prodBuild=buildProd" + - "-D org.gradle.daemon=false" tasks: | clean shadowJar diff --git a/jjb/yaml/workflow-server.yaml b/jjb/yaml/workflow-server.yaml index 0b41569..3aff37c 100644 --- a/jjb/yaml/workflow-server.yaml +++ b/jjb/yaml/workflow-server.yaml @@ -26,6 +26,10 @@ builders: - gradle: build-file: "build.gradle" + switches: + - "-P build.number=4.1.$BUILD_NUMBER" + - "-P prodBuild=buildProd" + - "-D org.gradle.daemon=false" tasks: | clean shadowJar diff --git a/salt/openbook/ansible/files/gradle.yaml b/salt/openbook/ansible/files/gradle.yaml index f79cda1..4e7dc6a 100644 --- a/salt/openbook/ansible/files/gradle.yaml +++ b/salt/openbook/ansible/files/gradle.yaml @@ -48,3 +48,6 @@ - dev-java/gradle-bin - net-libs/nodejs when: ansible_distribution == "Gentoo" + + - name: "Forcibly upgrade npm" + shell: npm install npm@latest -g -- cgit v1.3