taler-deployment

commit fbf55ba8e13f9778ebb23de06fc2b52396982640
parent 17774394b44dec6edf25410238624167c35a762e
Author: Devan Carpenter <devan@taler.net>
Date:   Wed, 22 Nov 2023 22:36:44 -0500

buildbot: move ci scripts path in repos to contrib

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

1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/buildbot/master.cfg b/buildbot/master.cfg
@@ -188,7 +188,7 @@ def container_add_step(HALT_ON_FAILURE,
                        factory,
                        WORK_DIR,
                        stepName,
-                       jobCmd="/workdir/ci/ci.sh",
+                       jobCmd="/workdir/contrib/ci/ci.sh",
                        containerFile="ci/Containerfile"):
     print(f"HALT_ON_FAILURE: {HALT_ON_FAILURE}, WARN_ON_FAILURE: {WARN_ON_FAILURE}, CONTAINER_BUILD: {CONTAINER_BUILD}, CONTAINER_NAME: {CONTAINER_NAME}")
     if not CONTAINER_BUILD:
@@ -1071,8 +1071,8 @@ class GenerateStagesCommand(buildstep.ShellMixin, steps.BuildStep):
     @defer.inlineCallbacks
     def run(self):
         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
+        CI_JOBS_PATH = f"{CONTAINER_WORKDIR}/contrib/ci/jobs"
+        # run 'ls <project_root>/contrib/ci/jobs/' to get the list of stages
         cmd = yield self.makeRemoteShellCommand()
         yield self.runCommand(cmd)
         jobDirs = []
@@ -1140,7 +1140,7 @@ for repo in container_repos:
     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"
+    CI_JOBS_PATH = f"{CONTAINER_WORKDIR}/contrib/ci/jobs"
 
     # Create a factory
     container_factory = util.BuildFactory()