diff options
| author | Stefan Metzmacher <metze@samba.org> | 2022-11-02 16:56:31 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2023-01-18 14:17:23 +0000 |
| commit | 7105554cb05224373c296f8063498c9366b7f285 (patch) | |
| tree | db17c62403e0fef4e473a11e916ccd55213b1e5f /.gitlab-ci-main.yml | |
| parent | 25aa870fed548805a8cf64037a01ce0c87c6a01f (diff) | |
| download | samba-7105554cb05224373c296f8063498c9366b7f285.tar.gz | |
bootstrap: Update to Ubuntu 22.04 as base default OS
We'll try to move autobuild to ubuntu 22.04 soon.
Note we leave ubuntu 18.04 for the coverage and 32bit builds
for now. As well as 20.04 for samba-fuzz.
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Wed Jan 18 14:17:23 UTC 2023 on atb-devel-224
Diffstat (limited to '.gitlab-ci-main.yml')
| -rw-r--r-- | .gitlab-ci-main.yml | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml index 8bc33ecfc4d..e725bfd0775 100644 --- a/.gitlab-ci-main.yml +++ b/.gitlab-ci-main.yml @@ -47,12 +47,12 @@ variables: # Set this to the contents of bootstrap/sha1sum.txt # which is generated by bootstrap/template.py --render # - SAMBA_CI_CONTAINER_TAG: ae284a5a64fcff65729bf50b5b0cfdba16afc682 + SAMBA_CI_CONTAINER_TAG: 790c229c42a67336099420d137fa9dc9974a133a # - # We use the ubuntu1804 image as default as - # it matches what we have on sn-devel-184. + # We use the ubuntu2204 image as default as + # it matches what we have on atb-devel-224 # - SAMBA_CI_CONTAINER_IMAGE: ubuntu1804 + SAMBA_CI_CONTAINER_IMAGE: ubuntu2204 # # The following images are available # Please see the samba-o3 sections at the end of this file! @@ -61,6 +61,7 @@ variables: SAMBA_CI_CONTAINER_IMAGE_ubuntu1804: ubuntu1804 SAMBA_CI_CONTAINER_IMAGE_ubuntu1804_32bit: ubuntu1804-32bit SAMBA_CI_CONTAINER_IMAGE_ubuntu2004: ubuntu2004 + SAMBA_CI_CONTAINER_IMAGE_ubuntu2204: ubuntu2204 SAMBA_CI_CONTAINER_IMAGE_debian11: debian11 SAMBA_CI_CONTAINER_IMAGE_opensuse154: opensuse154 SAMBA_CI_CONTAINER_IMAGE_fedora37: fedora37 @@ -375,6 +376,7 @@ samba-libs: samba-fuzz: extends: .shared_template variables: + # We match what Google is running over at oss-fuzz SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_ubuntu2004} ctdb: @@ -631,6 +633,11 @@ ubuntu2004-samba-o3: variables: SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_ubuntu2004} +ubuntu2204-samba-o3: + extends: .samba-o3-template + variables: + SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_ubuntu2204} + debian11-samba-o3: extends: .samba-o3-template variables: |