taler-deployment

commit 924e42b4284c1199cd789c286e27e75115a403a0
parent cc987cc3137c553d56197987c9aaa4acba2b1be1
Author: buckE <buckE@disroot.org>
Date:   Tue, 16 Jun 2020 05:26:29 +0000

new formatting for buildslavetest

Diffstat:
M
buildbot/master.cfg
 | 
69
++++++++++++++++++++++++++++++++++++++-------------------------------

1 file changed, 38 insertions(+), 31 deletions(-)
diff --git a/buildbot/master.cfg b/buildbot/master.cfg
@@ -104,7 +104,7 @@ c["workers"] = [
 
     ##
     # testing buildbot using the "buildslavetest" user (for no specific reason except it exists)
-    # connects to `buidlslavetest` @ taler.net
+    # Home: `buidlslavetest` @ taler.net
     worker.Worker("buildslavetest-worker", "Gei8naiyox4uuhoo"),
 
     ##
@@ -135,15 +135,6 @@ c["change_source"] = [ALLCS]
 # Configure the Schedulers, which decide how to react to incoming
 # changes.
 
-# Run at 11am every day.
-TEST_SCHEDULER = schedulers.Nightly(
-    name="test-scheduler",
-    builderNames=["buildslavetest-builder"],
-    branch="master",
-    hour=11,
-    minute=00
-)
-
 # Run at 6am every day: coverage analysis and auditor.
 NIGHTLY_SCHEDULER = schedulers.Nightly(
     name="nightly-scheduler",
@@ -509,20 +500,6 @@ LINT_FACTORY.addStep(
 )
 
 
-# "buildslavetest" Factory for testing purposes
-# NOTE: was buildbot-weblatetest, and .sh may still have that name
-BUILDSLAVETEST_FACTORY = create_factory_with_deployment()
-BUILDSLAVETEST_FACTORY.addStep(
-    ShellCommand(
-        name="buildslavetest script (for testing purposes)",
-        description="Buildbot Sandbox Worker",
-        descriptionDone="buildslavetest: Done",
-        command=["./buildslavetest.sh"],
-        workdir="/home/buildslavetest/"
-    )
-)
-
-
 INTEGRATIONTEST_FACTORY = create_factory_with_deployment()
 INTEGRATIONTEST_FACTORY.addStep(
     ShellCommand(
@@ -832,13 +809,6 @@ DEMO_SERVICES_INTEGRATIONTEST_FACTORY.addStep(
 
 ##### BUILDERS DEFINED
 
-# Builder to oversee the buildslavetest-worker worker and, I guess, the BUILDSLAVETEST_FACTORY.  Used for testing purposes.
-BUILDSLAVETEST_BUILDER = util.BuilderConfig(
-    name="buildslavetest-builder",
-    workernames=["buildslavetest-worker"],
-    factory=BUILDSLAVETEST_FACTORY
-)
-
 # Builder to update the buildmaster itself.
 BUILDMASTER_BUILDER = util.BuilderConfig(
     name="buildmaster-builder",
@@ -1100,6 +1070,43 @@ c["db"] = {
 # NOTE: BUILDER must be added to this list too: BUILDER_LIST = [
 ###########################################################################################
 
+###########################
+### --- buildslavetest ---
+
+# buildslavetest WORKER: buildslavetest@taler.net
+
+# buildslavetest SCHEDULER
+# Run at 11am every day.
+TEST_SCHEDULER = schedulers.Nightly(
+    name="test-scheduler",
+    builderNames=["buildslavetest-builder"],
+    branch="master",
+    hour=11,
+    minute=00
+)
+
+# buildslavetest BUILDER
+BUILDSLAVETEST_BUILDER = util.BuilderConfig(
+    name="buildslavetest-builder",
+    workernames=["buildslavetest-worker"],
+    factory=BUILDSLAVETEST_FACTORY
+)
+
+# buildslavetest FACTORY
+BUILDSLAVETEST_FACTORY = create_factory_with_deployment()
+BUILDSLAVETEST_FACTORY.addStep(
+    ShellCommand(
+        name="buildslavetest script (for testing purposes)",
+        description="Build Slave Test",
+        descriptionDone="buildslavetest: Done",
+        command=["./buildslavetest.sh"],
+        workdir="/home/buildslavetest/"
+    )
+)
+
+### /end ---buildslavetest
+
+#######################
 ### --- linkchecker ---
 
 # linkchecker WORKER Location: linkchecker@taler.net