Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#349: docker images cleanup #377

Draft
wants to merge 11 commits into
base: develop
Choose a base branch
from
Draft

#349: docker images cleanup #377

wants to merge 11 commits into from

Conversation

cz4rs
Copy link
Contributor

@cz4rs cz4rs commented Nov 20, 2024

fixes #349


Use the images from DARMA-tasking/workflows repository.

@cz4rs cz4rs closed this Nov 28, 2024
@cz4rs cz4rs reopened this Nov 28, 2024
@cz4rs cz4rs force-pushed the 349-docker-images-cleanup branch from 444500e to 645e1f0 Compare November 28, 2024 12:36
@cz4rs cz4rs force-pushed the 349-docker-images-cleanup branch 2 times, most recently from 59f8fa3 to a4a4d44 Compare November 28, 2024 13:11
@cz4rs cz4rs force-pushed the 349-docker-images-cleanup branch from a4a4d44 to 42c2ff9 Compare December 31, 2024 10:38
@cz4rs cz4rs force-pushed the 349-docker-images-cleanup branch from 42c2ff9 to 2fcf7c5 Compare January 14, 2025 18:34
@cz4rs cz4rs force-pushed the 349-docker-images-cleanup branch from 2fcf7c5 to bf4c83c Compare January 16, 2025 17:33
cz4rs added 2 commits January 16, 2025 18:43
Use images from the `workflows` repository and remove redundant docker
code in `magistrate`.
@cz4rs cz4rs force-pushed the 349-docker-images-cleanup branch from bf4c83c to a81d7e7 Compare January 16, 2025 17:44
@cz4rs cz4rs force-pushed the 349-docker-images-cleanup branch from a81d7e7 to 12aa10e Compare January 16, 2025 18:01
FetchContent_Declare(
googletest
DOWNLOAD_EXTRACT_TIMESTAMP FALSE
URL https://github.com/google/googletest/archive/refs/tags/release-1.12.1.tar.gz
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Keeping 1.12.1 version here. Upgrade can be handled separately in #367.

Comment on lines 147 to +151
if (magistrate_tests_enabled
AND "${CMAKE_PROJECT_NAME}" STREQUAL "${PROJECT_NAME}")
# CTest implies enable_testing() and defines the BUILD_TESTING option.
# The default of BUILD_TESTING is ON.
# Testing is only enabled if the actual project being built is VT.
# Testing is only enabled if the actual project being built is magistrate.
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This condition seems strong enough to remove MAGISTRATE_HAS_GTEST and DISABLE_TPL_GTEST check.

@@ -2,6 +2,23 @@
set(PROJECT_TEST_UNIT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/unit)
set(PROJECT_TEST_MPI_UNIT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/unit/tests_mpi)

find_package(GTest)
if (NOT GTest_FOUND)
include(FetchContent)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can use CMake's FetchContent instead of pre-installing GTest in Docker image.
This makes it possible to update GTest version independently in various DARMA projects.

@cz4rs cz4rs force-pushed the 349-docker-images-cleanup branch from 137aaf5 to 14c038f Compare January 16, 2025 18:21
@cz4rs cz4rs force-pushed the 349-docker-images-cleanup branch from 699c49b to 5343692 Compare January 16, 2025 18:33
@@ -31,7 +31,7 @@ jobs:
MAGISTRATE_MPI: 1
MAGISTRATE_WARNINGS_AS_ERRORS: 1
MAGISTRATE_DOCS: 0
MAGISTRATE_ASAN: 1
MAGISTRATE_ASAN: 0
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All tests are failing with a similar error:

 1/58 Test  #1: magistrate:main ................................................***Failed  Required regular expression not found. Regex=[PASSED
]  0.00 sec
==1293==ERROR: AddressSanitizer failed to allocate 0x0 (0) bytes of SetAlternateSignalStack (error code: 22)
==1293==Process memory map follows:
	0x000000400000-0x000000423000	/build/checkpoint/tests/main
	0x000000423000-0x0000005ad000	/build/checkpoint/tests/main
	0x0000005ad000-0x000000604000	/build/checkpoint/tests/main
	0x000000605000-0x000000606000	/build/checkpoint/tests/main
	0x000000606000-0x000000614000	/build/checkpoint/tests/main
	0x000000614000-0x000000f3b000	
	0x00007fff7000-0x00008fff7000	
	0x00008fff7000-0x02008fff7000	
	0x02008fff7000-0x10007fff8000	
	0x7fccb0e00000-0x7fccb1152000	
	0x7fccb11a8000-0x7fccb11c5000	
	0x7fccb11c5000-0x7fccb11ed000	/usr/lib/x86_64-linux-gnu/libc.so.6
	0x7fccb11ed000-0x7fccb1382000	/usr/lib/x86_64-linux-gnu/libc.so.6
	0x7fccb1382000-0x7fccb13da000	/usr/lib/x86_64-linux-gnu/libc.so.6
	0x7fccb13da000-0x7fccb13db000	/usr/lib/x86_64-linux-gnu/libc.so.6
	0x7fccb13db000-0x7fccb13df000	/usr/lib/x86_64-linux-gnu/libc.so.6
	0x7fccb13df000-0x7fccb13e1000	/usr/lib/x86_64-linux-gnu/libc.so.6
	0x7fccb13e1000-0x7fccb13ee000	
	0x7fccb13ee000-0x7fccb13f1000	/usr/lib/x86_64-linux-gnu/libgcc_s.so.1
	0x7fccb13f1000-0x7fccb1408000	/usr/lib/x86_64-linux-gnu/libgcc_s.so.1
	0x7fccb1408000-0x7fccb140c000	/usr/lib/x86_64-linux-gnu/libgcc_s.so.1
	0x7fccb140c000-0x7fccb140d000	/usr/lib/x86_64-linux-gnu/libgcc_s.so.1
	0x7fccb140d000-0x7fccb140e000	/usr/lib/x86_64-linux-gnu/libgcc_s.so.1
	0x7fccb140e000-0x7fccb141c000	/usr/lib/x86_64-linux-gnu/libm.so.6
	0x7fccb141c000-0x7fccb1498000	/usr/lib/x86_64-linux-gnu/libm.so.6
	0x7fccb1498000-0x7fccb14f3000	/usr/lib/x86_64-linux-gnu/libm.so.6
	0x7fccb14f3000-0x7fccb14f4000	/usr/lib/x86_64-linux-gnu/libm.so.6
	0x7fccb14f4000-0x7fccb14f5000	/usr/lib/x86_64-linux-gnu/libm.so.6
	0x7fccb14f5000-0x7fccb158f000	/usr/lib/x86_64-linux-gnu/libstdc++.so.6.0.30
	0x7fccb158f000-0x7fccb16a0000	/usr/lib/x86_64-linux-gnu/libstdc++.so.6.0.30
	0x7fccb16a0000-0x7fccb170f000	/usr/lib/x86_64-linux-gnu/libstdc++.so.6.0.30
	0x7fccb170f000-0x7fccb1710000	/usr/lib/x86_64-linux-gnu/libstdc++.so.6.0.30
	0x7fccb1710000-0x7fccb171b000	/usr/lib/x86_64-linux-gnu/libstdc++.so.6.0.30
	0x7fccb171b000-0x7fccb171e000	/usr/lib/x86_64-linux-gnu/libstdc++.so.6.0.30
	0x7fccb171e000-0x7fccb1721000	
	0x7fccb1722000-0x7fccb1726000	
	0x7fccb1726000-0x7fccb1728000	/usr/lib/x86_64-linux-gnu/ld-linux-x86-64.so.2
	0x7fccb1728000-0x7fccb1752000	/usr/lib/x86_64-linux-gnu/ld-linux-x86-64.so.2
	0x7fccb1752000-0x7fccb175d000	/usr/lib/x86_64-linux-gnu/ld-linux-x86-64.so.2
	0x7fccb175d000-0x7fccb175e000	
	0x7fccb175e000-0x7fccb1760000	/usr/lib/x86_64-linux-gnu/ld-linux-x86-64.so.2
	0x7fccb1760000-0x7fccb1762000	/usr/lib/x86_64-linux-gnu/ld-linux-x86-64.so.2
	0x7ffd8409b000-0x7ffd840bc000	[stack]
	0x7ffd841d9000-0x7ffd841dd000	[vvar]
	0x7ffd841dd000-0x7ffd841df000	[vdso]
	0xffffffffff600000-0xffffffffff601000	[vsyscall]
==1293==End of process memory map.
==1293==AddressSanitizer CHECK failed: /build/llvm-toolchain-11-mnvtwk/llvm-toolchain-11-11.1.0/compiler-rt/lib/sanitizer_common/sanitizer_common.cpp:54 "((0 && "unable to mmap")) != (0)" (0x0, 0x0)

TODO: create a follow-up issue. Most of the builds run fine with asan enabled.

Comment on lines +30 to +31
MAGISTRATE_ASAN: 0
MAGISTRATE_UBSAN: 0
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TODO: create a follow-up issue. Decide whether asan + ubsan combo is necessary (maybe we can skip ubsan here to avoid issues).

args:
<<: *default-args
token: ${TOKEN}
image: ${REPO}:wf-${ARCH}-ubuntu-${UBUNTU}-${COMPILER}-docs
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TODO: check docs workflow before merging (enable on branch).

@cz4rs cz4rs force-pushed the 349-docker-images-cleanup branch from 3a305ad to 8411e9a Compare January 16, 2025 21:24
@cz4rs cz4rs force-pushed the 349-docker-images-cleanup branch from 8411e9a to bf0a188 Compare January 17, 2025 14:46
@cz4rs cz4rs force-pushed the 349-docker-images-cleanup branch from bf0a188 to d47d4a0 Compare January 17, 2025 15:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[CI] fix Ubuntu 20.04 images using Ubuntu 18.04
1 participant