[taler-deployment] branch master updated: remove LINKCHECKER; try old formatting

[gnunet]

This is an automated email from the git hooks/post-receive script.

buck pushed a commit to branch master
in repository deployment.

The following commit(s) were added to refs/heads/master by this push:
     new e117fbe  remove LINKCHECKER; try old formatting
e117fbe is described below

commit e117fbed1204b5f52f8552af036ff5581d5ecac8
Author: buckE <buckE@disroot.org>
AuthorDate: Wed Jun 17 05:59:24 2020 +0000

    remove LINKCHECKER; try old formatting
---
 buildbot/master.cfg                                | 269 ++++++++-------------
 ...master.cfg => master.cfg-GivingUpNewFormatting} |  44 ++--
 2 files changed, 115 insertions(+), 198 deletions(-)

diff --git a/buildbot/master.cfg b/buildbot/master.cfg
index 859d75e..3da105e 100644
--- a/buildbot/master.cfg
+++ b/buildbot/master.cfg
@@ -37,178 +37,6 @@ c = BuildmasterConfig = {}
 # Silence warning and allow very basic phoning home.
 c["buildbotNetUsageData"] = "basic"
 
-
-
-### Define Functions and Declarations
-
-# Convenience function that checks out a Git repository.
-# First argument is the URL of the Git to clone, second
-# the desired branch. Default is 'master'.
-def git_step(repo,target_branch="master"):
-    return Git(
-        repourl=repo,
-        mode="full",
-        method="fresh",
-        logEnviron=False,
-        alwaysUseLatest=True,
-        haltOnFailure=True,
-        branch=target_branch
-    )
-
-# Convenience function that runs 'make check' in a
-# directory of the code inside of a netjail.
-def jailed_check(package,srcdir):
-    return ShellCommand(
-        name="Test of " + srcdir + " in " + package,
-        description="Testing " + srcdir + " in " + package,
-        descriptionDone="Pass",
-        command=["sudo", "/usr/local/bin/netjail.sh", 
"/home/integrationtest/deployment/buildbot/with-postgres.sh", "make", "check"],
-        workdir="../../sources/" + package + "/src/" + srcdir
-    )
-
-# Convenience function that checks out the deployment.
-def update_deployment(factory):
-    factory.addStep(ShellCommand(
-        name="clean old deployment",
-        description="cleaning previous deployment repository",
-        descriptionDone="Deployment removed",
-        command=["rm", "-rf", "deployment"],
-        workdir="../.."
-    ))
-    factory.addStep(ShellCommand(
-        name="update deployment",
-        description="fetching latest deployment repository",
-        descriptionDone="Deployment updated",
-        command=["git", "clone", "git://git.taler.net/deployment"],
-        workdir="../.."
-    ))
-
-# Create a FACTORY with a deployment.git checkout as the first step.
-def create_factory_with_deployment():
-    f = util.BuildFactory()
-    update_deployment (f);
-    return f
-## /end Declare Functions
-
-BUILDER_LIST = [
-    "linkchecker-builder",
-    "buildslavetest-builder",
-    "buildmaster-builder",
-    "doc-builder",
-    "lcov-builder",
-    "checker-builder",
-    "auditor-builder",
-    "auditor-builder-test",
-    "auditor-builder-demo",
-    "demo-services-checker-builder",
-    "tip-reserve-topper-builder-demo",
-    "tip-reserve-topper-builder-test",
-    "sites-builder",
-    "test-builder",
-    "wallet-builder",
-    "taler-demo-healthcheck-builder",
-    "taler-test-healthcheck-builder",
-]
-
-
-###########################################################################################
-# ------------- NEW FORMATTING STARTS HERE FOR NEW AND MODIFIED PROJECTS 
-----------------
-
-# !!! This matters.  Mis-ordering leads to failure. !!!
-# Best Practices:  Group by worker as:
-#  - comment for WORKER location (ex: "Find worker at: xyz shell account non 
taler.net")
-#  - FACTORY declaration
-#  - BUILDER declaration
-#  - SCHEDULER declaration
-#
-# NOTE: WORKER must be added to list: c["workers"] = [
-# NOTE: BUILDER must be added to list: c["builders"] = [
-# NOTE: BUILDER must be added to this list too: BUILDER_LIST = [
-###########################################################################################
-
-###########################
-### --- buildslavetest ---
-
-# buildslavetest WORKER: buildslavetest@taler.net
-
-# 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/"
-    )
-)
-
-# buildslavetest BUILDER
-BUILDSLAVETEST_BUILDER = util.BuilderConfig(
-    name="buildslavetest-builder",
-    workernames=["buildslavetest-worker"],
-    factory=BUILDSLAVETEST_FACTORY
-)
-
-# buildslavetest SCHEDULER
-# Run at 11am every day.
-TEST_SCHEDULER = schedulers.Nightly(
-    name="test-scheduler",
-    builderNames=["buildslavetest-builder"],
-    branch="master",
-    hour=11,
-    minute=00
-)
-
-### /end ---buildslavetest
-
-#######################
-### --- linkchecker ---
-
-# linkchecker WORKER Location: linkchecker@taler.net
-
-# linkchecker FACTORY
-LINKCHECKER_FACTORY = create_factory_with_deployment()
-LINKCHECKER_FACTORY.addStep(
-    ShellCommand(
-        name="linkchecker",
-        description="Check taler.net website for broken links && Notify",
-        descriptionDone="linkchecker links checked",
-        command=["./linkchecker.sh"],
-        workdir="../../deployment/buildbot",
-        haltOnFailure=True
-    )
-)
-
-# linkchecker BUILDER
-# Builder for linkchecker
-LINKCHECKER_BUILDER = util.BuilderConfig(
-    name="linkchecker-builder",
-    workernames="linkchecker-worker",
-    factory=LINKCHECKER_FACTORY
-)
-
-# linkchecker SCHEDULER
-# Run at 7:30am every day.
-LINKCHECKER_SCHEDULER = schedulers.Nightly(
-    name="linkchecker-scheduler",
-    builderNames="linkchecker-builder",
-    branch="master",
-    hour=7,
-    minute=30
-)
-
-#DEMO_SERVICES_CHECKER_BUILDER = util.BuilderConfig(
-#    name="demo-services-checker-builder",
-#    workernames="demo-worker",
-#    factory=DEMO_SERVICES_INTEGRATIONTEST_FACTORY
-#)
-
-### /end --- linkchecker ---
-
-# / 
##########################################################################################
-
-
 ####### WORKERS
 
 # The 'workers' list defines the set of recognized workers.
@@ -318,6 +146,16 @@ NIGHTLY_SCHEDULER = schedulers.Nightly(
     minute=0
 )
 
+# buildslavetest SCHEDULER
+# Run at 11am every day.
+TEST_SCHEDULER = schedulers.Nightly(
+    name="test-scheduler",
+    builderNames=["buildslavetest-builder"],
+    branch="master",
+    hour=11,
+    minute=00
+)
+
 # Docs run if master or stable branch of 'docs' (or deployment) changed.
 DOC_SCHEDULER = schedulers.SingleBranchScheduler(
     name="periodic-doc-scheduler",
@@ -449,7 +287,7 @@ FORCE_SCHEDULER = schedulers.ForceScheduler(
 )
 
 c["schedulers"] = [
-    
+    TEST_SCHEDULER,
     NIGHTLY_SCHEDULER,
     TIP_RESERVE_TOPPER_SCHEDULER,
     DEMO_SERVICES_CHECKER_SCHEDULER,
@@ -475,8 +313,54 @@ c["schedulers"] = [
 # one worker.
 
 
+# Convenience function that checks out a Git repository.
+# First argument is the URL of the Git to clone, second
+# the desired branch. Default is 'master'.
+def git_step(repo,target_branch="master"):
+    return Git(
+        repourl=repo,
+        mode="full",
+        method="fresh",
+        logEnviron=False,
+        alwaysUseLatest=True,
+        haltOnFailure=True,
+        branch=target_branch
+    )
 
 
+# Convenience function that runs 'make check' in a
+# directory of the code inside of a netjail.
+def jailed_check(package,srcdir):
+    return ShellCommand(
+        name="Test of " + srcdir + " in " + package,
+        description="Testing " + srcdir + " in " + package,
+        descriptionDone="Pass",
+        command=["sudo", "/usr/local/bin/netjail.sh", 
"/home/integrationtest/deployment/buildbot/with-postgres.sh", "make", "check"],
+        workdir="../../sources/" + package + "/src/" + srcdir
+    )
+
+# Convenience function that checks out the deployment.
+def update_deployment(factory):
+    factory.addStep(ShellCommand(
+        name="clean old deployment",
+        description="cleaning previous deployment repository",
+        descriptionDone="Deployment removed",
+        command=["rm", "-rf", "deployment"],
+        workdir="../.."
+    ))
+    factory.addStep(ShellCommand(
+        name="update deployment",
+        description="fetching latest deployment repository",
+        descriptionDone="Deployment updated",
+        command=["git", "clone", "git://git.taler.net/deployment"],
+        workdir="../.."
+    ))
+
+# Create a FACTORY with a deployment.git checkout as the first step.
+def create_factory_with_deployment():
+    f = util.BuildFactory()
+    update_deployment (f);
+    return f
 
 # Factory to update the buildmaster itself.
 BUILDMASTER_FACTORY = create_factory_with_deployment()
@@ -490,6 +374,18 @@ BUILDMASTER_FACTORY.addStep(
     )
 )
 
+# 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/"
+    )
+)
+
 TALER_DEMO_HEALTHCHECK_FACTORY = create_factory_with_deployment()
 
TALER_DEMO_HEALTHCHECK_FACTORY.addStep(git_step("git://git.taler.net/wallet-core.git"))
 TALER_DEMO_HEALTHCHECK_FACTORY.addStep(
@@ -942,6 +838,13 @@ BUILDMASTER_BUILDER = util.BuilderConfig(
     factory=BUILDMASTER_FACTORY
 )
 
+# buildslavetest BUILDER
+BUILDSLAVETEST_BUILDER = util.BuilderConfig(
+    name="buildslavetest-builder",
+    workernames=["buildslavetest-worker"],
+    factory=BUILDSLAVETEST_FACTORY
+)
+
 # This builder is NOT ACTIVE!
 LINT_BUILDER = util.BuilderConfig(
     name="lint-builder",
@@ -1098,7 +1001,25 @@ c["titleURL"] = "https://taler.net";
 c["buildbotURL"] = "https://buildbot.taler.net/";
 
 
-
+BUILDER_LIST = [
+    "linkchecker-builder",
+    "buildslavetest-builder",
+    "buildmaster-builder",
+    "doc-builder",
+    "lcov-builder",
+    "checker-builder",
+    "auditor-builder",
+    "auditor-builder-test",
+    "auditor-builder-demo",
+    "demo-services-checker-builder",
+    "tip-reserve-topper-builder-demo",
+    "tip-reserve-topper-builder-test",
+    "sites-builder",
+    "test-builder",
+    "wallet-builder",
+    "taler-demo-healthcheck-builder",
+    "taler-test-healthcheck-builder",
+]
 
 # Authentication for Web UI.
 
exec(compile(open('../taler_bb_userpass_db/taler_bb_userpass_db/db.py').read(), 
filename='db.py', mode='exec'))
diff --git a/buildbot/master.cfg b/buildbot/master.cfg-GivingUpNewFormatting
similarity index 99%
copy from buildbot/master.cfg
copy to buildbot/master.cfg-GivingUpNewFormatting
index 859d75e..4663a0c 100644
--- a/buildbot/master.cfg
+++ b/buildbot/master.cfg-GivingUpNewFormatting
@@ -88,28 +88,6 @@ def create_factory_with_deployment():
     f = util.BuildFactory()
     update_deployment (f);
     return f
-## /end Declare Functions
-
-BUILDER_LIST = [
-    "linkchecker-builder",
-    "buildslavetest-builder",
-    "buildmaster-builder",
-    "doc-builder",
-    "lcov-builder",
-    "checker-builder",
-    "auditor-builder",
-    "auditor-builder-test",
-    "auditor-builder-demo",
-    "demo-services-checker-builder",
-    "tip-reserve-topper-builder-demo",
-    "tip-reserve-topper-builder-test",
-    "sites-builder",
-    "test-builder",
-    "wallet-builder",
-    "taler-demo-healthcheck-builder",
-    "taler-test-healthcheck-builder",
-]
-
 
 
###########################################################################################
 # ------------- NEW FORMATTING STARTS HERE FOR NEW AND MODIFIED PROJECTS 
-----------------
@@ -449,7 +427,7 @@ FORCE_SCHEDULER = schedulers.ForceScheduler(
 )
 
 c["schedulers"] = [
-    
+    TEST_SCHEDULER,
     NIGHTLY_SCHEDULER,
     TIP_RESERVE_TOPPER_SCHEDULER,
     DEMO_SERVICES_CHECKER_SCHEDULER,
@@ -1098,7 +1076,25 @@ c["titleURL"] = "https://taler.net";
 c["buildbotURL"] = "https://buildbot.taler.net/";
 
 
-
+BUILDER_LIST = [
+    "linkchecker-builder",
+    "buildslavetest-builder",
+    "buildmaster-builder",
+    "doc-builder",
+    "lcov-builder",
+    "checker-builder",
+    "auditor-builder",
+    "auditor-builder-test",
+    "auditor-builder-demo",
+    "demo-services-checker-builder",
+    "tip-reserve-topper-builder-demo",
+    "tip-reserve-topper-builder-test",
+    "sites-builder",
+    "test-builder",
+    "wallet-builder",
+    "taler-demo-healthcheck-builder",
+    "taler-test-healthcheck-builder",
+]
 
 # Authentication for Web UI.
 
exec(compile(open('../taler_bb_userpass_db/taler_bb_userpass_db/db.py').read(), 
filename='db.py', mode='exec'))

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.