diff options
| author | Andreas Schneider <asn@samba.org> | 2022-03-18 16:29:43 +0100 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2022-03-23 11:33:33 +0000 |
| commit | 0b10962d63ef6af042541703ff6edfcfee5a3970 (patch) | |
| tree | 2b113c10b610bc851c312e7541d445696365b7ce /.gitlab-ci-main.yml | |
| parent | 4993faea2d6fd06f8806970645a155560cdda93f (diff) | |
| download | samba-0b10962d63ef6af042541703ff6edfcfee5a3970.tar.gz | |
gitlab-ci: Update to openSUSE 15.3
This drops openSUSE 15.1 and 15.2 to save some CI resources.
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to '.gitlab-ci-main.yml')
| -rw-r--r-- | .gitlab-ci-main.yml | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml index 11b46ceb6f1..ec356f0fd55 100644 --- a/.gitlab-ci-main.yml +++ b/.gitlab-ci-main.yml @@ -42,7 +42,7 @@ variables: # Set this to the contents of bootstrap/sha1sum.txt # which is generated by bootstrap/template.py --render # - SAMBA_CI_CONTAINER_TAG: 101efe433173bdb306063c6d91d5c991a858a9c9 + SAMBA_CI_CONTAINER_TAG: d849801e805f8772b78251d07a28eb332c24660 # # We use the ubuntu1804 image as default as # it matches what we have on sn-devel-184. @@ -58,8 +58,7 @@ variables: SAMBA_CI_CONTAINER_IMAGE_debian9: debian9 SAMBA_CI_CONTAINER_IMAGE_debian10: debian10 SAMBA_CI_CONTAINER_IMAGE_debian11: debian11 - SAMBA_CI_CONTAINER_IMAGE_opensuse151: opensuse151 - SAMBA_CI_CONTAINER_IMAGE_opensuse152: opensuse152 + SAMBA_CI_CONTAINER_IMAGE_opensuse153: opensuse153 SAMBA_CI_CONTAINER_IMAGE_fedora35: fedora35 SAMBA_CI_CONTAINER_IMAGE_f35mit120: f35mit120 SAMBA_CI_CONTAINER_IMAGE_centos7: centos7 @@ -603,15 +602,10 @@ debian11-samba-o3: variables: SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_debian11} -opensuse151-samba-o3: +opensuse153-samba-o3: extends: .samba-o3-template variables: - SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_opensuse151} - -opensuse152-samba-o3: - extends: .samba-o3-template - variables: - SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_opensuse152} + SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_opensuse153} centos7-samba-o3: extends: .samba-o3-template |