From e589c31f67fd2fc07a7146c5ad3767c8e582fead Mon Sep 17 00:00:00 2001 From: Tristan Date: Thu, 18 Aug 2022 07:59:29 +0100 Subject: [PATCH] Add a slowdebug (-O0 etc) dev build --- .gitlab-ci.yml | 79 ++++++++++++++++++++++++++++++++++++++++---- haproxy/Makefile | 11 ++++-- haproxy/debian/rules | 8 ++++- 3 files changed, 89 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fff11c1..43c9d6a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,6 +22,10 @@ variables: &default-variables # https://git.haproxy.org/?p=haproxy.git;a=commit;h=b29a1dc2f4a334c1c7fea76c59abb4097422c05c HAPROXY_GITREF: b29a1dc2f4a334c1c7fea76c59abb4097422c05c +.haproxy_dev_slowdebug: &haproxy-dev-slowdebug + <<: *haproxy-dev + HAPROXY_SLOWDEBUG: "true" + .build-job: &build-job image: registry.gitlab.com/mangadex-pub/debuilder/buster:main needs: [ ] @@ -86,7 +90,7 @@ vtest: - mkdir deps/lua/dist && tar -C deps/lua/dist -xf deps/lua/lua-dist.tar.gz - mkdir deps/pcre2/dist && tar -C deps/pcre2/dist -xf deps/pcre2/pcre2-dist.tar.gz - mkdir deps/quictls/dist && tar -C deps/quictls/dist -xf deps/quictls/quictls-dist.tar.gz - - make -C haproxy HAPROXY_GITREPO="$HAPROXY_GITREPO" HAPROXY_VERSION="$HAPROXY_VERSION" HAPROXY_GITREF="$HAPROXY_GITREF" + - make -C haproxy HAPROXY_GITREPO="$HAPROXY_GITREPO" HAPROXY_VERSION="$HAPROXY_VERSION" HAPROXY_GITREF="$HAPROXY_GITREF" HAPROXY_SLOWDEBUG="${HAPROXY_SLOWDEBUG:-false}" needs: *needs-dependencies artifacts: expire_in: 7 days @@ -115,7 +119,7 @@ vtest: - mkdir deps/pcre2/dist && tar -C deps/pcre2/dist -xf deps/pcre2/pcre2-dist.tar.gz - mkdir deps/quictls/dist && tar -C deps/quictls/dist -xf deps/quictls/quictls-dist.tar.gz - export BUILD_MESSAGE="$CI_COMMIT_MESSAGE" - - make -C haproxy dist-deb HAPROXY_GITREPO="$HAPROXY_GITREPO" HAPROXY_VERSION="$HAPROXY_VERSION" HAPROXY_GITREF="$HAPROXY_GITREF" + - make -C haproxy dist-deb HAPROXY_GITREPO="$HAPROXY_GITREPO" HAPROXY_VERSION="$HAPROXY_VERSION" HAPROXY_GITREF="$HAPROXY_GITREF" HAPROXY_SLOWDEBUG="${HAPROXY_SLOWDEBUG:-false}" - | set -euo pipefail @@ -127,8 +131,13 @@ vtest: echo "Git reference $CI_COMMIT_REF_NAME is not the default branch. Setting coordinates to $PACKAGE_NAME/$DEB_VERSION" fi - GITLAB_IS_LAME_DEB_VERSION=$(echo "${DEB_VERSION}" | tr '~' '-') - echo "Publishing Debian package version ${DEB_VERSION} to haproxy-debian@${GITLAB_IS_LAME_DEB_VERSION}" + GITLAB_PACKAGE_VERSION=$(echo "${DEB_VERSION}" | tr '~' '-') + if ${HAPROXY_SLOWDEBUG:-false}; then + echo "Appending slowdebug to package version" + GITLAB_PACKAGE_VERSION="${GITLAB_PACKAGE_VERSION}-slowdebug" + fi + + echo "Publishing Debian package version ${DEB_VERSION} to haproxy-debian@${GITLAB_PACKAGE_VERSION}" for artifact in haproxy/haproxy*.deb; do artifact_filename=$(basename "${artifact}") @@ -136,7 +145,7 @@ vtest: echo "Uploading to haproxy-debian@${DEB_VERSION}... ${artifact_filename} -> ${gitlab_is_lame_artifact_filename}" curl -fsSL -H"JOB-TOKEN: $CI_JOB_TOKEN" \ --upload-file "${artifact}" \ - "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/${PACKAGE_NAME}/${GITLAB_IS_LAME_DEB_VERSION}/${gitlab_is_lame_artifact_filename}" + "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/${PACKAGE_NAME}/${GITLAB_PACKAGE_VERSION}/${gitlab_is_lame_artifact_filename}" echo "OK" done artifacts: @@ -155,6 +164,10 @@ vtest: echo "Git reference $CI_COMMIT_REF_NAME is not the default branch. Setting version to $PKG_VER" fi + if ${HAPROXY_SLOWDEBUG:-false}; then + echo "Appending slowdebug to package version" + PKG_VER="$PKG_VER-slowdebug" + fi curl -fsSL \ -H"JOB-TOKEN: $CI_JOB_TOKEN" \ --upload-file "haproxy/haproxy-dist.tar.gz" \ @@ -172,7 +185,7 @@ vtest: set -eu export DEBIAN_CODENAME="bullseye" - export JOB_TIMESTAMP="$(date -D '%Y-%m-%dT%H:%M:%S%Z' -d "$CI_JOB_STARTED_AT" +'%Y%m%d-%H%M')" + export JOB_TIMESTAMP="$(date -D '%Y-%m-%dT%H:%M:%S' -d "$CI_JOB_STARTED_AT" +'%Y%m%d-%H%M')" # A.B.C -> A.B, otherwise preserve original; so 2.7-dev -> 2.7-dev if echo "$HAPROXY_VERSION" | grep -E '([0-9]\.){2}[0-9]'; then @@ -180,6 +193,14 @@ vtest: else export HAPROXY_SHORTVER=$HAPROXY_VERSION fi + + # Append slowdebug if relevant + if ${HAPROXY_SLOWDEBUG:-false}; then + echo "Appending slowdebug to package version" + HAPROXY_VERSION="$HAPROXY_VERSION-slowdebug" + HAPROXY_SHORTVER="$HAPROXY_SHORTVER-slowdebug" + fi + echo "Building image with" echo " -> haproxy version: $HAPROXY_VERSION ($HAPROXY_SHORTVER)" echo " -> debian codename: $DEBIAN_CODENAME" @@ -237,6 +258,12 @@ build:dev: <<: *default-variables <<: *haproxy-dev +build:dev:slowdebug: + <<: *haproxy-build + variables: + <<: *default-variables + <<: *haproxy-dev-slowdebug + regtests:stable: <<: *haproxy-regtests variables: @@ -249,6 +276,12 @@ regtests:dev: <<: *default-variables <<: *haproxy-dev +regtests:dev:slowdebug: + <<: *haproxy-regtests + variables: + <<: *default-variables + <<: *haproxy-dev-slowdebug + haproxy-tarball:stable: <<: *haproxy-tarball variables: @@ -271,6 +304,17 @@ haproxy-tarball:dev: - job: "build:dev" artifacts: true +haproxy-tarball:dev:slowdebug: + <<: *haproxy-tarball + variables: + <<: *default-variables + <<: *haproxy-dev-slowdebug + needs: + - job: "regtests:dev:slowdebug" + artifacts: false + - job: "build:dev:slowdebug" + artifacts: true + docker:stable: <<: *haproxy-docker variables: @@ -297,6 +341,19 @@ docker:dev: - job: "build:dev" artifacts: true +docker:dev:slowdebug: + <<: *haproxy-docker + variables: + <<: *default-variables + <<: *haproxy-dev-slowdebug + needs: + - job: "quictls" + artifacts: true + - job: "regtests:dev:slowdebug" + artifacts: false + - job: "build:dev:slowdebug" + artifacts: true + debian:stable: <<: *haproxy-debian variables: @@ -317,6 +374,16 @@ debian:dev: - job: "regtests:dev" artifacts: false +debian:dev:slowdebug: + <<: *haproxy-debian + variables: + <<: *default-variables + <<: *haproxy-dev-slowdebug + needs: + - *needs-dependencies + - job: "regtests:dev:slowdebug" + artifacts: false + quictls:tarball: image: docker.io/curlimages/curl:latest stage: publish diff --git a/haproxy/Makefile b/haproxy/Makefile index 3e3b535..2ff961e 100644 --- a/haproxy/Makefile +++ b/haproxy/Makefile @@ -23,8 +23,15 @@ BUILD_PATCHES_DIR = $(shell realpath patches) BUILD_PATCHES_FILES = $(shell ls -1 $(BUILD_PATCHES_DIR)) DEBIAN_PATCHES_DIR = "$(HAPROXY_BUILDIR)/debian/patches" +HAPROXY_SLOWDEBUG = false + +DEBUG_CFLAGS = -ggdb3 -gdwarf-4 +ifeq ($(HAPROXY_SLOWDEBUG), true) + DEBUG_CFLAGS += -O0 +endif + MAKEARGS = DEBUG="-DDEBUG_MEMORY_POOLS -DDEBUG_STRICT" \ - DEBUG_CFLAGS="-ggdb3 -gdwarf-4" \ + DEBUG_CFLAGS="$(DEBUG_CFLAGS)"\ DEFINE="-DMAX_SESS_STKCTR=5" \ IGNOREGIT=true \ ADDLIB="-Wl,-rpath,/opt/quictls/lib" \ @@ -119,7 +126,7 @@ prepare-deb: $(HAPROXY_DEBORIG) $(HAPROXY_BUILDIR) cat debian/changelog >> "$(HAPROXY_BUILDIR)/debian/changelog" build-deb: prepare-deb - cd $(HAPROXY_BUILDIR) && debuild -us -uc + cd $(HAPROXY_BUILDIR) && debuild -e HAPROXY_SLOWDEBUG="$(HAPROXY_SLOWDEBUG)" -us -uc rm -fv $(HAPROXY_TARBALL) rm -rf $(HAPROXY_BUILDIR) diff --git a/haproxy/debian/rules b/haproxy/debian/rules index 684d4e3..5087370 100755 --- a/haproxy/debian/rules +++ b/haproxy/debian/rules @@ -6,8 +6,13 @@ DEP_DIST_ROOT_QUICTLS = $(shell realpath ../../deps/quictls/dist) BUILD_VERSION_REPOSHA = $(shell git rev-parse --short HEAD) +DEBUG_CFLAGS = -ggdb3 -gdwarf-4 +ifeq ($(HAPROXY_SLOWDEBUG), true) + DEBUG_CFLAGS += -O0 +endif + MAKEARGS = DEBUG="-DDEBUG_MEMORY_POOLS -DDEBUG_STRICT" \ - DEBUG_CFLAGS="-ggdb3 -gdwarf-4" \ + DEBUG_CFLAGS="$(DEBUG_CFLAGS)" \ DEFINE="-DMAX_SESS_STKCTR=5" \ IGNOREGIT=true \ ADDLIB="-Wl,-rpath,/opt/quictls/lib" \ @@ -48,6 +53,7 @@ MAKEARGS += DOCDIR=/usr/share/doc/haproxy override_dh_auto_configure: override_dh_auto_build-arch: + @if ${HAPROXY_SLOWDEBUG}; then echo "slowdebug enabled"; else echo "slowdebug disabled"; fi $(MAKE) -j $(shell nproc) $(MAKEARGS) if [ -d "dev/haring" ]; then $(MAKE) -j $(shell nproc) dev/haring/haring; fi $(MAKE) -j $(shell nproc) -C admin/systemd $(MAKEARGS)