Module: check_mk
Branch: master
Commit: c012137674278ade9632f04bdbc84acca39fa243
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c012137674278a…
Author: Alex Zurhake <az(a)mathias-kettner.de>
Date: Tue Apr 16 10:48:09 2019 +0200
Trigger Jenkins Build by central script
Earlier script would contain the information which, by which build it would be triggered.
Whith this decentralized aproach it is hard to keep an overview. Therfore a job is
created, which triggers the other builds.
Change-Id: I3ad9ef43a4d14dd64aa34c48fdc4ef1dcf865a87
---
.../scripts/integration-daily-master.jenkins | 7 ++---
buildscripts/scripts/nightly-build.jenkins | 3 --
buildscripts/scripts/nightly-cmk-container.jenkins | 6 ----
buildscripts/scripts/nightly-master.jenkins | 35 ++++++++++++++++++++++
4 files changed, 37 insertions(+), 14 deletions(-)
diff --git a/buildscripts/scripts/integration-daily-master.jenkins
b/buildscripts/scripts/integration-daily-master.jenkins
index 2d7c46c..c1ecb0e 100644
--- a/buildscripts/scripts/integration-daily-master.jenkins
+++ b/buildscripts/scripts/integration-daily-master.jenkins
@@ -3,9 +3,6 @@ import java.text.SimpleDateFormat
properties([
parameters([
string(name: 'DISTROS', defaultValue: DISTRO_LIST_MASTER, description:
'List of targeted distros' )
- ]),
- pipelineTriggers([
- upstream(upstreamProjects: 'cmk_master/nightly_build_containerized',
threshold: hudson.model.Result.SUCCESS)
])
])
@@ -101,7 +98,7 @@ try {
rm -rf \$SYSCTL
ln -s \$(which true) \$SYSCTL
fi
-
+
case $DISTRO in
centos-6)
rm -f /etc/mtab
@@ -132,7 +129,7 @@ try {
}
finally {
sh """
- rm -rf $DISTRO
+ rm -rf $DISTRO
mkdir -p $DISTRO
cp /omd/sites/int_master/junit.xml $DISTRO/
cp -r /omd/sites/int_master/var/log $DISTRO/
diff --git a/buildscripts/scripts/nightly-build.jenkins
b/buildscripts/scripts/nightly-build.jenkins
index ffd4fe5..94ab3d0 100644
--- a/buildscripts/scripts/nightly-build.jenkins
+++ b/buildscripts/scripts/nightly-build.jenkins
@@ -4,9 +4,6 @@ properties([
parameters([
string(name: 'DISTROS', defaultValue: DISTRO_LIST_MASTER, description:
'List of targeted distros' ),
string(name: 'EDITION', defaultValue: 'enterprise', description:
'Edition: raw, enterprise or managed' )
- ]),
- pipelineTriggers([
- cron('H 0 * * *')
])
])
diff --git a/buildscripts/scripts/nightly-cmk-container.jenkins
b/buildscripts/scripts/nightly-cmk-container.jenkins
index 7e9b719..756e722 100644
--- a/buildscripts/scripts/nightly-cmk-container.jenkins
+++ b/buildscripts/scripts/nightly-cmk-container.jenkins
@@ -1,11 +1,5 @@
import java.text.SimpleDateFormat
-properties([
- pipelineTriggers([
- upstream(upstreamProjects: 'cmk_master/nightly_build_containerized',
threshold: hudson.model.Result.SUCCESS)
- ])
-])
-
currentBuild.description = '\nBuilding the CMK docker container\n'
def dateFormat = new SimpleDateFormat("yyyy.MM.dd")
diff --git a/buildscripts/scripts/nightly-master.jenkins
b/buildscripts/scripts/nightly-master.jenkins
new file mode 100644
index 0000000..3e80057
--- /dev/null
+++ b/buildscripts/scripts/nightly-master.jenkins
@@ -0,0 +1,35 @@
+properties([
+ parameters([
+ string(name: 'DISTROS', defaultValue: DISTRO_LIST_MASTER, description:
'List of targeted distros' ),
+ string(name: 'EDITION', defaultValue: 'enterprise', description:
'Edition: raw, enterprise or managed' )
+ ]),
+ pipelineTriggers([
+ cron('H 0 * * *')
+ ])
+])
+
+node: {
+ stage('Build Packages') {
+ build job: 'cmk_master/nightly_build_containerized',
+ parameters: [
+ [$class: 'StringParameterValue', name: 'DISTROS', value:
DISTROS],
+ [$class: 'StringParameterValue', name: 'EDITION', value:
EDITION]
+ ]
+ }
+ stage('Build CMK Container') {
+ build job: 'cmk_master/nightly_cmk_container'
+ }
+ parallel 'Integration Test for Packages': {
+ stage('Integration Test for Packages') {
+ build job: 'cmk_master/nightly_test_integration-pipeline',
+ parameters: [
+ [$class: 'StringParameterValue', name: 'DISTROS', value:
DISTROS],
+ [$class: 'StringParameterValue', name: 'EDITION', value:
EDITION]
+ ]
+ }
+ }, 'Integration Test for Docker Container': {
+ stage('Integration Test for Docker Container') {
+ build job: 'cmk_master/docker_integration'
+ }
+ }
+}