[cci_eol] b6bc32a65 SQUASHME: circleci: Remove nested docker for build jobs

Dridi Boukelmoune dridi.boukelmoune at gmail.com
Wed Jun 19 07:36:07 UTC 2024


commit b6bc32a65bcc0333693841d981f8fa0ac8694dce
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Wed Jun 19 09:34:10 2024 +0200

    SQUASHME: circleci: Remove nested docker for build jobs
    
    Better diff with the --ignore-all-space option.

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 31143da42..bbcb42847 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -218,22 +218,14 @@ jobs:
         default: medium
         type: string
     docker:
-      - image: fedora:latest
+      - image: << parameters.prefix >><< parameters.dist >>:<< parameters.release >>
     resource_class: << parameters.rclass >>
     working_directory: /workspace
     steps:
-      - setup_remote_docker
-      - run:
-          name: Install podman
-          command: dnf -y install podman
       - checkout
       - run:
           name: Extract and build
           command: |
-            sudo mount --make-rshared /
-            podman create --name workspace -v /root/workspace docker://<< parameters.prefix >><< parameters.dist >>:<< parameters.release >> /bin/true
-            podman cp /workspace workspace:/root
-            podman run --volumes-from workspace -w /root/workspace << parameters.prefix >><< parameters.dist >>:<< parameters.release >> sh -c '
             case "<< parameters.dist >>" in
             almalinux|fedora)
                 dnf -y groupinstall "Development Tools"
@@ -337,21 +329,17 @@ jobs:
 
             chown -R varnish:varnish .
 
-            export ASAN_OPTIONS=abort_on_error=1,detect_odr_violation=1,detect_leaks=1,detect_stack_use_after_return=1,detect_invalid_pointer_pairs=1,handle_segv=0,handle_sigbus=0,use_sigaltstack=0,disable_coredump=0
-            export LSAN_OPTIONS=abort_on_error=1,use_sigaltstack=0,suppressions=$(pwd)/tools/lsan.suppr
-            export TSAN_OPTIONS=abort_on_error=1,halt_on_error=1,use_sigaltstack=0,suppressions=$(pwd)/tools/tsan.suppr
-            export UBSAN_OPTIONS=halt_on_error=1,print_stacktrace=1,use_sigaltstack=0,suppressions=$(pwd)/tools/ubsan.suppr
-
-            sudo -u varnish \
+            sudo -u varnish sh -c '
+                export ASAN_OPTIONS=abort_on_error=1,detect_odr_violation=1,detect_leaks=1,detect_stack_use_after_return=1,detect_invalid_pointer_pairs=1,handle_segv=0,handle_sigbus=0,use_sigaltstack=0,disable_coredump=0
+                export LSAN_OPTIONS=abort_on_error=1,use_sigaltstack=0,suppressions=$(pwd)/tools/lsan.suppr
+                export TSAN_OPTIONS=abort_on_error=1,halt_on_error=1,use_sigaltstack=0,suppressions=$(pwd)/tools/tsan.suppr
+                export UBSAN_OPTIONS=halt_on_error=1,print_stacktrace=1,use_sigaltstack=0,suppressions=$(pwd)/tools/ubsan.suppr
                 autoreconf -i -v
-            sudo -u varnish \
                 ./configure \
-                << pipeline.parameters.configure_args >> \
-                << parameters.extra_conf >>
-            sudo -u varnish \
-                --preserve-env=ASAN_OPTIONS,LSAN_OPTIONS,TSAN_OPTIONS,UBSAN_OPTIONS \
+                    << pipeline.parameters.configure_args >> \
+                    << parameters.extra_conf >>
                 make -j 4 -k << parameters.make_target >> VERBOSE=1 \
-                DISTCHECK_CONFIGURE_FLAGS="<< pipeline.parameters.configure_args >> \
+                    DISTCHECK_CONFIGURE_FLAGS="<< pipeline.parameters.configure_args >> \
                 << parameters.extra_conf >>"
             '
 


More information about the varnish-commit mailing list