gitlab-ci: Install missing krb5-kdc package on Ubuntu/Debian

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fbb1e173c06112ec8d785f7a68e9cc9597110d48..01ef8e0e6b91a0496af7ee5d8f78efff26b48af8 100644 (file)
--- 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: 14f5cb79a0fbeef9378506ecdc6881d8042736c9
+  SAMBA_CI_CONTAINER_TAG: a63fcd17331238531d472206e34aa24c9fc46bb1
   #
   # The following images are available
   # Please see the samba-o3 sections at the end of this file!

diff --git a/bootstrap/config.py b/bootstrap/config.py
index c0f3b37cfbfff16778d581d7fa1de524f97df109..b15a7d4c3cf9ca5ff13bf2bee199dbd7e73c5f0b 100644 (file)
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -113,7 +113,7 @@ PKGS = [
     ('xsltproc', 'libxslt'),
     ('krb5-user', ''),
     ('krb5-config', ''),
-    ('', 'krb5-server'),
+    ('krb5-kdc', 'krb5-server'),
     ('apt-utils', 'yum-utils'),
     ('pkg-config', 'pkgconfig'),
     ('procps', 'procps-ng'),  # required for the free cmd in tests

diff --git a/bootstrap/generated-dists/debian7/bootstrap.sh b/bootstrap/generated-dists/debian7/bootstrap.sh
index a5cb63ace153f0da518dfb6b508ab8519a7e3116..ac3ba7f399bd4b3a446299c334810de7e3de7e26 100755 (executable)
--- a/bootstrap/generated-dists/debian7/bootstrap.sh
+++ b/bootstrap/generated-dists/debian7/bootstrap.sh
@@ -33,6 +33,7 @@ apt-get -y install \
     hostname \
     htop \
     krb5-config \
+    krb5-kdc \
     krb5-user \
     libacl1-dev \
     libaio-dev \

diff --git a/bootstrap/generated-dists/debian7/packages.yml b/bootstrap/generated-dists/debian7/packages.yml
index 03862993de357fde5e67bf68998ec6c87af1399b..0611dd8475c0169da71c95a30ec22750978d327a 100644 (file)
--- a/bootstrap/generated-dists/debian7/packages.yml
+++ b/bootstrap/generated-dists/debian7/packages.yml
@@ -22,6 +22,7 @@ packages:
   - hostname
   - htop
   - krb5-config
+  - krb5-kdc
   - krb5-user
   - libacl1-dev
   - libaio-dev

diff --git a/bootstrap/generated-dists/debian8/bootstrap.sh b/bootstrap/generated-dists/debian8/bootstrap.sh
index 73db186c1d9dc6849a3df95e5271b82e16248409..bddc4548016d9c027705715adc1ec059b12399be 100755 (executable)
--- a/bootstrap/generated-dists/debian8/bootstrap.sh
+++ b/bootstrap/generated-dists/debian8/bootstrap.sh
@@ -33,6 +33,7 @@ apt-get -y install \
     hostname \
     htop \
     krb5-config \
+    krb5-kdc \
     krb5-user \
     libacl1-dev \
     libaio-dev \

diff --git a/bootstrap/generated-dists/debian8/packages.yml b/bootstrap/generated-dists/debian8/packages.yml
index 7aaeb2a2f0956a54d3e0de7a13298a33adc3ec94..e0e5d53d5ea3a079dc88c43606b626ba2db8e631 100644 (file)
--- a/bootstrap/generated-dists/debian8/packages.yml
+++ b/bootstrap/generated-dists/debian8/packages.yml
@@ -22,6 +22,7 @@ packages:
   - hostname
   - htop
   - krb5-config
+  - krb5-kdc
   - krb5-user
   - libacl1-dev
   - libaio-dev

diff --git a/bootstrap/generated-dists/debian9/bootstrap.sh b/bootstrap/generated-dists/debian9/bootstrap.sh
index 7fa82c9f042f6d6635032f3dd6fa3217e413a3a4..5e5a2fd43ed2b5ba20296717449362199e6f0752 100755 (executable)
--- a/bootstrap/generated-dists/debian9/bootstrap.sh
+++ b/bootstrap/generated-dists/debian9/bootstrap.sh
@@ -33,6 +33,7 @@ apt-get -y install \
     hostname \
     htop \
     krb5-config \
+    krb5-kdc \
     krb5-user \
     libacl1-dev \
     libaio-dev \

diff --git a/bootstrap/generated-dists/debian9/packages.yml b/bootstrap/generated-dists/debian9/packages.yml
index 85736819f58e030d65b080b35aee119ae056bd4c..9fdb1d1c2e68dd52d723fc063c48ea22960c35d5 100644 (file)
--- a/bootstrap/generated-dists/debian9/packages.yml
+++ b/bootstrap/generated-dists/debian9/packages.yml
@@ -22,6 +22,7 @@ packages:
   - hostname
   - htop
   - krb5-config
+  - krb5-kdc
   - krb5-user
   - libacl1-dev
   - libaio-dev

diff --git a/bootstrap/generated-dists/ubuntu1404/bootstrap.sh b/bootstrap/generated-dists/ubuntu1404/bootstrap.sh
index 478d7c9a0d6f1e6f4879dfa73c3f023b290cac7e..c4e2da482206733fc607f2e1f483c9c99d219554 100755 (executable)
--- a/bootstrap/generated-dists/ubuntu1404/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu1404/bootstrap.sh
@@ -32,6 +32,7 @@ apt-get -y install \
     hostname \
     htop \
     krb5-config \
+    krb5-kdc \
     krb5-user \
     language-pack-en \
     libacl1-dev \

diff --git a/bootstrap/generated-dists/ubuntu1404/packages.yml b/bootstrap/generated-dists/ubuntu1404/packages.yml
index b796d0d2d373b2cffa288b6bf9b2148788e79f85..854dfd863fb2bd3cb39f445d27b8610252082570 100644 (file)
--- a/bootstrap/generated-dists/ubuntu1404/packages.yml
+++ b/bootstrap/generated-dists/ubuntu1404/packages.yml
@@ -21,6 +21,7 @@ packages:
   - hostname
   - htop
   - krb5-config
+  - krb5-kdc
   - krb5-user
   - language-pack-en
   - libacl1-dev

diff --git a/bootstrap/generated-dists/ubuntu1604/bootstrap.sh b/bootstrap/generated-dists/ubuntu1604/bootstrap.sh
index 43c66be224b451aca1622993e002eeaa7a65f43e..356c59c808e5f2cf69d297d8be4da5c87da363b3 100755 (executable)
--- a/bootstrap/generated-dists/ubuntu1604/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu1604/bootstrap.sh
@@ -32,6 +32,7 @@ apt-get -y install \
     hostname \
     htop \
     krb5-config \
+    krb5-kdc \
     krb5-user \
     language-pack-en \
     libacl1-dev \

diff --git a/bootstrap/generated-dists/ubuntu1604/packages.yml b/bootstrap/generated-dists/ubuntu1604/packages.yml
index b9c4cb0308c10f541a0215460cf37ba26c699edd..b06d7efe985ae386301936db7393381a0e0e5697 100644 (file)
--- a/bootstrap/generated-dists/ubuntu1604/packages.yml
+++ b/bootstrap/generated-dists/ubuntu1604/packages.yml
@@ -21,6 +21,7 @@ packages:
   - hostname
   - htop
   - krb5-config
+  - krb5-kdc
   - krb5-user
   - language-pack-en
   - libacl1-dev

diff --git a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh b/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
index 0defc9325b6976ae0c8433a501165515fce52b7e..7a5dc23e62e0b49697bc7f31fea612fe2bc140aa 100755 (executable)
--- a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
@@ -33,6 +33,7 @@ apt-get -y install \
     hostname \
     htop \
     krb5-config \
+    krb5-kdc \
     krb5-user \
     language-pack-en \
     libacl1-dev \

diff --git a/bootstrap/generated-dists/ubuntu1804/packages.yml b/bootstrap/generated-dists/ubuntu1804/packages.yml
index 6b3c00910c86c30dea73528cf2acb298c2fdf4bb..bbf8eb5964095cd4cb25d432de02f90dc8340d8f 100644 (file)
--- a/bootstrap/generated-dists/ubuntu1804/packages.yml
+++ b/bootstrap/generated-dists/ubuntu1804/packages.yml
@@ -22,6 +22,7 @@ packages:
   - hostname
   - htop
   - krb5-config
+  - krb5-kdc
   - krb5-user
   - language-pack-en
   - libacl1-dev

diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index aa874cf24eb658c0ed1b35ba92e6b84d4fd20fa5..a522f0566a60c5072c8eff292bcf647468f04502 100644 (file)
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-14f5cb79a0fbeef9378506ecdc6881d8042736c9
+a63fcd17331238531d472206e34aa24c9fc46bb1