[taler-deployment] branch master updated (a9b6ec2 -> c59e2ba)

[gnunet]

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

devan-carpenter pushed a change to branch master
in repository deployment.

    from a9b6ec2  Removing docker-compose dashes and fixing line breaks
     new 575051e  buildbot: add support for external repos to container factory
     new c59e2ba  buildbot: remove old commented-out list

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 buildbot/master.cfg | 41 ++++++++++++++++++++---------------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/buildbot/master.cfg b/buildbot/master.cfg
index f29df44..b66395f 100644
--- a/buildbot/master.cfg
+++ b/buildbot/master.cfg
@@ -1213,12 +1213,6 @@ EMAIL_ALERTS.append("packaging-ubuntu-builder")
 # These factories uses the standard container worker.
 WORKERS.append(Worker("container-worker", "container-pass"))
 
-#
-# container_repos = ["backoffice", "wallet-core", "bank", "exchange",
-#                    "merchant", "deployment", "twister", "sync",
-#                           "help", "taler-merchant-demos", "challenger"]
-#
-
 
 # Container Job Generator Functions
 # Parse config file and save values in a dict
@@ -1255,8 +1249,8 @@ def handle_job_config(jobDirPath, jobName, repoName, 
configPath, configExist):
 
 class GenerateStagesCommand(buildstep.ShellMixin, steps.BuildStep):
 
-    def __init__(self, reponame, **kwargs):
-        self.reponame = reponame
+    def __init__(self, REPO_NAME, **kwargs):
+        self.REPO_NAME = REPO_NAME
         kwargs = self.setupShellMixin(kwargs)
         super().__init__(**kwargs)
         self.observer = logobserver.BufferLogObserver()
@@ -1272,7 +1266,7 @@ class GenerateStagesCommand(buildstep.ShellMixin, 
steps.BuildStep):
 
     @defer.inlineCallbacks
     def run(self):
-        CONTAINER_WORKDIR = f"/home/container-worker/workspace/{self.reponame}"
+        CONTAINER_WORKDIR = 
f"/home/container-worker/workspace/{self.REPO_NAME}"
         CI_JOBS_PATH = f"{CONTAINER_WORKDIR}/ci/jobs"
         # run 'ls <project_root>/ci/jobs/' to get the list of stages
         cmd = yield self.makeRemoteShellCommand()
@@ -1300,7 +1294,7 @@ class GenerateStagesCommand(buildstep.ShellMixin, 
steps.BuildStep):
                 print(jobDirPath)
                 self.configDict.update(
                         handle_job_config(
-                            jobDirPath, stage, self.reponame,
+                            jobDirPath, stage, self.REPO_NAME,
                             observer.getStdout(), cmd1.results()))
                 print(self.configDict)
             # create a container step for each stage and
@@ -1325,17 +1319,22 @@ class GenerateStagesCommand(buildstep.ShellMixin, 
steps.BuildStep):
         return result
 
 
-container_repos = ["wallet-core", "merchant", "docs"]
+# List of repos to add to container factory.
+container_repos = ["git.taler.net/wallet-core",
+                   "git.taler.net/merchant",
+                   "git.taler.net/docs",
+                   "git.gnunet.org/gnunet"]
 
-for reponame in container_repos:
+for repo in container_repos:
 
     # Prepare to read job configs
     ini = configparser.ConfigParser()
     ini.optionxform = str
 
     # Factory-wide variables
-    REPO_URL = "https://git.taler.net/"; + reponame + ".git"
-    CONTAINER_WORKDIR = f"/home/container-worker/workspace/{reponame}"
+    REPO_NAME = repo.rsplit('/', 1)[1]
+    REPO_URL = "https://"; + repo + ".git"
+    CONTAINER_WORKDIR = f"/home/container-worker/workspace/{REPO_NAME}"
     CI_JOBS_PATH = f"{CONTAINER_WORKDIR}/ci/jobs"
 
     # Create a factory
@@ -1366,13 +1365,13 @@ for reponame in container_repos:
     ))
 
     container_factory.addStep(GenerateStagesCommand(
-        reponame,
+        REPO_NAME,
         name="Generate build stages",
         command=["ls", CI_JOBS_PATH],
         haltOnFailure=True))
 
     BUILDERS.append(util.BuilderConfig(
-        name=f"{reponame}-builder",
+        name=f"{REPO_NAME}-builder",
         workernames=["container-worker"],
         factory=container_factory
     ))
@@ -1380,20 +1379,20 @@ for reponame in container_repos:
     # Only enable this scheduler for debugging!
     # Will run builders with 1 minute of waiting inbetween builds
     # SCHEDULERS.append(schedulers.Periodic(
-    #     name=f"{reponame}-minutely",
-    #     builderNames=[f"{reponame}-builder"],
+    #     name=f"{REPO_NAME}-minutely",
+    #     builderNames=[f"{REPO_NAME}-builder"],
     #     periodicBuildTimer=60
     #     ))
 
     # Buildmaster is notified whenever deployment.git changes
     SCHEDULERS.append(schedulers.SingleBranchScheduler(
-        name=f"{reponame}-container-scheduler",
+        name=f"{REPO_NAME}-container-scheduler",
         change_filter=util.ChangeFilter(
             branch_re='.*',
-            project_re=f"({reponame})"
+            project_re=f"({REPO_NAME})"
         ),
         treeStableTimer=None,
-        builderNames=[f"{reponame}-builder"]
+        builderNames=[f"{REPO_NAME}-builder"]
     ))
 
 # TODO: TBD

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