diff options
| author | Andreas Schneider <asn@samba.org> | 2020-05-19 07:21:25 +0200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2020-05-24 23:55:36 +0000 |
| commit | 10b195fe12458e31faa8d3140a681edde932e6fe (patch) | |
| tree | 8ae0c51ae4bdb475227a8c749e8aabce99d5b2a2 /.gitlab-ci.yml | |
| parent | 1e55591bc54949848eeb01a8be4378a18bc9e6c3 (diff) | |
| download | samba-10b195fe12458e31faa8d3140a681edde932e6fe.tar.gz | |
gitlab-ci: Create a single samba-fips runner
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 489ac476784..7177d3b5c44 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -181,11 +181,7 @@ samba-admem-mit: samba-ad-dc-4-mitkrb5: extends: .shared_template -samba-ad-dc-fips: - extends: .shared_template - image: $SAMBA_CI_CONTAINER_IMAGE_fedora31 - -samba-admem-fips: +samba-fips: extends: .shared_template image: $SAMBA_CI_CONTAINER_IMAGE_fedora31 @@ -253,7 +249,7 @@ pages: - samba-nt4 - samba-schemaupgrade - samba-ad-dc-1-mitkrb5 - - samba-ad-dc-fips + - samba-fips script: - ./configure.developer - make -j |