Make artifact URL an env variable

fauust · Oct 9, 2023 · ab8d7f2 · ab8d7f2
1 parent 90c61d4
commit ab8d7f2
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/docker-compose/.env b/docker-compose/.env
@@ -3,3 +3,4 @@ TITLE_URL=https://github.com/MariaDB/server
 BUILDMASTER_URL=https://buildbot.mariadb.org/
 MQ_ROUTER_URL=ws://localhost:8085/ws
 MASTER_PACKAGES_DIR="/mnt/autofs/master_packages"
+ARTIFACTS_URL="https://ci.mariadb.org"
diff --git a/docker-compose/.env.dev b/docker-compose/.env.dev
@@ -4,3 +4,4 @@ BUILDMASTER_URL=https://buildbot.dev.mariadb.org/
 BUILDMASTER_WG_IP=100.64.101.1
 MQ_ROUTER_URL=ws://crossbar:8080/ws
 MASTER_PACKAGES_DIR="/mnt/autofs/master_dev_packages"
+ARTIFACTS_URL="https://ci.dev.mariadb.org"
diff --git a/master-protected-branches/master.cfg b/master-protected-branches/master.cfg
@@ -108,7 +108,7 @@ c['workers'].append(worker.DockerLatentWorker("hz-bbw1-docker-tarball-debian-10"
                     alwaysPull=True,
                     masterFQDN=FQDN,
                     hostconfig={ 'shm_size':'1G' },
-                    volumes=MASTER_PACKAGES+'/:/packages',
+                    volumes=[MASTER_PACKAGES+'/:/packages'],
                     max_builds=1,
                     build_wait_timeout=0,
                     properties={ 'jobs':4, 'save_packages':True }))
@@ -121,7 +121,7 @@ c['workers'].append(worker.DockerLatentWorker("hz-bbw4-docker-tarball-debian-10"
                     alwaysPull=True,
                     masterFQDN=FQDN,
                     hostconfig={ 'shm_size':'1G' },
-                    volumes=MASTER_PACKAGES+'/:/packages',
+                    volumes=[MASTER_PACKAGES+'/:/packages'],
                     max_builds=1,
                     build_wait_timeout=0,
                     properties={ 'jobs':4, 'save_packages':True }))
@@ -187,8 +187,6 @@ f_tarball.addStep(steps.SetPropertyFromCommand(
 f_tarball.addStep(steps.ShellCommand(command=util.Interpolate("mkdir -p %(prop:buildnumber)s/logs"), workdir="build/mkdist"))
 f_tarball.addStep(steps.ShellCommand(command=util.Interpolate("sha256sum %(prop:mariadb_version)s" + ".tar.gz >> " + " %(prop:buildnumber)s" + "/sha256sums.txt" + " && mv %(prop:mariadb_version)s" +".tar.gz" + " %(prop:buildnumber)s"), workdir="build/mkdist"))
 f_tarball.addStep(steps.SetPropertyFromCommand(command="ls -1 *.tar.gz", extract_fn=ls2list, workdir=util.Interpolate("build/mkdist/" + "%(prop:buildnumber)s")))
-#f_tarball.addStep(steps.DirectoryUpload(workersrc=util.Interpolate('%(prop:builddir)s' + '/build/mkdist/' + '%(prop:buildnumber)s'),
-#    masterdest=util.Interpolate('/srv/buildbot/packages/' + '%(prop:buildnumber)s'), url=util.Interpolate('https://ci.mariadb.org/' + "%(prop:buildnumber)s"), urlText="Download", doStepIf=hasFiles))
 f_tarball.addStep(steps.ShellCommand(name='save_packages', haltOnFailure=True, command=util.Interpolate('cp -r ' + '%(prop:builddir)s' + '/build/mkdist/' + '%(prop:buildnumber)s' + ' /packages && sync /packages/' + '%(prop:buildnumber)s')))
 f_tarball.addStep(steps.Trigger(
     schedulerNames=['s_protected_branches'],

diff --git a/utils.py b/utils.py
@@ -111,7 +111,7 @@ def downloadSourceTarball():
     if [[ $os != "AIX" ]]; then
       use_flock="flock \"$d$f\" "
     fi
-    cmd="$use_flock wget -cO \"$d$f\" \"https://ci.mariadb.org/%(prop:tarbuildnum)s/%(prop:mariadb_version)s.tar.gz\""
+    cmd="$use_flock wget -cO \"$d$f\" \"""" + os.getenv('ARTIFACTS_URL', default='https://ci.mariadb.org') + """/%(prop:tarbuildnum)s/%(prop:mariadb_version)s.tar.gz\""
 
     res=1
     for i in {1..10}; do