diff options
| author | Andreas Schneider <asn@samba.org> | 2022-03-18 16:24:01 +0100 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2022-03-23 11:33:33 +0000 |
| commit | 4993faea2d6fd06f8806970645a155560cdda93f (patch) | |
| tree | 5a2accffe044d30ccc37371929069d54d2f7609e /.gitlab-ci-main.yml | |
| parent | 0e81b7965e5bcb3d3cc3cdfdd7c4309276d547de (diff) | |
| download | samba-4993faea2d6fd06f8806970645a155560cdda93f.tar.gz | |
gitlab-ci: Drop Fedora 34
It should be enough to run on the latest Fedora version. This should save us
some CI minutes. We have CentOS runners and I would prefer to add CentOS9
Stream.
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 | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml index be01328c138..11b46ceb6f1 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: 24c7cabf5c7c515ffac905cddc533a26d70abd09 + SAMBA_CI_CONTAINER_TAG: 101efe433173bdb306063c6d91d5c991a858a9c9 # # We use the ubuntu1804 image as default as # it matches what we have on sn-devel-184. @@ -60,7 +60,6 @@ variables: SAMBA_CI_CONTAINER_IMAGE_debian11: debian11 SAMBA_CI_CONTAINER_IMAGE_opensuse151: opensuse151 SAMBA_CI_CONTAINER_IMAGE_opensuse152: opensuse152 - SAMBA_CI_CONTAINER_IMAGE_fedora34: fedora34 SAMBA_CI_CONTAINER_IMAGE_fedora35: fedora35 SAMBA_CI_CONTAINER_IMAGE_f35mit120: f35mit120 SAMBA_CI_CONTAINER_IMAGE_centos7: centos7 @@ -628,11 +627,6 @@ centos8s-samba-o3: variables: SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_centos8s} -fedora34-samba-o3: - extends: .samba-o3-template - variables: - SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora34} - fedora35-samba-o3: extends: .samba-o3-template variables: |