Add i386 as tested architecture

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7b52cd1359a0c7a04e27a58795d9e3f49b9f7489..51f92fc5fdcb864100ca4fdcd39894cd0b60ea4c 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,7 +13,6 @@ stages:
   services:
     - docker:dind
   tags:
-    - shared
     - docker
   before_script:
     - docker info
@@ -26,36 +25,82 @@ stages:
     - master
     - triggers
     - tags
+    - gitlab-ci
 
-debian:latest:
+debian-amd64:oldstable:
   <<: *image
 
-debian:unstable:
+debian-i386:oldstable:
   <<: *image
 
-ubuntu:latest:
+debian-amd64:stable:
   <<: *image
 
-#centos:latest:
+debian-i386:stable:
+  <<: *image
+
+debian-amd64:unstable:
+  <<: *image
+
+debian-i386:unstable:
+  <<: *image
+
+ubuntu-amd64:latest:
+  <<: *image
+
+ubuntu-i386:latest:
+  <<: *image
+
+#centos-amd64:latest:
 #  <<: *image
 
-#fedora:latest:
+#fedora-amd64:latest:
 #  <<: *image
 
-.debian_latest: &debian_latest
-  image: "$CI_REGISTRY_IMAGE/debian:latest"
+.debian-amd64:oldstable: &debian_oldstable_amd64_image
+  image: "$CI_REGISTRY_IMAGE/debian-amd64:oldstable"
+  tags:
+    - linux
+    - docker
+
+.debian-i386:oldstable: &debian_oldstable_i386_image
+  image: "$CI_REGISTRY_IMAGE/debian-i386:oldstable"
   tags:
     - linux
     - docker
 
-.debian_unstable: &debian_unstable
-  image: "$CI_REGISTRY_IMAGE/debian:unstable"
+.debian-amd64:stable: &debian_stable_amd64_image
+  image: "$CI_REGISTRY_IMAGE/debian-amd64:stable"
   tags:
     - linux
     - docker
 
-.ubuntu_latest: &ubuntu_latest
-  image: "$CI_REGISTRY_IMAGE/ubuntu:latest"
+.debian-i386:stable: &debian_stable_i386_image
+  image: "$CI_REGISTRY_IMAGE/debian-i386:stable"
+  tags:
+    - linux
+    - docker
+
+.debian-amd64:unstable: &debian_unstable_amd64_image
+  image: "$CI_REGISTRY_IMAGE/debian-amd64:unstable"
+  tags:
+    - linux
+    - docker
+
+.debian-i386:unstable: &debian_unstable_i386_image
+  image: "$CI_REGISTRY_IMAGE/debian-i386:unstable"
+  tags:
+    - linux
+    - docker
+
+.ubuntu-amd64:latest: &ubuntu_latest_amd64_image
+  image: "$CI_REGISTRY_IMAGE/ubuntu-amd64:latest"
+  tags:
+    - linux
+    - docker
+
+.ubuntu-amd64:latest: &ubuntu_latest_i386_image
+  image: "$CI_REGISTRY_IMAGE/ubuntu-i386:latest"
   tags:
     - linux
     - docker
@@ -78,26 +123,72 @@ ubuntu:latest:
   script:
     - make -k check V=1
 
-build:debian:latest:
-  <<: *debian_latest
+build:debian:oldstable:amd64:
+  <<: *debian_oldstable_amd64_image
+  <<: *build_job
+
+test:debian:oldstable:amd64:
+  <<: *debian_oldstable_amd64_image
+  <<: *test_job
+
+build:debian:oldstable:i386:
+  <<: *debian_oldstable_i386_image
+  <<: *build_job
+
+test:debian:oldstable:i386:
+  <<: *debian_oldstable_i386_image
+  <<: *test_job
+
+####
+
+build:debian:stable:amd64:
+  <<: *debian_stable_amd64_image
+  <<: *build_job
+
+test:debian:stable:amd64:
+  <<: *debian_stable_amd64_image
+  <<: *test_job
+
+build:debian:stable:i386:
+  <<: *debian_stable_i386_image
   <<: *build_job
 
-test:debian:latest:
-  <<: *debian_latest
+test:debian:stable:i386:
+  <<: *debian_stable_i386_image
   <<: *test_job
 
-build:debian:unstable:
-  <<: *debian_unstable
+####
+
+build:debian:unstable:amd64:
+  <<: *debian_unstable_amd64_image
+  <<: *build_job
+
+test:debian:unstable:amd64:
+  <<: *debian_unstable_amd64_image
+  <<: *test_job
+
+build:debian:unstable:i386:
+  <<: *debian_unstable_i386_image
+  <<: *build_job
+
+test:debian:unstable:i386:
+  <<: *debian_unstable_i386_image
+  <<: *test_job
+
+####
+
+build:ubuntu:latest:amd64:
+  <<: *ubuntu_latest_amd64_image
   <<: *build_job
 
-test:debian:unstable:
-  <<: *debian_unstable
+test:ubuntu:latest:amd64:
+  <<: *ubuntu_latest_amd64_image
   <<: *test_job
 
-build:ubuntu:latest:
-  <<: *ubuntu_latest
+build:ubuntu:latest:i386:
+  <<: *ubuntu_latest_i386_image
   <<: *build_job
 
-test:ubuntu:latest:
-  <<: *ubuntu_latest
+test:ubuntu:latest:i386:
+  <<: *ubuntu_latest_i386_image
   <<: *test_job

diff --git a/contrib/docker/centos:latest/Dockerfile b/contrib/docker/centos-amd64:latest/Dockerfile
similarity index 100%
rename from contrib/docker/centos:latest/Dockerfile
rename to contrib/docker/centos-amd64:latest/Dockerfile

diff --git a/contrib/docker/debian-amd64:oldstable/Dockerfile b/contrib/docker/debian-amd64:oldstable/Dockerfile
new file mode 100644 (file)
index 0000000..567eeb8
--- /dev/null
+++ b/contrib/docker/debian-amd64:oldstable/Dockerfile
@@ -0,0 +1,23 @@
+FROM debian:oldstable
+MAINTAINER BIND 9 Developers <bind9-dev@isc.org>
+ENV DEBIAN_FRONTEND noninteractive
+RUN apt-get -y update
+RUN apt-get -y dist-upgrade
+RUN apt-get -y install \
+       autoconf        \
+       automake        \
+       autotools-dev   \
+       bash-completion \
+       bison           \
+       build-essential \
+       git             \
+       libcap2-dev     \
+       libdb-dev       \
+       libgeoip-dev    \
+       libkrb5-dev     \
+       libldap2-dev    \
+       liblmdb-dev     \
+       libtool         \
+       libssl-dev      \
+       libxml2-dev     \
+       pkg-config

diff --git a/contrib/docker/debian:latest/Dockerfile b/contrib/docker/debian-amd64:stable/Dockerfile
similarity index 100%
rename from contrib/docker/debian:latest/Dockerfile
rename to contrib/docker/debian-amd64:stable/Dockerfile

diff --git a/contrib/docker/debian:unstable/Dockerfile b/contrib/docker/debian-amd64:unstable/Dockerfile
similarity index 100%
rename from contrib/docker/debian:unstable/Dockerfile
rename to contrib/docker/debian-amd64:unstable/Dockerfile

diff --git a/contrib/docker/debian-i386:oldstable/Dockerfile b/contrib/docker/debian-i386:oldstable/Dockerfile
new file mode 100644 (file)
index 0000000..567eeb8
--- /dev/null
+++ b/contrib/docker/debian-i386:oldstable/Dockerfile
@@ -0,0 +1,23 @@
+FROM debian:oldstable
+MAINTAINER BIND 9 Developers <bind9-dev@isc.org>
+ENV DEBIAN_FRONTEND noninteractive
+RUN apt-get -y update
+RUN apt-get -y dist-upgrade
+RUN apt-get -y install \
+       autoconf        \
+       automake        \
+       autotools-dev   \
+       bash-completion \
+       bison           \
+       build-essential \
+       git             \
+       libcap2-dev     \
+       libdb-dev       \
+       libgeoip-dev    \
+       libkrb5-dev     \
+       libldap2-dev    \
+       liblmdb-dev     \
+       libtool         \
+       libssl-dev      \
+       libxml2-dev     \
+       pkg-config

diff --git a/contrib/docker/debian-i386:stable/Dockerfile b/contrib/docker/debian-i386:stable/Dockerfile
new file mode 100644 (file)
index 0000000..2a12ef5
--- /dev/null
+++ b/contrib/docker/debian-i386:stable/Dockerfile
@@ -0,0 +1,23 @@
+FROM i386/debian:stable
+MAINTAINER BIND 9 Developers <bind9-dev@isc.org>
+ENV DEBIAN_FRONTEND noninteractive
+RUN apt-get -y update
+RUN apt-get -y dist-upgrade
+RUN apt-get -y install \
+       autoconf        \
+       automake        \
+       autotools-dev   \
+       bash-completion \
+       bison           \
+       build-essential \
+       git             \
+       libcap2-dev     \
+       libdb-dev       \
+       libgeoip-dev    \
+       libkrb5-dev     \
+       libldap2-dev    \
+       liblmdb-dev     \
+       libtool         \
+       libssl-dev      \
+       libxml2-dev     \
+       pkg-config

diff --git a/contrib/docker/debian-i386:unstable/Dockerfile b/contrib/docker/debian-i386:unstable/Dockerfile
new file mode 100644 (file)
index 0000000..a8f6dbc
--- /dev/null
+++ b/contrib/docker/debian-i386:unstable/Dockerfile
@@ -0,0 +1,23 @@
+FROM i386/debian:unstable
+MAINTAINER BIND 9 Developers <bind9-dev@isc.org>
+ENV DEBIAN_FRONTEND noninteractive
+RUN apt-get -y update
+RUN apt-get -y dist-upgrade
+RUN apt-get -y install \
+       autoconf        \
+       automake        \
+       autotools-dev   \
+       bash-completion \
+       bison           \
+       build-essential \
+       git             \
+       libcap2-dev     \
+       libdb-dev       \
+       libgeoip-dev    \
+       libkrb5-dev     \
+       libldap2-dev    \
+       liblmdb-dev     \
+       libtool         \
+       libssl-dev      \
+       libxml2-dev     \
+       pkg-config

diff --git a/contrib/docker/fedora:latest/Dockerfile b/contrib/docker/fedora-amd64:latest/Dockerfile
similarity index 100%
rename from contrib/docker/fedora:latest/Dockerfile
rename to contrib/docker/fedora-amd64:latest/Dockerfile

diff --git a/contrib/docker/ubuntu:latest/Dockerfile b/contrib/docker/ubuntu-amd64:latest/Dockerfile
similarity index 100%
rename from contrib/docker/ubuntu:latest/Dockerfile
rename to contrib/docker/ubuntu-amd64:latest/Dockerfile

diff --git a/contrib/docker/ubuntu-i386:latest/Dockerfile b/contrib/docker/ubuntu-i386:latest/Dockerfile
new file mode 100644 (file)
index 0000000..a0888f9
--- /dev/null
+++ b/contrib/docker/ubuntu-i386:latest/Dockerfile
@@ -0,0 +1,23 @@
+FROM i386/ubuntu:latest
+MAINTAINER BIND 9 Developers <bind9-dev@isc.org>
+ENV DEBIAN_FRONTEND noninteractive
+RUN apt-get -y update
+RUN apt-get -y dist-upgrade
+RUN apt-get -y install \
+       autoconf        \
+       automake        \
+       autotools-dev   \
+       bash-completion \
+       bison           \
+       build-essential \
+       git             \
+       libcap2-dev     \
+       libdb-dev       \
+       libgeoip-dev    \
+       libkrb5-dev     \
+       libldap2-dev    \
+       liblmdb-dev     \
+       libtool         \
+       libssl-dev      \
+       libxml2-dev     \
+       pkg-config