Remove sign for gerrit build
Signed-off-by: Alexander Dudaev <Aleksandr.Dudayev@xored.com>
Change-Id: I4419e811f9d629dc99b0c04ae6b2f0b2716729e4
diff --git a/Jenkinsfile b/Jenkinsfile
index c2b90ed..e45113b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -30,7 +30,7 @@
stage('Start Build and Test') {
steps {
script {
- groovy.build_and_test()
+ groovy.build_and_test(false)
}
}
}
diff --git a/releng/Jenkinsfile b/releng/Jenkinsfile
index 11dc502..eac793f 100644
--- a/releng/Jenkinsfile
+++ b/releng/Jenkinsfile
@@ -35,7 +35,7 @@
stage('Start Build and Test') {
steps {
script {
- groovy.build_and_test()
+ groovy.build_and_test(true)
}
}
}
diff --git a/releng/Jenkinsfile.groovy b/releng/Jenkinsfile.groovy
index d8ef58d..261d262 100644
--- a/releng/Jenkinsfile.groovy
+++ b/releng/Jenkinsfile.groovy
@@ -89,9 +89,9 @@
DOWNLOADS_HOME="/home/data/httpd/download.eclipse.org/rcptt"
-def build_and_test() {
+def build_and_test(Boolean sign) {
stage("Build") {
- build()
+ build(sign)
echo "Version: ${get_version()}"
echo "Qualifier: ${get_qualifier()}"
}
@@ -106,9 +106,9 @@
}
}
-def build() {
+def build(Boolean sign) {
container(BUILD_CONTAINER_NAME) {
- sh "./build.sh -P sign -Dmaven.repo.local=$WORKSPACE/m2 -e"
+ sh "./build.sh -Dmaven.repo.local=$WORKSPACE/m2 -e ${sign ? "-P sign" : ""}"
sh "./build_runner.sh -Dmaven.repo.local=$WORKSPACE/m2 -e"
sh "mvn -f maven-plugin/pom.xml clean verify -Dmaven.repo.local=$WORKSPACE/m2 -e"
sh "./$DOC_DIR/generate-doc.sh -Dmaven.repo.local=$WORKSPACE/m2 -e"
diff --git a/releng/nightly/Jenkinsfile b/releng/nightly/Jenkinsfile
index 88bfd76..27e2171 100644
--- a/releng/nightly/Jenkinsfile
+++ b/releng/nightly/Jenkinsfile
@@ -30,7 +30,7 @@
stage('Start Build and Test') {
steps {
script {
- groovy.build_and_test()
+ groovy.build_and_test(true)
}
}
}
diff --git a/releng/pom.xml b/releng/pom.xml
index 11e558d..fcb062e 100644
--- a/releng/pom.xml
+++ b/releng/pom.xml
@@ -26,7 +26,7 @@
<ajJavaSource>1.7</ajJavaSource>
<ajJavaTarget>1.7</ajJavaTarget>
<ajJavaCompilance>1.7</ajJavaCompilance>
- <cbi-version>1.1.4</cbi-version>
+ <cbi-version>1.1.5</cbi-version>
</properties>
<distributionManagement>
<repository>