agora inbox for pgsql-hackers@postgresql.org
help / color / mirror / Atom feed[PATCH v33 01/11] Add a syntax to create Incrementally Maintainable Materialized Views
249+ messages / 2 participants
[nested] [flat]
* [PATCH v33 01/11] Add a syntax to create Incrementally Maintainable Materialized Views
@ 2019-12-20 01:05 Yugo Nagata <nagata@sraoss.co.jp>
0 siblings, 0 replies; 249+ messages in thread
From: Yugo Nagata @ 2019-12-20 01:05 UTC (permalink / raw)
Allow to create Incrementally Maintainable Materialized View (IMMV)
by using INCREMENTAL option in CREATE MATERIALIZED VIEW command
as follow:
CREATE [INCREMANTAL] MATERIALIZED VIEW xxxxx AS SELECT ....;
---
src/backend/parser/gram.y | 32 +++++++++++++++++++++-----------
src/include/nodes/primnodes.h | 1 +
src/include/parser/kwlist.h | 1 +
3 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
index a043fd4c66..943460fd2c 100644
--- a/src/backend/parser/gram.y
+++ b/src/backend/parser/gram.y
@@ -468,6 +468,7 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query);
%type <range> OptTempTableName
%type <into> into_clause create_as_target create_mv_target
+%type <boolean> incremental
%type <defelt> createfunc_opt_item common_func_opt_item dostmt_opt_item
%type <fun_param> func_arg func_arg_with_default table_func_column aggr_arg
@@ -738,7 +739,7 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query);
HANDLER HAVING HEADER_P HOLD HOUR_P
IDENTITY_P IF_P ILIKE IMMEDIATE IMMUTABLE IMPLICIT_P IMPORT_P IN_P INCLUDE
- INCLUDING INCREMENT INDENT INDEX INDEXES INHERIT INHERITS INITIALLY INLINE_P
+ INCLUDING INCREMENT INCREMENTAL INDENT INDEX INDEXES INHERIT INHERITS INITIALLY INLINE_P
INNER_P INOUT INPUT_P INSENSITIVE INSERT INSTEAD INT_P INTEGER
INTERSECT INTERVAL INTO INVOKER IS ISNULL ISOLATION
@@ -4803,32 +4804,34 @@ opt_with_data:
*****************************************************************************/
CreateMatViewStmt:
- CREATE OptNoLog MATERIALIZED VIEW create_mv_target AS SelectStmt opt_with_data
+ CREATE OptNoLog incremental MATERIALIZED VIEW create_mv_target AS SelectStmt opt_with_data
{
CreateTableAsStmt *ctas = makeNode(CreateTableAsStmt);
- ctas->query = $7;
- ctas->into = $5;
+ ctas->query = $8;
+ ctas->into = $6;
ctas->objtype = OBJECT_MATVIEW;
ctas->is_select_into = false;
ctas->if_not_exists = false;
/* cram additional flags into the IntoClause */
- $5->rel->relpersistence = $2;
- $5->skipData = !($8);
+ $6->rel->relpersistence = $2;
+ $6->skipData = !($9);
+ $6->ivm = $3;
$$ = (Node *) ctas;
}
- | CREATE OptNoLog MATERIALIZED VIEW IF_P NOT EXISTS create_mv_target AS SelectStmt opt_with_data
+ | CREATE OptNoLog incremental MATERIALIZED VIEW IF_P NOT EXISTS create_mv_target AS SelectStmt opt_with_data
{
CreateTableAsStmt *ctas = makeNode(CreateTableAsStmt);
- ctas->query = $10;
- ctas->into = $8;
+ ctas->query = $11;
+ ctas->into = $9;
ctas->objtype = OBJECT_MATVIEW;
ctas->is_select_into = false;
ctas->if_not_exists = true;
/* cram additional flags into the IntoClause */
- $8->rel->relpersistence = $2;
- $8->skipData = !($11);
+ $9->rel->relpersistence = $2;
+ $9->skipData = !($12);
+ $9->ivm = $3;
$$ = (Node *) ctas;
}
;
@@ -4845,9 +4848,14 @@ create_mv_target:
$$->tableSpaceName = $5;
$$->viewQuery = NULL; /* filled at analysis time */
$$->skipData = false; /* might get changed later */
+ $$->ivm = false;
}
;
+incremental: INCREMENTAL { $$ = true; }
+ | /*EMPTY*/ { $$ = false; }
+ ;
+
OptNoLog: UNLOGGED { $$ = RELPERSISTENCE_UNLOGGED; }
| /*EMPTY*/ { $$ = RELPERSISTENCE_PERMANENT; }
;
@@ -17686,6 +17694,7 @@ unreserved_keyword:
| INCLUDE
| INCLUDING
| INCREMENT
+ | INCREMENTAL
| INDENT
| INDEX
| INDEXES
@@ -18274,6 +18283,7 @@ bare_label_keyword:
| INCLUDE
| INCLUDING
| INCREMENT
+ | INCREMENTAL
| INDENT
| INDEX
| INDEXES
diff --git a/src/include/nodes/primnodes.h b/src/include/nodes/primnodes.h
index ea47652adb..6f01300a30 100644
--- a/src/include/nodes/primnodes.h
+++ b/src/include/nodes/primnodes.h
@@ -168,6 +168,7 @@ typedef struct IntoClause
/* materialized view's SELECT query */
Node *viewQuery pg_node_attr(query_jumble_ignore);
bool skipData; /* true for WITH NO DATA */
+ bool ivm; /* true for WITH IVM */
} IntoClause;
diff --git a/src/include/parser/kwlist.h b/src/include/parser/kwlist.h
index f7fe834cf4..1625fea602 100644
--- a/src/include/parser/kwlist.h
+++ b/src/include/parser/kwlist.h
@@ -210,6 +210,7 @@ PG_KEYWORD("in", IN_P, RESERVED_KEYWORD, BARE_LABEL)
PG_KEYWORD("include", INCLUDE, UNRESERVED_KEYWORD, BARE_LABEL)
PG_KEYWORD("including", INCLUDING, UNRESERVED_KEYWORD, BARE_LABEL)
PG_KEYWORD("increment", INCREMENT, UNRESERVED_KEYWORD, BARE_LABEL)
+PG_KEYWORD("incremental", INCREMENTAL, UNRESERVED_KEYWORD, BARE_LABEL)
PG_KEYWORD("indent", INDENT, UNRESERVED_KEYWORD, BARE_LABEL)
PG_KEYWORD("index", INDEX, UNRESERVED_KEYWORD, BARE_LABEL)
PG_KEYWORD("indexes", INDEXES, UNRESERVED_KEYWORD, BARE_LABEL)
--
2.25.1
--Multipart=_Tue__2_Jul_2024_17_03_11_+0900_6OrVBZxOB4o_k6A1--
^ 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 --
2019-12-20 01:05 [PATCH v33 01/11] Add a syntax to create Incrementally Maintainable Materialized Views Yugo Nagata <nagata@sraoss.co.jp>
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