agora inbox for pgsql-hackers@postgresql.orghelp / color / mirror / Atom feed
[PATCH v1 2/4] autovac: resolve relopts before vacuuming 249+ messages / 2 participants [nested] [flat]
* [PATCH v1 2/4] autovac: resolve relopts before vacuuming @ 2025-06-23 19:42 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 249+ messages in thread From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw) --- src/backend/commands/vacuum.c | 7 ++-- src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++-------- 2 files changed, 44 insertions(+), 15 deletions(-) diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c index 33a33bf6b1c..0015b9ef4b0 100644 --- a/src/backend/commands/vacuum.c +++ b/src/backend/commands/vacuum.c @@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel) /* * Later, in vacuum_rel(), we check if a reloption override was specified. */ - params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate; + params.max_eager_freeze_failure_rate = -1.0; /* * Create special memory context for cross-transaction storage. @@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params, * Check if the vacuum_max_eager_freeze_failure_rate table storage * parameter was specified. This overrides the GUC value. */ - if (rel->rd_options != NULL && + if (params->max_eager_freeze_failure_rate < 0 && + rel->rd_options != NULL && ((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0) params->max_eager_freeze_failure_rate = ((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate; + else + params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate; /* * Set truncate option based on truncate reloption or GUC if it wasn't diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c index f86c9fed853..3bedca971ff 100644 --- a/src/backend/postmaster/autovacuum.c +++ b/src/backend/postmaster/autovacuum.c @@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map, int multixact_freeze_table_age; int log_min_duration; AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL); + VacOptValue index_cleanup; + VacOptValue truncate; + double max_eager_freeze_failure_rate; /* * Calculate the vacuum cost parameters and the freeze ages. If there @@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map, ? avopts->multixact_freeze_table_age : default_multixact_freeze_table_age; + if (relopts) + { + switch (relopts->vacuum_index_cleanup) + { + case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO: + index_cleanup = VACOPTVALUE_AUTO; + break; + case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON: + index_cleanup = VACOPTVALUE_ENABLED; + break; + case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF: + index_cleanup = VACOPTVALUE_DISABLED; + break; + } + } + else + index_cleanup = VACOPTVALUE_UNSPECIFIED; + + if (relopts && relopts->vacuum_truncate_set) + { + if (relopts->vacuum_truncate) + truncate = VACOPTVALUE_ENABLED; + else + truncate = VACOPTVALUE_DISABLED; + } + else + truncate = VACOPTVALUE_UNSPECIFIED; + + if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0) + max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate; + else + max_eager_freeze_failure_rate = -1.0; + tab = palloc(sizeof(autovac_table)); tab->at_relid = relid; tab->at_sharedrel = classForm->relisshared; @@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map, (doanalyze ? VACOPT_ANALYZE : 0) | (!wraparound ? VACOPT_SKIP_LOCKED : 0); - /* - * index_cleanup and truncate are unspecified at first in autovacuum. - * They will be filled in with usable values using their reloptions - * (or reloption defaults) later. - */ - tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED; - tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED; + tab->at_params.index_cleanup = index_cleanup; + tab->at_params.truncate = truncate; /* As of now, we don't support parallel vacuum for autovacuum */ tab->at_params.nworkers = -1; tab->at_params.freeze_min_age = freeze_min_age; @@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map, tab->at_params.is_wraparound = wraparound; tab->at_params.log_min_duration = log_min_duration; tab->at_params.toast_parent = InvalidOid; - - /* - * Later, in vacuum_rel(), we check reloptions for any - * vacuum_max_eager_freeze_failure_rate override. - */ - tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate; + tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate; tab->at_storage_param_vac_cost_limit = avopts ? avopts->vacuum_cost_limit : 0; tab->at_storage_param_vac_cost_delay = avopts ? -- 2.39.5 (Apple Git-154) --QWBYbd5Ar5k8NvSv Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v1-0003-autovac-combine-reloptions-correctly.patch ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 9/9] ci: Move to per-job naming for containers @ 2026-06-12 16:57 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 16:57 UTC (permalink / raw) Previously we only had two types of containers, "ci" for everything but the CompilerWarnings job and ci_docs that had the tools necessary to build the docs as part of CompilerWarnings. But that was unnecessarily heavy for several of the jobs. As the pull time is a noticeable performance factor, that's not great. Instead use containers that are named by their job. Today some of those are the same, but after this change we can optimize the containers for their jobs without a problem. It probably would make sense to allow over-riding CONTAINER_REPO on a per-repo/org basis, but that seems better done as a separate change. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index c737173abe0..4034f76e0a1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -108,9 +108,12 @@ env: # Debian Trixie containers used by all Linux jobs. Built by # 'https://github.com/anarazel/pg-vm-images/';. + # + # The containers are named + # ghcr.io/anarazel/pg-vm-images/<branch>/linux_debian_ci/<debian version>/<ci-job>:latest CONTAINER_REPO: ghcr.io/anarazel/pg-vm-images/main - CONTAINER_LINUX_CI: linux_debian_trixie_ci:latest - CONTAINER_LINUX_CI_DOCS: linux_debian_trixie_ci_docs:latest + CONTAINER_LINUX_CI_NAME: linux_debian_ci/trixie + CONTAINER_TAG: latest # The full set of OS / job selectors recognized by the `ci-os-only:` # commit-message directive parsed in the `setup` job below. @@ -193,7 +196,7 @@ jobs: # # To allow over-riding what runners jobs use, we allow setting # repository / org level variables influencing that choice on a - # per-host-operating-system basis. + # per-host-operating-system basis. See also src/tools/ci/README # # This also makes it easier to change the version of linux / windows # used centrally. We don't just want to use ubuntu-latest, as it's not @@ -210,8 +213,8 @@ jobs: # Re-export workflow-level env vars that other jobs need to reference # from contexts (e.g. `jobs.<id>.container.image`) where the `env` # context is not available. - container_linux_ci: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI }} - container_linux_ci_docs: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_DOCS }} + container_linux_ci_base: ${{ env.CONTAINER_REPO }}/${{ env.CONTAINER_LINUX_CI_NAME }} + container_tag: ${{ env.CONTAINER_TAG }} # Can't use the output from above, so repeated verbatim here runs-on: ${{ case(vars.pg_ci_runs_on_setup != '', vars.pg_ci_runs_on_setup, 'ubuntu-slim') }} @@ -277,8 +280,8 @@ jobs: needs.setup.outputs.sanitycheck == 'true' runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 15 - container: &linux_ci_container - image: ${{ needs.setup.outputs.container_linux_ci }} + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/sanity-check:${{ needs.setup.outputs.container_tag }} # Options passed to all linux containers. Not all of the jobs need # all of them, but it's easier to just define them centrally. @@ -464,7 +467,9 @@ jobs: needs.setup.outputs.linux == 'true' && needs.sanity-check.result != 'failure' runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-autoconf:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: &linux_env @@ -558,7 +563,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-32:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -650,7 +657,9 @@ jobs: needs: [setup, sanity-check] if: *linux_job_if runs-on: ${{ needs.setup.outputs.runs_on_linux }} - container: *linux_ci_container + container: + image: ${{ needs.setup.outputs.container_linux_ci_base }}/linux-meson-64:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options timeout-minutes: 60 env: *linux_env @@ -1194,7 +1203,8 @@ jobs: runs-on: ${{ needs.setup.outputs.runs_on_linux }} timeout-minutes: 60 container: - image: ${{ needs.setup.outputs.container_linux_ci_docs }} + image: ${{ needs.setup.outputs.container_linux_ci_base }}/compiler-warnings:${{ needs.setup.outputs.container_tag }} + options: *linux_container_options env: # Use larger ccache cache as this job compiles with multiple # compilers / flag combinations. -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha-- ^ permalink raw reply [nested|flat] 249+ messages in thread
end of thread, other threads:[~2026-06-12 16:57 UTC | newest] Thread overview: 249+ messages (download: mbox mbox.gz follow: Atom feed) -- links below jump to the message on this page -- 2025-06-23 19:42 [PATCH v1 2/4] autovac: resolve relopts before vacuuming Nathan Bossart <nathan@postgresql.org> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de> 2026-06-12 16:57 [PATCH v13a 9/9] ci: Move to per-job naming for containers Andres Freund <andres@anarazel.de>
This inbox is served by agora; see mirroring instructions for how to clone and mirror all data and code used for this inbox