ci: Stop and remove CI container #26850

pull maflcko wants to merge 2 commits into bitcoin:master from maflcko:2301-ci-container-stop-💺 changing 21 files +42 −36

maflcko commented at 9:13 AM on January 9, 2023: member

This should not affect CI runs that have DANGER_RUN_CI_ON_HOST=1 set, for example .cirrus.yml.

However, when running CI locally with podman or docker, the container is stopped and thus deleted when all tests have passed. This feature was requested in #26843 (comment) and can help to reduce used disk space when running several CI tasks subsequently.
DrahtBot commented at 9:13 AM on January 9, 2023: contributor


The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.



Reviews

See the guideline for information on the review process.

Type Reviewers

ACK fanquake, hebasto

If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.



Conflicts

Reviewers, this pull request conflicts with the following ones:
- #26766 (ci: Use clang-15 and IWYU v0.19 in "tidy" task by hebasto)
If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.
DrahtBot renamed this:
~~ci: Stop and remove CI container~~
ci: Stop and remove CI container
on Jan 9, 2023
DrahtBot added the label Tests on Jan 9, 2023
maflcko force-pushed on Jan 9, 2023
fanquake commented at 9:57 AM on January 9, 2023: member

Concept ACK
maflcko force-pushed on Jan 9, 2023
hebasto commented at 10:23 PM on January 9, 2023: member

Concept ACK.
maflcko force-pushed on Jan 11, 2023

Type	Reviewers
ACK	fanquake, hebasto

scripted-diff: ci: Rework docker naming

DOCKER in names is confusingly used as synonym for "image", "container",
and "ci". Fix the confusion by picking the term that fits the context.

-BEGIN VERIFY SCRIPT-
 ren() { sed -i "s:$1:$2:g" $( git grep -l "$1" ) ; }

 ren DOCKER_PACKAGES CI_BASE_PACKAGES
 # This better reflects that they are the common base for all CI
 # containers.

 ren DOCKER_ID CI_CONTAINER_ID
 # This is according to the documentation of "--detach , -d: Run
 # container in background and print container ID".

 ren DOCKER_NAME_TAG CI_IMAGE_NAME_TAG
 # This avoids confusing with CONTAINER_NAME and clarifies that it is an
 # image.

 ren DOCKER_ADMIN CI_CONTAINER_CAP
 # This clarifies that it is a capability added to the container.

 ren DOCKER_CI_CMD_PREFIX CI_EXEC_CMD_PREFIX
 # This brings it in line with the CI_EXEC naming.

-END VERIFY SCRIPT-

fa5dccba32

ci: Stop and remove CI container fa0584eb82
maflcko force-pushed on Jan 11, 2023
fanquake approved
fanquake commented at 3:13 PM on January 12, 2023: member

ACK fa0584eb829f2cb52675e17b5b09b4c648378d38
hebasto approved
hebasto commented at 4:32 PM on January 12, 2023: member

ACK fa0584eb829f2cb52675e17b5b09b4c648378d38, tested on Ubuntu 22.04.

My only concerns are about CI_ "namespace" for variables, which has being actively used by CI providers. No conflicts with Cirrus CI although.
maflcko commented at 4:44 PM on January 12, 2023: member

Happy to pick another name, if there are suggestions.
hebasto commented at 4:49 PM on January 12, 2023: member

Happy to pick another name, if there are suggestions.

Maybe BITCOIN_...?
maflcko commented at 7:43 PM on January 12, 2023: member

Will leave as-is for now. Can be changed in a follow-up, because merge conflicts in this area are rare.
maflcko merged this on Jan 12, 2023
maflcko closed this on Jan 12, 2023
maflcko deleted the branch on Jan 12, 2023
sidhujag referenced this in commit 4393d92b72 on Jan 12, 2023
bitcoin locked this on Jan 12, 2024

Contributors

Labels

Linked (view graph)

#26843 ci: Fix ci_native_fuzz_msan CONTAINER_NAME

ci: Stop and remove CI container #26850

Reviews

Conflicts