Add helper packages artifacts

fauust · Oct 10, 2023 · bbdac1f · bbdac1f
1 parent 1e2799e
commit bbdac1f
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/docker-compose/generate-config.py b/docker-compose/generate-config.py
@@ -61,6 +61,7 @@
       - ./nginx/nginx.conf:/etc/nginx/nginx.conf:ro
       - ./nginx/conf.d/:/etc/nginx/conf.d/:ro
       - /srv/buildbot/packages:/srv/buildbot/packages:ro
+      - /srv/buildbot/helper_packages:/srv/buildbot/helper_packages:ro
     ports:
       - "127.0.0.1:8080:80"
     networks:

diff --git a/docker-compose/nginx/conf.d/ci.dev.mariadb.org.conf b/docker-compose/nginx/conf.d/ci.dev.mariadb.org.conf
@@ -4,6 +4,9 @@ server {
 
   root /srv/buildbot/packages/;
   autoindex on;
+  location /helper_files {
+    alias /srv/buildbot/helper_files;
+  }
 
   # show mysql error logs directly in browser
   # example https://ci.mariadb.org/16646/logs/aarch64-ubuntu-2010/mysqld.2.err.4

diff --git a/master-libvirt/master.cfg b/master-libvirt/master.cfg
@@ -68,7 +68,7 @@ def downloadRpms():
               descriptionDone="fetching rpms...done",
               haltOnFailure=True,
               command=["sh", "-xc", util.Interpolate("""
-  wget -r -np -nH --cut-dirs=2 -A *.rpm "https://ci.mariadb.org/%(prop:tarbuildnum)s/%(prop:parentbuildername)s/rpms/" -P .
+  wget -r -np -nH --cut-dirs=2 -A *.rpm """" + os.getenv('ARTIFACTS_URL', default='https://ci.mariadb.org') + """/%(prop:tarbuildnum)s/%(prop:parentbuildername)s/rpms/" -P .
 """)])
 
 

diff --git a/master.cfg b/master.cfg
@@ -158,7 +158,7 @@ def dpkgDeb():
 """)],
             doStepIf=lambda step: hasFiles(step) and savePackage(step),
             descriptionDone=util.Interpolate("""
-            Repository available with: echo "deb [trusted=yes] https://ci.mariadb.org/%(prop:tarbuildnum)s/%(prop:buildername)s/debs ./" >> /etc/apt/sources.list
+            Repository available with: echo "deb [trusted=yes] """ + os.getenv('ARTIFACTS_URL', default='https://ci.mariadb.org') + """/%(prop:tarbuildnum)s/%(prop:buildername)s/debs ./" >> /etc/apt/sources.list
             """)
             )
 

diff --git a/utils.py b/utils.py
@@ -216,8 +216,8 @@ def getHTMLLogString():
 <html>
 <body>' >> /buildbot/mysql_logs.html
 
-echo '<a href="https://ci.mariadb.org/%(prop:tarbuildnum)s/logs/%(prop:buildername)s/">mysqld* log dir</a><br>' >> /buildbot/mysql_logs.html
-echo '<a href="https://ci.mariadb.org/%(prop:tarbuildnum)s/logs/%(prop:buildername)s/var.tar.gz">var.tar.gz</a><br>' >> /buildbot/mysql_logs.html
+echo '<a href=" """ + os.getenv('ARTIFACTS_URL', default='https://ci.mariadb.org') + """/%(prop:tarbuildnum)s/logs/%(prop:buildername)s/">mysqld* log dir</a><br>' >> /buildbot/mysql_logs.html
+echo '<a href=" """ + os.getenv('ARTIFACTS_URL', default='https://ci.mariadb.org') + """/%(prop:tarbuildnum)s/logs/%(prop:buildername)s/var.tar.gz">var.tar.gz</a><br>' >> /buildbot/mysql_logs.html
 
 echo '</body>
 </html>' >> /buildbot/mysql_logs.html"""