public inbox for buildbot@sourceware.org
 help / color / mirror / Atom feed
* [PATCH] Add debian-testing container file and builders
@ 2022-07-03 22:43 Mark Wielaard
  0 siblings, 0 replies; only message in thread
From: Mark Wielaard @ 2022-07-03 22:43 UTC (permalink / raw)
  To: buildbot; +Cc: Mark Wielaard

Use debian-testing container for elfutils, libabigail, dwz, bzip2,
valgrind, debugedit, gccrust, binutils (try), gdb (try) and glibc
builders.
---
 .../containers/Containerfile-debian-testing   |  37 ++++++
 builder/master.cfg                            | 122 ++++++++++++++++++
 2 files changed, 159 insertions(+)
 create mode 100644 builder/containers/Containerfile-debian-testing

diff --git a/builder/containers/Containerfile-debian-testing b/builder/containers/Containerfile-debian-testing
new file mode 100644
index 0000000..e90c7c4
--- /dev/null
+++ b/builder/containers/Containerfile-debian-testing
@@ -0,0 +1,37 @@
+# Setup the (minimal) image, upgrade and install all devel packages
+FROM debian:testing
+RUN apt-get update && \
+    apt-get upgrade -y && \
+    apt-get install -y \
+      build-essential gcc-multilib g++ libubsan1 libasan6 libtool ccache valgrind \
+      libisl-dev libmpc-dev libgmp-dev libmpfr-dev libgmp-dev \
+      patch util-linux diffutils iproute2 libarchive-tools cpio rpm2cpio procps \
+      coreutils make git autotools-dev autoconf dejagnu automake gettext bison flex \
+      gawk m4 pkg-config gettext autopoint \
+      bzip2 libbz2-dev xz-utils liblzma-dev gzip zlib1g-dev zstd libzstd-dev \
+      findutils file tar curl libarchive-tools libarchive-dev libcurl4-gnutls-dev \
+      libmicrohttpd-dev libsqlite3-dev libelf-dev libdw-dev elfutils \
+      libdebuginfod-dev \
+      texinfo \
+      xmlto xsltproc docbook-xsl docbook-xml \
+      libxml2-dev dos2unix python3-dev python3-mock \
+      python3-rpm python3-xdg mime-support libopenmpi-dev gdb help2man wget \
+      buildbot-worker && \
+    apt-get clean
+
+# Setup user with same id as host user id.
+RUN adduser --home /home/builder --uid 1001 builder
+
+# Set image specific environment variables used by bb-start.sh
+ENV IMAGE_NAME=debian-testing
+ENV CCACHE_LIBDIR=/usr/lib/ccache
+
+# Put bb-start.sh script in homedir and make it executable
+RUN wget -O /home/builder/bb-start.sh \
+    'https://sourceware.org/git/?p=builder.git;a=blob_plain;f=builder/containers/bb-start.sh' \
+    && chmod 755 /home/builder/bb-start.sh
+
+# And now run the script
+USER builder
+WORKDIR /home/builder
+ENTRYPOINT /home/builder/bb-start.sh
diff --git a/builder/master.cfg b/builder/master.cfg
index 92a6981..e903029 100644
--- a/builder/master.cfg
+++ b/builder/master.cfg
@@ -314,6 +314,7 @@ elfutils_scheduler = schedulers.SingleBranchScheduler(
                       "elfutils-debian-arm64",
                       "elfutils-fedora-x86_64",
                       "elfutils-rawhide-x86_64",
+                      "elfutils-debian-testing-x86_64",
                       "elfutils-debian-amd64",
                       "elfutils-debian-i386",
                       "elfutils-debian-armhf",
@@ -333,6 +334,7 @@ libabigail_scheduler = schedulers.SingleBranchScheduler(
                       "libabigail-debian-arm64",
                       "libabigail-fedora-x86_64",
                       "libabigail-rawhide-x86_64",
+                      "libabigail-debian-testing-x86_64",
                       "libabigail-debian-amd64",
                       "libabigail-debian-i386",
                       "libabigail-debian-armhf",
@@ -352,6 +354,7 @@ dwz_scheduler = schedulers.SingleBranchScheduler(
                       "dwz-debian-arm64",
                       "dwz-fedora-x86_64",
                       "dwz-rawhide-x86_64",
+                      "dwz-debian-testing-x86_64",
                       "dwz-debian-amd64",
                       "dwz-debian-i386",
                       "dwz-debian-armhf",
@@ -371,6 +374,7 @@ bzip2_scheduler = schedulers.SingleBranchScheduler(
                       "bzip2-debian-arm64",
                       "bzip2-fedora-x86_64",
                       "bzip2-rawhide-x86_64",
+                      "bzip2-debian-testing-x86_64",
                       "bzip2-debian-amd64",
                       "bzip2-debian-i386",
                       "bzip2-debian-armhf",
@@ -388,6 +392,7 @@ valgrind_scheduler = schedulers.SingleBranchScheduler(
         reason="valgrind project master branch update",
         builderNames=["valgrind-fedora-x86_64",
                       "valgrind-rawhide-x86_64",
+                      "valgrind-debian-testing-x86_64",
                       "valgrind-debian-armhf",
                       "valgrind-debian-i386",
                       "valgrind-fedora-ppc64le",
@@ -407,6 +412,7 @@ debugedit_scheduler = schedulers.SingleBranchScheduler(
                       "debugedit-debian-arm64",
                       "debugedit-fedora-x86_64",
                       "debugedit-rawhide-x86_64",
+                      "debugedit-debian-testing-x86_64",
                       "debugedit-debian-amd64",
                       "debugedit-debian-i386",
                       "debugedit-debian-armhf",
@@ -439,6 +445,7 @@ gccrust_scheduler = schedulers.SingleBranchScheduler(
         reason="gccrust project master branch gccrs files update",
         builderNames=["gccrust-fedora-x86_64",
                       "gccrust-rawhide-x86_64",
+                      "gccrust-debian-testing-x86_64",
                       "gccrust-debian-i386",
 #                      "gccrust-debian-arm64",
                       "gccrust-fedora-ppc64le",
@@ -485,6 +492,7 @@ binutils_scheduler = schedulers.SingleBranchScheduler(
         builderNames=["binutils-debian-amd64",
                       "binutils-fedora-x86_64",
                       "binutils-rawhide-x86_64",
+                      "binutils-debian-testing-x86_64",
                       "binutils-fedora-s390x",
                       "binutils-debian-ppc64",
                       "binutils-debian-armhf",
@@ -506,6 +514,7 @@ binutils_try_scheduler = schedulers.AnyBranchScheduler(
         builderNames=["binutils-try-debian-amd64",
                       "binutils-try-fedora-x86_64",
                       "binutils-try-rawhide-x86_64",
+                      "binutils-try-debian-testing-x86_64",
                       "binutils-try-fedora-s390x",
                       "binutils-try-debian-i386",
                       "binutils-try-fedora-ppc64le",
@@ -550,6 +559,7 @@ gdb_scheduler = schedulers.SingleBranchScheduler(
         builderNames=["gdb-centos-x86_64",
                       "gdb-fedora-x86_64",
                       "gdb-rawhide-x86_64",
+                      "gdb-debian-testing-x86_64",
                       "gdb-debian-armhf",
                       "gdb-debian-arm64",
                       "gdb-debian-i386",
@@ -571,6 +581,7 @@ gdb_try_scheduler = schedulers.AnyBranchScheduler(
         builderNames=["gdb-try-centos-x86_64",
                       "gdb-try-fedora-x86_64",
                       "gdb-try-rawhide-x86_64",
+                      "gdb-try-debian-testing-x86_64",
                       "gdb-try-debian-i386",
                       "gdb-try-fedora-s390x",
                       "gdb-try-fedora-ppc64le",
@@ -614,6 +625,7 @@ glibc_build_scheduler = schedulers.SingleBranchScheduler(
         reason="glibc project master branch update",
         builderNames=["glibc-debian-i386",
                       "glibc-rawhide-x86_64",
+                      "glibc-debian-testing-x86_64",
                       "glibc-fedora-s390x",
                       "glibc-debian-ppc64",
                       "glibc-fedora-ppc64le",
@@ -920,6 +932,15 @@ bzip2_rawhide_x86_64_builder = util.BuilderConfig(
         factory=bzip2_factory)
 c['builders'].append(bzip2_rawhide_x86_64_builder)
 
+bzip2_debian_testing_x86_64_builder = util.BuilderConfig(
+        name="bzip2-debian-testing-x86_64",
+	properties={'container-file':
+		    readContainerFile('debian-testing')},
+	workernames=vm_workers,
+        tags=["bzip2", "debian", "x86_64"],
+        factory=bzip2_factory)
+c['builders'].append(bzip2_debian_testing_x86_64_builder)
+
 # debugedit build steps, factory and builders
 
 debugedit_factory = util.BuildFactory()
@@ -1040,6 +1061,15 @@ debugedit_rawhide_x86_64_builder = util.BuilderConfig(
         factory=debugedit_factory)
 c['builders'].append(debugedit_rawhide_x86_64_builder)
 
+debugedit_debian_testing_x86_64_builder = util.BuilderConfig(
+        name="debugedit-debian-testing-x86_64",
+	properties={'container-file':
+		    readContainerFile('debian-testing')},
+	workernames=vm_workers,
+        tags=["debugedit", "debian", "x86_64"],
+        factory=debugedit_factory)
+c['builders'].append(debugedit_debian_testing_x86_64_builder)
+
 # dwz build steps, factory and builders
 
 # Not parallel and special named log files
@@ -1158,6 +1188,15 @@ dwz_rawhide_x86_64_builder = util.BuilderConfig(
         factory=dwz_factory)
 c['builders'].append(dwz_rawhide_x86_64_builder)
 
+dwz_debian_testing_x86_64_builder = util.BuilderConfig(
+        name="dwz-debian-testing-x86_64",
+	properties={'container-file':
+		    readContainerFile('debian-testing')},
+	workernames=vm_workers,
+        tags=["dwz", "debian", "x86_64"],
+        factory=dwz_factory)
+c['builders'].append(dwz_debian_testing_x86_64_builder)
+
 # elfutils build steps, factory and builders
 
 elfutils_set_package_step = steps.SetProperty(
@@ -1368,6 +1407,15 @@ elfutils_rawhide_x86_64_builder = util.BuilderConfig(
         factory=elfutils_factory_distcheck)
 c['builders'].append(elfutils_rawhide_x86_64_builder)
 
+elfutils_debian_testing_x86_64_builder = util.BuilderConfig(
+        name="elfutils-debian-testing-x86_64",
+	properties={'container-file':
+		    readContainerFile('debian-testing')},
+	workernames=vm_workers,
+        tags=["elfutils", "debian", "x86_64"],
+        factory=elfutils_factory_distcheck)
+c['builders'].append(elfutils_debian_testing_x86_64_builder)
+
 # gccrust build steps, factory and builders
 # All steps are custom because of the workdir settings
 
@@ -1544,6 +1592,15 @@ gccrust_rawhide_x86_64_builder = util.BuilderConfig(
         factory=gccrust_factory)
 c['builders'].append(gccrust_rawhide_x86_64_builder)
 
+gccrust_debian_testing_x86_64_builder = util.BuilderConfig(
+        name="gccrust-debian-testing-x86_64",
+	properties={'container-file':
+		    readContainerFile('debian-testing')},
+	workernames=vm_workers,
+        tags=["gccrust", "debian", "x86_64"],
+        factory=gccrust_factory)
+c['builders'].append(gccrust_debian_testing_x86_64_builder)
+
 gccrust_bootstrap_debian_amd64_builder = util.BuilderConfig(
         name="gccrust-bootstrap-debian-amd64",
 	properties={'container-file':
@@ -1855,6 +1912,15 @@ binutils_rawhide_x86_64_builder = util.BuilderConfig(
         factory=binutils_factory_libctf)
 c['builders'].append(binutils_rawhide_x86_64_builder)
 
+binutils_debian_testing_x86_64_builder = util.BuilderConfig(
+	name="binutils-debian-testing-x86_64",
+	properties={'container-file':
+		    readContainerFile('debian-testing')},
+        workernames=vm_workers,
+        tags=["binutils", "debian", "x86_64"],
+        factory=binutils_factory_libctf)
+c['builders'].append(binutils_debian_testing_x86_64_builder)
+
 binutils_try_opensuseleap_x86_64_builder = util.BuilderConfig(
 	name="binutils-try-opensuseleap-x86_64",
         collapseRequests=True,
@@ -1875,6 +1941,16 @@ binutils_try_rawhide_x86_64_builder = util.BuilderConfig(
         factory=binutils_factory_libctf)
 c['builders'].append(binutils_try_rawhide_x86_64_builder)
 
+binutils_try_debian_testing_x86_64_builder = util.BuilderConfig(
+	name="binutils-try-debian-testing-x86_64",
+        collapseRequests=True,
+	properties={'container-file':
+		    readContainerFile('debian-testing')},
+        workernames=vm_workers,
+        tags=["binutils-try", "debian", "x86_64"],
+        factory=binutils_factory_libctf)
+c['builders'].append(binutils_try_debian_testing_x86_64_builder)
+
 # gdb build steps, factory and builders
 
 gdb_git_step = steps.Git(
@@ -2150,6 +2226,15 @@ gdb_rawhide_x86_64_builder = util.BuilderConfig(
         factory=gdb_factory)
 c['builders'].append(gdb_rawhide_x86_64_builder)
 
+gdb_debian_testing_x86_64_builder = util.BuilderConfig(
+	name="gdb-debian-testing-x86_64",
+	properties={'container-file':
+		    readContainerFile('debian-testing')},
+        workernames=vm_workers,
+        tags=["gdb", "debian", "x86_64"],
+        factory=gdb_factory)
+c['builders'].append(gdb_debian_testing_x86_64_builder)
+
 gdb_try_opensuseleap_x86_64_builder = util.BuilderConfig(
 	name="gdb-try-opensuseleap-x86_64",
         collapseRequests=True,
@@ -2170,6 +2255,16 @@ gdb_try_rawhide_x86_64_builder = util.BuilderConfig(
         factory=gdb_factory)
 c['builders'].append(gdb_try_rawhide_x86_64_builder)
 
+gdb_try_debian_testing_x86_64_builder = util.BuilderConfig(
+	name="gdb-try-debian-testing-x86_64",
+        collapseRequests=True,
+	properties={'container-file':
+		    readContainerFile('debian-testing')},
+        workernames=vm_workers,
+        tags=["gdb-try", "debian", "x86_64"],
+        factory=gdb_factory)
+c['builders'].append(gdb_try_debian_testing_x86_64_builder)
+
 # binutils-gdb build steps, factory and builders
 # just a native build
 
@@ -2422,6 +2517,15 @@ glibc_rawhide_x86_64_builder = util.BuilderConfig(
         factory=glibc_build_factory)
 c['builders'].append(glibc_rawhide_x86_64_builder)
 
+glibc_debian_testing_x86_64_builder = util.BuilderConfig(
+        name="glibc-debian-testing-x86_64",
+        properties={'container-file':
+                    readContainerFile('debian-testing')},
+        workernames=vm_workers,
+        tags=["glibc", "debian", "x86_64"],
+        factory=glibc_build_factory)
+c['builders'].append(glibc_debian_testing_x86_64_builder)
+
 # libabigail build steps, factory and builders
 
 libabigail_package_name_step = steps.SetProperty(
@@ -2567,6 +2671,15 @@ libabigail_rawhide_x86_64_builder = util.BuilderConfig(
         factory=libabigail_factory)
 c['builders'].append(libabigail_rawhide_x86_64_builder)
 
+libabigail_debian_testing_x86_64_builder = util.BuilderConfig(
+        name="libabigail-debian-testing-x86_64",
+	properties={'container-file':
+		    readContainerFile('debian-testing')},
+	workernames=vm_workers,
+        tags=["libabigail", "debian", "x86_64"],
+        factory=libabigail_factory)
+c['builders'].append(libabigail_debian_testing_x86_64_builder)
+
 # valgrind build steps, factory and builders
 
 valgrind_git_step = steps.Git(
@@ -2689,6 +2802,15 @@ valgrind_rawhide_x86_64_builder = util.BuilderConfig(
         factory=valgrind_make_check_aux_factory)
 c['builders'].append(valgrind_rawhide_x86_64_builder)
 
+valgrind_debian_testing_x86_64_builder = util.BuilderConfig(
+        name="valgrind-debian-testing-x86_64",
+	properties={'container-file':
+		    readContainerFile('debian-testing')},
+	workernames=vm_workers,
+        tags=["valgrind", "debian", "x86_64"],
+        factory=valgrind_make_check_aux_factory)
+c['builders'].append(valgrind_debian_testing_x86_64_builder)
+
 ####### BUILDBOT SERVICES
 
 # 'services' is a list of BuildbotService items like reporter targets. The
-- 
2.30.2


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2022-07-03 22:43 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-07-03 22:43 [PATCH] Add debian-testing container file and builders Mark Wielaard

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).