diff options
| author | Will Holland <william.holland@codethink.co.uk> | 2015-09-15 16:02:01 +0100 |
|---|---|---|
| committer | Will Holland <william.holland@codethink.co.uk> | 2015-09-15 16:02:01 +0100 |
| commit | 96c110f026fd4a5e1f007dfda49195c8d971c3aa (patch) | |
| tree | 7de5d1e073a679f7c6ad8a2a7bb442d3d08ee1c3 /source | |
| parent | 1ce096958ba9c325232c16b0af3d90f1b3cc31e7 (diff) | |
| download | orchestration-96c110f026fd4a5e1f007dfda49195c8d971c3aa.tar.gz | |
Add force option to build
And have changes in test repo trigger forced build
Diffstat (limited to 'source')
| -rw-r--r-- | source/bottlerock.py | 2 | ||||
| -rw-r--r-- | source/build_complete.sh | 2 | ||||
| -rw-r--r-- | source/definitions_update.sh | 2 | ||||
| -rw-r--r-- | source/master.cfg | 4 |
4 files changed, 6 insertions, 4 deletions
diff --git a/source/bottlerock.py b/source/bottlerock.py index 6e35a88..e96d216 100644 --- a/source/bottlerock.py +++ b/source/bottlerock.py @@ -47,7 +47,7 @@ def repo_update(): elif repo_name == DEFINITIONS: return call_trigger('definitions_update') elif repo_name == TEST_REPO: - return call_trigger('deploy_complete') + return call_trigger('definitions_update',"force") else: return call_trigger('repo_update',repo_name) diff --git a/source/build_complete.sh b/source/build_complete.sh index fe76c18..058f86a 100644 --- a/source/build_complete.sh +++ b/source/build_complete.sh @@ -9,4 +9,4 @@ port=9999 user=orchestration passwd=orchestration -../orchenv-master/bin/buildbot --verbose sendchange -m "$IP":"$port" -a "$user":"$passwd" -W scriptbot -C "$category" -p "system":"$1" +../orchenv-master/bin/buildbot sendchange -m "$IP":"$port" -a "$user":"$passwd" -W scriptbot -C "$category" -p "system":"$1" diff --git a/source/definitions_update.sh b/source/definitions_update.sh index 28835db..6fb627f 100644 --- a/source/definitions_update.sh +++ b/source/definitions_update.sh @@ -9,4 +9,4 @@ port=9999 user=orchestration passwd=orchestration -../orchenv-master/bin/buildbot sendchange -m "$IP":"$port" -a "$user":"$passwd" -W scriptbot -C "$category" +../orchenv-master/bin/buildbot sendchange -m "$IP":"$port" -a "$user":"$passwd" -W scriptbot -C "$category" -p "force":"$1" diff --git a/source/master.cfg b/source/master.cfg index a6c1ef2..f184eb9 100644 --- a/source/master.cfg +++ b/source/master.cfg @@ -97,7 +97,9 @@ builders_factory.addStep(steps.Git( repourl='git://cu010-trove.codethink.com/cu010-trove/br6/buildslave-scripts.git', mode='incremental')) builders_factory.addStep(ShellCommand(command=["sh","get_definitions.sh"])) -builders_factory.addStep(ShellCommand(command=["sh","triggers/builders_trigger.sh"])) +force = util.Property('force',default="") +builders_cmd = ["sh","triggers/builders_trigger.sh",force] +builders_factory.addStep(ShellCommand(command=builders_cmd)) deploy_factory = BuildFactory() deploy_factory.addStep(steps.Git( |