diff options
| author | Andreas Schneider <asn@samba.org> | 2019-04-30 08:34:00 +0200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2019-05-07 01:45:37 +0000 |
| commit | 1d8c4c64b123d287c13a8be4101fa5575fd73e85 (patch) | |
| tree | b76717c19a5269d211e434980a16b10102c6039d /.gitlab-ci.yml | |
| parent | 86d4836919e29c0bdf927658df641811247534c6 (diff) | |
| download | samba-1d8c4c64b123d287c13a8be4101fa5575fd73e85.tar.gz | |
gitlab-ci: Enable building on CentOS7
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Tue May 7 01:45:37 UTC 2019 on sn-devel-184
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8b9d0cb69be..3d01f8fc376 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,7 +19,7 @@ variables: # Set this to the contents of bootstrap/sha1sum.txt # which is generated by bootstrap/template.py --render # - SAMBA_CI_CONTAINER_TAG: 2be76362af215af6842e884abd5246dd9b50c283 + SAMBA_CI_CONTAINER_TAG: 93278680b4e7086c0bec11a58bc3533f9971c08e # We use the ubuntu1804 image as default as # it matches what we have on sn-devel-184. SAMBA_CI_CONTAINER_IMAGE: ubuntu1804 @@ -33,6 +33,7 @@ variables: SAMBA_CI_CONTAINER_IMAGE_debian9: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-debian9:${SAMBA_CI_CONTAINER_TAG} SAMBA_CI_CONTAINER_IMAGE_opensuse150: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-opensuse150:${SAMBA_CI_CONTAINER_TAG} SAMBA_CI_CONTAINER_IMAGE_fedora29: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-fedora29:${SAMBA_CI_CONTAINER_TAG} + SAMBA_CI_CONTAINER_IMAGE_centos7: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-centos7:${SAMBA_CI_CONTAINER_TAG} include: # The image creation details are specified in a separate file @@ -200,6 +201,13 @@ opensuse150-samba-o3: extends: .samba-o3-template image: $SAMBA_CI_CONTAINER_IMAGE_opensuse150 +centos7-samba-o3: + extends: .samba-o3-template + image: $SAMBA_CI_CONTAINER_IMAGE_centos7 + variables: + # Git on CentOS doesn't support shallow git cloning + GIT_DEPTH: "" + fedora29-samba-o3: extends: .samba-o3-template image: $SAMBA_CI_CONTAINER_IMAGE_fedora29 |