Save galera artifacts in the correct location

+ make them available via nginx
fauust · Oct 24, 2023 · a735860 · a735860
1 parent 8778dce
commit a735860
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/ci_build_images/debian.Dockerfile b/ci_build_images/debian.Dockerfile
@@ -28,7 +28,7 @@ RUN . /etc/os-release; \
     && apt-get -y upgrade \
     && apt-get -y install --no-install-recommends curl ca-certificates devscripts equivs lsb-release \
     && if [ "${VERSION_CODENAME}" = lunar ]; then apt-get -y install --no-install-recommends g++-10; fi \
-    && echo "deb [trusted=yes] https://buildbot.mariadb.net/archive/builds/mariadb-4.x/latest/kvm-deb-${VERSION_CODENAME}-$(dpkg --print-architecture)-gal/debs ./" > /etc/apt/sources.list.d/galera-4.list \
+    && echo "deb [trusted=yes] https://ci.mariadb.org/galera/mariadb-4.x/latest/gal-$(dpkg --print-architecture)-${ID}-$(echo "$VERSION_ID" | sed 's/\.//')/debs ./" > /etc/apt/sources.list.d/galera-4.list \
     && sed -i -e s/arm64/aarch64/ -e s/ppc64el/ppc64le/ /etc/apt/sources.list.d/galera-4.list \
     && if [ "${VERSION_CODENAME}" = lunar ] && [ "$(dpkg --print-architecture)" = arm64 ]; then rm /etc/apt/sources.list.d/galera-4.list; fi \
     && if [ "${VERSION_CODENAME}" = trixie ] || [ "${VERSION_CODENAME}" = mantic ] || [ "$(getconf LONG_BIT)" = 32 ]; then rm /etc/apt/sources.list.d/galera-4.list; fi \

diff --git a/docker-compose/.env b/docker-compose/.env
@@ -3,4 +3,5 @@ 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"
+GALERA_PACKAGES_DIR="/mnt/autofs/galera_packages"
 ARTIFACTS_URL="https://ci.mariadb.org"
diff --git a/docker-compose/.env.dev b/docker-compose/.env.dev
@@ -4,4 +4,5 @@ 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"
+GALERA_PACKAGES_DIR="/mnt/autofs/galera_dev_packages"
 ARTIFACTS_URL="https://ci.dev.mariadb.org"
diff --git a/master-galera/master.cfg b/master-galera/master.cfg
@@ -91,6 +91,7 @@ c['schedulers'].append(schedulerTrigger)
 c['workers'] = []
 
 # Docker workers
+GALERA_PACKAGES = os.getenv('GALERA_PACKAGES_DIR', default='/mnt/autofs/galera_packages')
 
 workers={}
 def addWorker(worker_name_prefix, worker_id, worker_type, dockerfile, jobs=5, save_packages=False, shm_size='15G'):
@@ -103,7 +104,7 @@ def addWorker(worker_name_prefix, worker_id, worker_type, dockerfile, jobs=5, sa
             save_packages,
             shm_size,
             worker_name_suffix='-galera',
-            volumes=['/srv/buildbot/ccache:/mnt/ccache', '/srv/buildbot/packages:/mnt/packages', '/mnt/autofs/galera_packages/:/packages'],
+            volumes=['/srv/buildbot/ccache:/mnt/ccache', '/srv/buildbot/packages:/mnt/packages', GALERA_PACKAGES+'/:/packages'],
             )
 
     if name[0] not in workers: