diff options
| author | Stefan Metzmacher <metze@samba.org> | 2019-04-12 21:34:24 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2019-04-18 13:10:49 +0000 |
| commit | 84f6fdcef3b11ab4a4087c52f2f4c5a749a43b92 (patch) | |
| tree | 8ec3177cda8d71433db55de751aea4bcdc9255d3 | |
| parent | ad2c23eeb38603631d1d9789d1a53a93e7caec03 (diff) | |
| download | samba-84f6fdcef3b11ab4a4087c52f2f4c5a749a43b92.tar.gz | |
.gitlab-ci.yml: run the samba-o3 job on each working container image
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): Thu Apr 18 13:10:49 UTC 2019 on sn-devel-144
| -rw-r--r-- | .gitlab-ci.yml | 51 |
1 files changed, 44 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b32181529da..b940b433e30 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,10 +21,15 @@ variables: # SAMBA_CI_CONTAINER_TAG: 8606e89b0ce6a916fa881549a6cebf6eed528157 # - # Be use the ubuntu1404 image as it matches what we - # have on sn-devel-144. + # The following images are available + # Please see the samba-o3 sections at the end of this file! + # We should run that for each available image # - SAMBA_CI_CONTAINER_IMAGE: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-ubuntu1404:${SAMBA_CI_CONTAINER_TAG} + SAMBA_CI_CONTAINER_IMAGE_ubuntu1804: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-ubuntu1804:${SAMBA_CI_CONTAINER_TAG} + SAMBA_CI_CONTAINER_IMAGE_ubuntu1604: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-ubuntu1604:${SAMBA_CI_CONTAINER_TAG} + SAMBA_CI_CONTAINER_IMAGE_ubuntu1404: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-ubuntu1404:${SAMBA_CI_CONTAINER_TAG} + 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} include: # The image creation details are specified in a separate file @@ -34,7 +39,9 @@ include: .shared_template: variables: AUTOBUILD_JOB_NAME: $CI_JOB_NAME - image: $SAMBA_CI_CONTAINER_IMAGE + # We use the ubuntu1404 image as default as + # it matches what we have on sn-devel-144. + image: $SAMBA_CI_CONTAINER_IMAGE_ubuntu1404 stage: build tags: - docker @@ -107,9 +114,6 @@ samba-systemkrb5: samba-xc: extends: .shared_template -samba-o3: - extends: .shared_template - samba-ad-member: extends: .shared_template @@ -171,3 +175,36 @@ samba-nt4: samba-schemaupgrade: extends: .private_template + +# +# We build samba-o3 on all supported distributions +# + +.samba-o3-template: + extends: .shared_template + variables: + AUTOBUILD_JOB_NAME: samba-o3 + +ubuntu1804-samba-o3: + extends: .samba-o3-template + image: $SAMBA_CI_CONTAINER_IMAGE_ubuntu1804 + +ubuntu1604-samba-o3: + extends: .samba-o3-template + image: $SAMBA_CI_CONTAINER_IMAGE_ubuntu1604 + +ubuntu1404-samba-o3: + extends: .samba-o3-template + image: $SAMBA_CI_CONTAINER_IMAGE_ubuntu1404 + +debian9-samba-o3: + extends: .samba-o3-template + image: $SAMBA_CI_CONTAINER_IMAGE_debian9 + +opensuse150-samba-o3: + extends: .samba-o3-template + image: $SAMBA_CI_CONTAINER_IMAGE_opensuse150 + +# +# Keep the samba-o3 sections at the end ... +# |