From 37b196ea8798c42a79b968eb7c7a52a9ded0008c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Fri, 13 Oct 2017 15:32:08 +0200 Subject: [PATCH 01/18] Enable Gitlab-CI for the project --- .gitlab-ci.yml | 96 +++++++++++++++++++++++ contrib/docker/centos:latest/Dockerfile | 18 +++++ contrib/docker/debian:latest/Dockerfile | 23 ++++++ contrib/docker/debian:unstable/Dockerfile | 23 ++++++ contrib/docker/fedora:latest/Dockerfile | 17 ++++ contrib/docker/ubuntu:latest/Dockerfile | 23 ++++++ 6 files changed, 200 insertions(+) create mode 100644 .gitlab-ci.yml create mode 100644 contrib/docker/centos:latest/Dockerfile create mode 100644 contrib/docker/debian:latest/Dockerfile create mode 100644 contrib/docker/debian:unstable/Dockerfile create mode 100644 contrib/docker/fedora:latest/Dockerfile create mode 100644 contrib/docker/ubuntu:latest/Dockerfile diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000000..5961e29a4d --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,96 @@ +variables: + DEBIAN_FRONTEND: noninteractive + LC_ALL: C + +stages: + - image + - build + - test + +.image: &image + image: docker:latest + stage: image + services: + - docker:dind + tags: + - shared + - docker + before_script: + - docker info + script: + - docker login -u "$CI_REGISTRY_USER" -p "$CI_BUILD_TOKEN" "$CI_REGISTRY" + - docker pull "$CI_REGISTRY_IMAGE/$CI_JOB_NAME" || true + - docker build --cache-from "$CI_REGISTRY_IMAGE/$CI_JOB_NAME" -t "$CI_REGISTRY_IMAGE/$CI_JOB_NAME" "contrib/docker/$CI_JOB_NAME" + - docker push "$CI_REGISTRY_IMAGE/$CI_JOB_NAME" + +debian:latest: + <<: *image + +debian:unstable: + <<: *image + +ubuntu:latest: + <<: *image + +#centos:latest: +# <<: *image + +#fedora:latest: +# <<: *image + +.debian_latest: &debian_latest + image: "$CI_REGISTRY_IMAGE/debian:latest" + tags: + - linux + - docker + +.debian_unstable: &debian_unstable + image: "$CI_REGISTRY_IMAGE/debian:unstable" + tags: + - linux + - docker + +.ubuntu_latest: &ubuntu_latest + image: "$CI_REGISTRY_IMAGE/ubuntu:latest" + tags: + - linux + - docker + +.build: &build_job + stage: build + script: + - ./autogen.sh + - ./configure + - make -k all V=1 + artifacts: + untracked: true + expire_in: '1 hour' + +.test: &test_job + stage: test + script: + - make -k check V=1 + +build:debian:latest: + <<: *debian_latest + <<: *build_job + +test:debian:latest: + <<: *debian_latest + <<: *test_job + +build:debian:unstable: + <<: *debian_unstable + <<: *build_job + +test:debian:unstable: + <<: *debian_unstable + <<: *test_job + +build:ubuntu:latest: + <<: *ubuntu_latest + <<: *build_job + +test:ubuntu:latest: + <<: *ubuntu_latest + <<: *test_job diff --git a/contrib/docker/centos:latest/Dockerfile b/contrib/docker/centos:latest/Dockerfile new file mode 100644 index 0000000000..c79fdaadb7 --- /dev/null +++ b/contrib/docker/centos:latest/Dockerfile @@ -0,0 +1,18 @@ +FROM centos:latest +MAINTAINER Knot DNS +ENV DEBIAN_FRONTEND noninteractive +RUN yum -y upgrade +RUN yum -y install epel-release +RUN yum -y install \ + 'autoconf' \ + 'automake' \ + 'bison' \ + 'libtool' \ + 'lmdb-devel' \ + 'pkgconfig' \ + 'pkgconfig(openssl)' \ + 'pkgconfig(jansson)' \ + 'pkgconfig(libcap2)' \ + 'openldap-devel' \ + 'krb5-devel' \ + 'pkgconfig(libxml-2.0)' diff --git a/contrib/docker/debian:latest/Dockerfile b/contrib/docker/debian:latest/Dockerfile new file mode 100644 index 0000000000..da42acbaee --- /dev/null +++ b/contrib/docker/debian:latest/Dockerfile @@ -0,0 +1,23 @@ +FROM debian:stable +MAINTAINER BIND 9 Developers +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:unstable/Dockerfile b/contrib/docker/debian:unstable/Dockerfile new file mode 100644 index 0000000000..9714c0e7dc --- /dev/null +++ b/contrib/docker/debian:unstable/Dockerfile @@ -0,0 +1,23 @@ +FROM debian:unstable +MAINTAINER BIND 9 Developers +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:latest/Dockerfile new file mode 100644 index 0000000000..322850328d --- /dev/null +++ b/contrib/docker/fedora:latest/Dockerfile @@ -0,0 +1,17 @@ +FROM fedora:latest +MAINTAINER Knot DNS +ENV DEBIAN_FRONTEND noninteractive +RUN dnf -y upgrade +RUN yum -y install \ + 'autoconf' \ + 'automake' \ + 'bison' \ + 'libtool' \ + 'lmdb-devel' \ + 'pkgconfig' \ + 'pkgconfig(openssl)' \ + 'pkgconfig(jansson)' \ + 'pkgconfig(libcap2)' \ + 'openldap-devel' \ + 'krb5-devel' \ + 'pkgconfig(libxml-2.0)' diff --git a/contrib/docker/ubuntu:latest/Dockerfile b/contrib/docker/ubuntu:latest/Dockerfile new file mode 100644 index 0000000000..75b85618b1 --- /dev/null +++ b/contrib/docker/ubuntu:latest/Dockerfile @@ -0,0 +1,23 @@ +FROM ubuntu:latest +MAINTAINER BIND 9 Developers +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 From f1a574b729c0a5ec9d1961c8c8fc09bfda077fac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Fri, 13 Oct 2017 16:05:35 +0200 Subject: [PATCH 02/18] Build docker images only in master, triggers and/or tags --- .gitlab-ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5961e29a4d..9921be1d14 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,6 +22,10 @@ stages: - docker pull "$CI_REGISTRY_IMAGE/$CI_JOB_NAME" || true - docker build --cache-from "$CI_REGISTRY_IMAGE/$CI_JOB_NAME" -t "$CI_REGISTRY_IMAGE/$CI_JOB_NAME" "contrib/docker/$CI_JOB_NAME" - docker push "$CI_REGISTRY_IMAGE/$CI_JOB_NAME" + only: + - master + - triggers + - tags debian:latest: <<: *image From 20c50b9238bc738534c6ed26f1417357bacafc20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Fri, 13 Oct 2017 16:15:34 +0200 Subject: [PATCH 03/18] Enable private IP addresses for tests --- .gitlab-ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9921be1d14..7b52cd1359 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -62,8 +62,9 @@ ubuntu:latest: .build: &build_job stage: build - script: + before_script: - ./autogen.sh + script: - ./configure - make -k all V=1 artifacts: @@ -72,6 +73,8 @@ ubuntu:latest: .test: &test_job stage: test + before_script: + - bin/tests/system/ifconfig.sh up script: - make -k check V=1 From 618d1146f080187e800feb00bc494f916943b773 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Fri, 13 Oct 2017 16:35:57 +0200 Subject: [PATCH 04/18] Add i386 as tested architecture --- .gitlab-ci.yml | 139 +++++++++++++++--- .../Dockerfile | 0 .../docker/debian-amd64:oldstable/Dockerfile | 23 +++ .../Dockerfile | 0 .../Dockerfile | 0 .../docker/debian-i386:oldstable/Dockerfile | 23 +++ contrib/docker/debian-i386:stable/Dockerfile | 23 +++ .../docker/debian-i386:unstable/Dockerfile | 23 +++ .../Dockerfile | 0 .../Dockerfile | 0 contrib/docker/ubuntu-i386:latest/Dockerfile | 23 +++ 11 files changed, 230 insertions(+), 24 deletions(-) rename contrib/docker/{centos:latest => centos-amd64:latest}/Dockerfile (100%) create mode 100644 contrib/docker/debian-amd64:oldstable/Dockerfile rename contrib/docker/{debian:latest => debian-amd64:stable}/Dockerfile (100%) rename contrib/docker/{debian:unstable => debian-amd64:unstable}/Dockerfile (100%) create mode 100644 contrib/docker/debian-i386:oldstable/Dockerfile create mode 100644 contrib/docker/debian-i386:stable/Dockerfile create mode 100644 contrib/docker/debian-i386:unstable/Dockerfile rename contrib/docker/{fedora:latest => fedora-amd64:latest}/Dockerfile (100%) rename contrib/docker/{ubuntu:latest => ubuntu-amd64:latest}/Dockerfile (100%) create mode 100644 contrib/docker/ubuntu-i386:latest/Dockerfile diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7b52cd1359..51f92fc5fd 100644 --- 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_unstable: &debian_unstable - image: "$CI_REGISTRY_IMAGE/debian:unstable" +.debian-i386:oldstable: &debian_oldstable_i386_image + image: "$CI_REGISTRY_IMAGE/debian-i386:oldstable" tags: - linux - docker -.ubuntu_latest: &ubuntu_latest - image: "$CI_REGISTRY_IMAGE/ubuntu:latest" +.debian-amd64:stable: &debian_stable_amd64_image + image: "$CI_REGISTRY_IMAGE/debian-amd64:stable" + tags: + - linux + - docker + +.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:latest: - <<: *debian_latest +test:debian:oldstable:amd64: + <<: *debian_oldstable_amd64_image <<: *test_job -build:debian:unstable: - <<: *debian_unstable +build:debian:oldstable:i386: + <<: *debian_oldstable_i386_image <<: *build_job -test:debian:unstable: - <<: *debian_unstable +test:debian:oldstable:i386: + <<: *debian_oldstable_i386_image <<: *test_job -build:ubuntu:latest: - <<: *ubuntu_latest +#### + +build:debian:stable:amd64: + <<: *debian_stable_amd64_image <<: *build_job -test:ubuntu:latest: - <<: *ubuntu_latest +test:debian:stable:amd64: + <<: *debian_stable_amd64_image + <<: *test_job + +build:debian:stable:i386: + <<: *debian_stable_i386_image + <<: *build_job + +test:debian:stable:i386: + <<: *debian_stable_i386_image + <<: *test_job + +#### + +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:ubuntu:latest:amd64: + <<: *ubuntu_latest_amd64_image + <<: *test_job + +build:ubuntu:latest:i386: + <<: *ubuntu_latest_i386_image + <<: *build_job + +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 index 0000000000..567eeb8648 --- /dev/null +++ b/contrib/docker/debian-amd64:oldstable/Dockerfile @@ -0,0 +1,23 @@ +FROM debian:oldstable +MAINTAINER BIND 9 Developers +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 index 0000000000..567eeb8648 --- /dev/null +++ b/contrib/docker/debian-i386:oldstable/Dockerfile @@ -0,0 +1,23 @@ +FROM debian:oldstable +MAINTAINER BIND 9 Developers +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 index 0000000000..2a12ef57c8 --- /dev/null +++ b/contrib/docker/debian-i386:stable/Dockerfile @@ -0,0 +1,23 @@ +FROM i386/debian:stable +MAINTAINER BIND 9 Developers +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 index 0000000000..a8f6dbc702 --- /dev/null +++ b/contrib/docker/debian-i386:unstable/Dockerfile @@ -0,0 +1,23 @@ +FROM i386/debian:unstable +MAINTAINER BIND 9 Developers +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 index 0000000000..a0888f9d99 --- /dev/null +++ b/contrib/docker/ubuntu-i386:latest/Dockerfile @@ -0,0 +1,23 @@ +FROM i386/ubuntu:latest +MAINTAINER BIND 9 Developers +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 From 00beaad8684d46d271867aa26e13301b531f52f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Fri, 13 Oct 2017 20:50:55 +0200 Subject: [PATCH 05/18] Run the interface up script with 'bash' as it's not executable by itself directly --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 51f92fc5fd..02ee48e882 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -119,7 +119,7 @@ ubuntu-i386:latest: .test: &test_job stage: test before_script: - - bin/tests/system/ifconfig.sh up + - bash bin/tests/system/ifconfig.sh up script: - make -k check V=1 From 69a185167d309647a68d27b002a723ed3a8770ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Fri, 13 Oct 2017 21:10:40 +0200 Subject: [PATCH 06/18] Add net-tools for ifconfig support --- contrib/docker/debian-amd64:oldstable/Dockerfile | 2 ++ contrib/docker/debian-amd64:stable/Dockerfile | 2 ++ contrib/docker/debian-amd64:unstable/Dockerfile | 2 ++ contrib/docker/debian-i386:oldstable/Dockerfile | 2 ++ contrib/docker/debian-i386:stable/Dockerfile | 2 ++ contrib/docker/debian-i386:unstable/Dockerfile | 2 ++ contrib/docker/ubuntu-amd64:latest/Dockerfile | 2 ++ contrib/docker/ubuntu-i386:latest/Dockerfile | 2 ++ 8 files changed, 16 insertions(+) diff --git a/contrib/docker/debian-amd64:oldstable/Dockerfile b/contrib/docker/debian-amd64:oldstable/Dockerfile index 567eeb8648..cfb545d4ad 100644 --- a/contrib/docker/debian-amd64:oldstable/Dockerfile +++ b/contrib/docker/debian-amd64:oldstable/Dockerfile @@ -21,3 +21,5 @@ RUN apt-get -y install \ libssl-dev \ libxml2-dev \ pkg-config +RUN apt-get -y install \ + net-tools diff --git a/contrib/docker/debian-amd64:stable/Dockerfile b/contrib/docker/debian-amd64:stable/Dockerfile index da42acbaee..40521f536b 100644 --- a/contrib/docker/debian-amd64:stable/Dockerfile +++ b/contrib/docker/debian-amd64:stable/Dockerfile @@ -21,3 +21,5 @@ RUN apt-get -y install \ libssl-dev \ libxml2-dev \ pkg-config +RUN apt-get -y install \ + net-tools diff --git a/contrib/docker/debian-amd64:unstable/Dockerfile b/contrib/docker/debian-amd64:unstable/Dockerfile index 9714c0e7dc..5a76f33112 100644 --- a/contrib/docker/debian-amd64:unstable/Dockerfile +++ b/contrib/docker/debian-amd64:unstable/Dockerfile @@ -21,3 +21,5 @@ RUN apt-get -y install \ libssl-dev \ libxml2-dev \ pkg-config +RUN apt-get -y install \ + net-tools diff --git a/contrib/docker/debian-i386:oldstable/Dockerfile b/contrib/docker/debian-i386:oldstable/Dockerfile index 567eeb8648..cfb545d4ad 100644 --- a/contrib/docker/debian-i386:oldstable/Dockerfile +++ b/contrib/docker/debian-i386:oldstable/Dockerfile @@ -21,3 +21,5 @@ RUN apt-get -y install \ libssl-dev \ libxml2-dev \ pkg-config +RUN apt-get -y install \ + net-tools diff --git a/contrib/docker/debian-i386:stable/Dockerfile b/contrib/docker/debian-i386:stable/Dockerfile index 2a12ef57c8..f361e81674 100644 --- a/contrib/docker/debian-i386:stable/Dockerfile +++ b/contrib/docker/debian-i386:stable/Dockerfile @@ -21,3 +21,5 @@ RUN apt-get -y install \ libssl-dev \ libxml2-dev \ pkg-config +RUN apt-get -y install \ + net-tools diff --git a/contrib/docker/debian-i386:unstable/Dockerfile b/contrib/docker/debian-i386:unstable/Dockerfile index a8f6dbc702..e4284e2cb1 100644 --- a/contrib/docker/debian-i386:unstable/Dockerfile +++ b/contrib/docker/debian-i386:unstable/Dockerfile @@ -21,3 +21,5 @@ RUN apt-get -y install \ libssl-dev \ libxml2-dev \ pkg-config +RUN apt-get -y install \ + net-tools diff --git a/contrib/docker/ubuntu-amd64:latest/Dockerfile b/contrib/docker/ubuntu-amd64:latest/Dockerfile index 75b85618b1..1b241583b2 100644 --- a/contrib/docker/ubuntu-amd64:latest/Dockerfile +++ b/contrib/docker/ubuntu-amd64:latest/Dockerfile @@ -21,3 +21,5 @@ RUN apt-get -y install \ libssl-dev \ libxml2-dev \ pkg-config +RUN apt-get -y install \ + net-tools diff --git a/contrib/docker/ubuntu-i386:latest/Dockerfile b/contrib/docker/ubuntu-i386:latest/Dockerfile index a0888f9d99..8743e17ff5 100644 --- a/contrib/docker/ubuntu-i386:latest/Dockerfile +++ b/contrib/docker/ubuntu-i386:latest/Dockerfile @@ -21,3 +21,5 @@ RUN apt-get -y install \ libssl-dev \ libxml2-dev \ pkg-config +RUN apt-get -y install \ + net-tools From 3f798b3576935ea815a1f9fe9bbf73fcec8cd0bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Fri, 13 Oct 2017 21:38:45 +0200 Subject: [PATCH 07/18] Add correct dependencies for test jobs to pull artifacts from build jobs --- .gitlab-ci.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 02ee48e882..a662bc4e48 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -130,6 +130,8 @@ build:debian:oldstable:amd64: test:debian:oldstable:amd64: <<: *debian_oldstable_amd64_image <<: *test_job + dependencies: + - build:debian:oldstable:amd64 build:debian:oldstable:i386: <<: *debian_oldstable_i386_image @@ -138,6 +140,8 @@ build:debian:oldstable:i386: test:debian:oldstable:i386: <<: *debian_oldstable_i386_image <<: *test_job + dependencies: + - build:debian:oldstable:i386 #### @@ -148,6 +152,8 @@ build:debian:stable:amd64: test:debian:stable:amd64: <<: *debian_stable_amd64_image <<: *test_job + dependencies: + - build:debian:stable:amd64 build:debian:stable:i386: <<: *debian_stable_i386_image @@ -156,6 +162,8 @@ build:debian:stable:i386: test:debian:stable:i386: <<: *debian_stable_i386_image <<: *test_job + dependencies: + - build:debian:stable:i386 #### @@ -166,6 +174,8 @@ build:debian:unstable:amd64: test:debian:unstable:amd64: <<: *debian_unstable_amd64_image <<: *test_job + dependencies: + - build:debian:unstable:amd64 build:debian:unstable:i386: <<: *debian_unstable_i386_image @@ -174,6 +184,8 @@ build:debian:unstable:i386: test:debian:unstable:i386: <<: *debian_unstable_i386_image <<: *test_job + dependencies: + - build:debian:unstable:i386 #### @@ -184,6 +196,8 @@ build:ubuntu:latest:amd64: test:ubuntu:latest:amd64: <<: *ubuntu_latest_amd64_image <<: *test_job + dependencies: + - build:ubuntu:latest:amd64 build:ubuntu:latest:i386: <<: *ubuntu_latest_i386_image @@ -192,3 +206,5 @@ build:ubuntu:latest:i386: test:ubuntu:latest:i386: <<: *ubuntu_latest_i386_image <<: *test_job + dependencies: + - build:ubuntu:latest:i386 From 20d2d095a9fd451625324b002469d2f9120f7d67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Fri, 13 Oct 2017 22:36:09 +0200 Subject: [PATCH 08/18] Install procps for /bin/kill into Debian and Ubuntu docker images --- contrib/docker/debian-amd64:oldstable/Dockerfile | 5 +++-- contrib/docker/debian-amd64:stable/Dockerfile | 5 +++-- contrib/docker/debian-amd64:unstable/Dockerfile | 5 +++-- contrib/docker/debian-i386:oldstable/Dockerfile | 5 +++-- contrib/docker/debian-i386:stable/Dockerfile | 5 +++-- contrib/docker/debian-i386:unstable/Dockerfile | 5 +++-- contrib/docker/ubuntu-amd64:latest/Dockerfile | 5 +++-- contrib/docker/ubuntu-i386:latest/Dockerfile | 5 +++-- 8 files changed, 24 insertions(+), 16 deletions(-) diff --git a/contrib/docker/debian-amd64:oldstable/Dockerfile b/contrib/docker/debian-amd64:oldstable/Dockerfile index cfb545d4ad..506c1731f0 100644 --- a/contrib/docker/debian-amd64:oldstable/Dockerfile +++ b/contrib/docker/debian-amd64:oldstable/Dockerfile @@ -21,5 +21,6 @@ RUN apt-get -y install \ libssl-dev \ libxml2-dev \ pkg-config -RUN apt-get -y install \ - net-tools +RUN apt-get -y install \ + net-tools \ + procps diff --git a/contrib/docker/debian-amd64:stable/Dockerfile b/contrib/docker/debian-amd64:stable/Dockerfile index 40521f536b..bb405f6d56 100644 --- a/contrib/docker/debian-amd64:stable/Dockerfile +++ b/contrib/docker/debian-amd64:stable/Dockerfile @@ -21,5 +21,6 @@ RUN apt-get -y install \ libssl-dev \ libxml2-dev \ pkg-config -RUN apt-get -y install \ - net-tools +RUN apt-get -y install \ + net-tools \ + procps diff --git a/contrib/docker/debian-amd64:unstable/Dockerfile b/contrib/docker/debian-amd64:unstable/Dockerfile index 5a76f33112..7e15201d6d 100644 --- a/contrib/docker/debian-amd64:unstable/Dockerfile +++ b/contrib/docker/debian-amd64:unstable/Dockerfile @@ -21,5 +21,6 @@ RUN apt-get -y install \ libssl-dev \ libxml2-dev \ pkg-config -RUN apt-get -y install \ - net-tools +RUN apt-get -y install \ + net-tools \ + procps diff --git a/contrib/docker/debian-i386:oldstable/Dockerfile b/contrib/docker/debian-i386:oldstable/Dockerfile index cfb545d4ad..506c1731f0 100644 --- a/contrib/docker/debian-i386:oldstable/Dockerfile +++ b/contrib/docker/debian-i386:oldstable/Dockerfile @@ -21,5 +21,6 @@ RUN apt-get -y install \ libssl-dev \ libxml2-dev \ pkg-config -RUN apt-get -y install \ - net-tools +RUN apt-get -y install \ + net-tools \ + procps diff --git a/contrib/docker/debian-i386:stable/Dockerfile b/contrib/docker/debian-i386:stable/Dockerfile index f361e81674..fb3bc1f438 100644 --- a/contrib/docker/debian-i386:stable/Dockerfile +++ b/contrib/docker/debian-i386:stable/Dockerfile @@ -21,5 +21,6 @@ RUN apt-get -y install \ libssl-dev \ libxml2-dev \ pkg-config -RUN apt-get -y install \ - net-tools +RUN apt-get -y install \ + net-tools \ + procps diff --git a/contrib/docker/debian-i386:unstable/Dockerfile b/contrib/docker/debian-i386:unstable/Dockerfile index e4284e2cb1..5edf316ddf 100644 --- a/contrib/docker/debian-i386:unstable/Dockerfile +++ b/contrib/docker/debian-i386:unstable/Dockerfile @@ -21,5 +21,6 @@ RUN apt-get -y install \ libssl-dev \ libxml2-dev \ pkg-config -RUN apt-get -y install \ - net-tools +RUN apt-get -y install \ + net-tools \ + procps diff --git a/contrib/docker/ubuntu-amd64:latest/Dockerfile b/contrib/docker/ubuntu-amd64:latest/Dockerfile index 1b241583b2..8356b2296c 100644 --- a/contrib/docker/ubuntu-amd64:latest/Dockerfile +++ b/contrib/docker/ubuntu-amd64:latest/Dockerfile @@ -21,5 +21,6 @@ RUN apt-get -y install \ libssl-dev \ libxml2-dev \ pkg-config -RUN apt-get -y install \ - net-tools +RUN apt-get -y install \ + net-tools \ + procps diff --git a/contrib/docker/ubuntu-i386:latest/Dockerfile b/contrib/docker/ubuntu-i386:latest/Dockerfile index 8743e17ff5..bef58a4ac3 100644 --- a/contrib/docker/ubuntu-i386:latest/Dockerfile +++ b/contrib/docker/ubuntu-i386:latest/Dockerfile @@ -21,5 +21,6 @@ RUN apt-get -y install \ libssl-dev \ libxml2-dev \ pkg-config -RUN apt-get -y install \ - net-tools +RUN apt-get -y install \ + net-tools \ + procps From 41f3423e8729a8d608abafcc1f308df961aedba5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Mon, 16 Oct 2017 13:24:06 +0200 Subject: [PATCH 09/18] Install libnet-dns-perl into Docker images to fix tests failures --- contrib/docker/debian-amd64:oldstable/Dockerfile | 4 ++-- contrib/docker/debian-amd64:stable/Dockerfile | 4 ++-- contrib/docker/debian-amd64:unstable/Dockerfile | 4 ++-- contrib/docker/debian-i386:oldstable/Dockerfile | 4 ++-- contrib/docker/debian-i386:stable/Dockerfile | 4 ++-- contrib/docker/debian-i386:unstable/Dockerfile | 4 ++-- contrib/docker/ubuntu-amd64:latest/Dockerfile | 4 ++-- contrib/docker/ubuntu-i386:latest/Dockerfile | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/contrib/docker/debian-amd64:oldstable/Dockerfile b/contrib/docker/debian-amd64:oldstable/Dockerfile index 506c1731f0..8f55363756 100644 --- a/contrib/docker/debian-amd64:oldstable/Dockerfile +++ b/contrib/docker/debian-amd64:oldstable/Dockerfile @@ -17,10 +17,10 @@ RUN apt-get -y install \ libkrb5-dev \ libldap2-dev \ liblmdb-dev \ + libnet-dns-perl \ libtool \ libssl-dev \ libxml2-dev \ - pkg-config -RUN apt-get -y install \ net-tools \ + pkg-config \ procps diff --git a/contrib/docker/debian-amd64:stable/Dockerfile b/contrib/docker/debian-amd64:stable/Dockerfile index bb405f6d56..bc8e5e8dfb 100644 --- a/contrib/docker/debian-amd64:stable/Dockerfile +++ b/contrib/docker/debian-amd64:stable/Dockerfile @@ -17,10 +17,10 @@ RUN apt-get -y install \ libkrb5-dev \ libldap2-dev \ liblmdb-dev \ + libnet-dns-perl \ libtool \ libssl-dev \ libxml2-dev \ - pkg-config -RUN apt-get -y install \ net-tools \ + pkg-config \ procps diff --git a/contrib/docker/debian-amd64:unstable/Dockerfile b/contrib/docker/debian-amd64:unstable/Dockerfile index 7e15201d6d..1f88646fb7 100644 --- a/contrib/docker/debian-amd64:unstable/Dockerfile +++ b/contrib/docker/debian-amd64:unstable/Dockerfile @@ -17,10 +17,10 @@ RUN apt-get -y install \ libkrb5-dev \ libldap2-dev \ liblmdb-dev \ + libnet-dns-perl \ libtool \ libssl-dev \ libxml2-dev \ - pkg-config -RUN apt-get -y install \ net-tools \ + pkg-config \ procps diff --git a/contrib/docker/debian-i386:oldstable/Dockerfile b/contrib/docker/debian-i386:oldstable/Dockerfile index 506c1731f0..8f55363756 100644 --- a/contrib/docker/debian-i386:oldstable/Dockerfile +++ b/contrib/docker/debian-i386:oldstable/Dockerfile @@ -17,10 +17,10 @@ RUN apt-get -y install \ libkrb5-dev \ libldap2-dev \ liblmdb-dev \ + libnet-dns-perl \ libtool \ libssl-dev \ libxml2-dev \ - pkg-config -RUN apt-get -y install \ net-tools \ + pkg-config \ procps diff --git a/contrib/docker/debian-i386:stable/Dockerfile b/contrib/docker/debian-i386:stable/Dockerfile index fb3bc1f438..cdf2c100e3 100644 --- a/contrib/docker/debian-i386:stable/Dockerfile +++ b/contrib/docker/debian-i386:stable/Dockerfile @@ -17,10 +17,10 @@ RUN apt-get -y install \ libkrb5-dev \ libldap2-dev \ liblmdb-dev \ + libnet-dns-perl \ libtool \ libssl-dev \ libxml2-dev \ - pkg-config -RUN apt-get -y install \ net-tools \ + pkg-config \ procps diff --git a/contrib/docker/debian-i386:unstable/Dockerfile b/contrib/docker/debian-i386:unstable/Dockerfile index 5edf316ddf..a603a9be61 100644 --- a/contrib/docker/debian-i386:unstable/Dockerfile +++ b/contrib/docker/debian-i386:unstable/Dockerfile @@ -17,10 +17,10 @@ RUN apt-get -y install \ libkrb5-dev \ libldap2-dev \ liblmdb-dev \ + libnet-dns-perl \ libtool \ libssl-dev \ libxml2-dev \ - pkg-config -RUN apt-get -y install \ net-tools \ + pkg-config \ procps diff --git a/contrib/docker/ubuntu-amd64:latest/Dockerfile b/contrib/docker/ubuntu-amd64:latest/Dockerfile index 8356b2296c..6d7d9772d5 100644 --- a/contrib/docker/ubuntu-amd64:latest/Dockerfile +++ b/contrib/docker/ubuntu-amd64:latest/Dockerfile @@ -17,10 +17,10 @@ RUN apt-get -y install \ libkrb5-dev \ libldap2-dev \ liblmdb-dev \ + libnet-dns-perl \ libtool \ libssl-dev \ libxml2-dev \ - pkg-config -RUN apt-get -y install \ net-tools \ + pkg-config \ procps diff --git a/contrib/docker/ubuntu-i386:latest/Dockerfile b/contrib/docker/ubuntu-i386:latest/Dockerfile index bef58a4ac3..fbbf15ccaf 100644 --- a/contrib/docker/ubuntu-i386:latest/Dockerfile +++ b/contrib/docker/ubuntu-i386:latest/Dockerfile @@ -17,10 +17,10 @@ RUN apt-get -y install \ libkrb5-dev \ libldap2-dev \ liblmdb-dev \ + libnet-dns-perl \ libtool \ libssl-dev \ libxml2-dev \ - pkg-config -RUN apt-get -y install \ net-tools \ + pkg-config \ procps From ad2788b6d9c7b62d43e5b36090cd9d112d6cb77c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Mon, 18 Dec 2017 14:33:30 +0100 Subject: [PATCH 10/18] Rename $CI_BUILD_TOKEN to $CI_JOB_TOKEN --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a662bc4e48..17789efc39 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,7 +17,7 @@ stages: before_script: - docker info script: - - docker login -u "$CI_REGISTRY_USER" -p "$CI_BUILD_TOKEN" "$CI_REGISTRY" + - docker login -u "$CI_REGISTRY_USER" -p "$CI_JOB_TOKEN" "$CI_REGISTRY" - docker pull "$CI_REGISTRY_IMAGE/$CI_JOB_NAME" || true - docker build --cache-from "$CI_REGISTRY_IMAGE/$CI_JOB_NAME" -t "$CI_REGISTRY_IMAGE/$CI_JOB_NAME" "contrib/docker/$CI_JOB_NAME" - docker push "$CI_REGISTRY_IMAGE/$CI_JOB_NAME" From 8bb97d6e0449cd2edc4d59e463be79cc359801cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Mon, 18 Dec 2017 14:33:53 +0100 Subject: [PATCH 11/18] Enforce overlay2 filesystem driver for docker builds --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 17789efc39..6a6779e954 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,7 @@ variables: DEBIAN_FRONTEND: noninteractive LC_ALL: C + DOCKER_DRIVER: overlay2 stages: - image From a795dfdea3c8a28808fcda535c2e2c072c77bae4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Thu, 21 Dec 2017 09:51:12 +0100 Subject: [PATCH 12/18] Use external CI Docker images --- .gitlab-ci.yml | 176 +++++++++++++++++++------------------------------ 1 file changed, 69 insertions(+), 107 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6a6779e954..d6f35a6497 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,106 +2,68 @@ variables: DEBIAN_FRONTEND: noninteractive LC_ALL: C DOCKER_DRIVER: overlay2 + CI_REGISTRY_IMAGE: oerdnj/bind9 stages: - - image - build - test -.image: &image - image: docker:latest - stage: image - services: - - docker:dind - tags: - - docker - before_script: - - docker info - script: - - docker login -u "$CI_REGISTRY_USER" -p "$CI_JOB_TOKEN" "$CI_REGISTRY" - - docker pull "$CI_REGISTRY_IMAGE/$CI_JOB_NAME" || true - - docker build --cache-from "$CI_REGISTRY_IMAGE/$CI_JOB_NAME" -t "$CI_REGISTRY_IMAGE/$CI_JOB_NAME" "contrib/docker/$CI_JOB_NAME" - - docker push "$CI_REGISTRY_IMAGE/$CI_JOB_NAME" - only: - - master - - triggers - - tags - - gitlab-ci - -debian-amd64:oldstable: - <<: *image - -debian-i386:oldstable: - <<: *image - -debian-amd64:stable: - <<: *image - -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-amd64:latest: -# <<: *image - -.debian-amd64:oldstable: &debian_oldstable_amd64_image - image: "$CI_REGISTRY_IMAGE/debian-amd64:oldstable" +.debian-jessie-amd64: &debian_jessie_amd64_image + image: "$CI_REGISTRY_IMAGE:debian-jessie-amd64" tags: - linux - docker -.debian-i386:oldstable: &debian_oldstable_i386_image - image: "$CI_REGISTRY_IMAGE/debian-i386:oldstable" +.debian-jessie-i386: &debian_jessie_i386_image + image: "$CI_REGISTRY_IMAGE:debian-jessie-i386" tags: - linux - docker -.debian-amd64:stable: &debian_stable_amd64_image - image: "$CI_REGISTRY_IMAGE/debian-amd64:stable" +.debian-stretch-amd64: &debian_stretch_amd64_image + image: "$CI_REGISTRY_IMAGE:debian-stretch-amd64" tags: - linux - docker -.debian-i386:stable: &debian_stable_i386_image - image: "$CI_REGISTRY_IMAGE/debian-i386:stable" +.debian-stretch-i386:: &debian_stretch_i386_image + image: "$CI_REGISTRY_IMAGE:debian-stretch-i386" tags: - linux - docker -.debian-amd64:unstable: &debian_unstable_amd64_image - image: "$CI_REGISTRY_IMAGE/debian-amd64:unstable" +.debian-buster-amd64: &debian_buster_amd64_image + image: "$CI_REGISTRY_IMAGE:debian-buster-amd64" tags: - linux - docker -.debian-i386:unstable: &debian_unstable_i386_image - image: "$CI_REGISTRY_IMAGE/debian-i386:unstable" +.debian-buster-i386:: &debian_buster_i386_image + image: "$CI_REGISTRY_IMAGE:debian-buster-i386" tags: - linux - docker -.ubuntu-amd64:latest: &ubuntu_latest_amd64_image - image: "$CI_REGISTRY_IMAGE/ubuntu-amd64:latest" +.debian-sid-amd64: &debian_sid_amd64_image + image: "$CI_REGISTRY_IMAGE:debian-sid-amd64" tags: - linux - docker -.ubuntu-amd64:latest: &ubuntu_latest_i386_image - image: "$CI_REGISTRY_IMAGE/ubuntu-i386:latest" +.debian-sid-i386: &debian_sid_i386_image + image: "$CI_REGISTRY_IMAGE:debian-sid-i386" + tags: + - linux + - docker + +.ubuntu-xenial-amd64: &ubuntu_xenial_amd64_image + image: "$CI_REGISTRY_IMAGE:ubuntu-xenial-amd64" + tags: + - linux + - docker + +.ubuntu-xenial-amd64: &ubuntu_xenial_i386_image + image: "$CI_REGISTRY_IMAGE:ubuntu-xenial-i386" tags: - linux - docker @@ -124,88 +86,88 @@ ubuntu-i386:latest: script: - make -k check V=1 -build:debian:oldstable:amd64: - <<: *debian_oldstable_amd64_image +build:debian:jessie:amd64: + <<: *debian_jessie_amd64_image <<: *build_job -test:debian:oldstable:amd64: - <<: *debian_oldstable_amd64_image +test:debian:jessie:amd64: + <<: *debian_jessie_amd64_image <<: *test_job dependencies: - - build:debian:oldstable:amd64 + - build:debian:jessie:amd64 -build:debian:oldstable:i386: - <<: *debian_oldstable_i386_image +build:debian:jessie:i386: + <<: *debian_jessie_i386_image <<: *build_job -test:debian:oldstable:i386: - <<: *debian_oldstable_i386_image +test:debian:jessie:i386: + <<: *debian_jessie_i386_image <<: *test_job dependencies: - - build:debian:oldstable:i386 + - build:debian:jessie:i386 #### -build:debian:stable:amd64: - <<: *debian_stable_amd64_image +build:debian:stretch:amd64: + <<: *debian_stretch_amd64_image <<: *build_job -test:debian:stable:amd64: - <<: *debian_stable_amd64_image +test:debian:stretch:amd64: + <<: *debian_stretch_amd64_image <<: *test_job dependencies: - - build:debian:stable:amd64 + - build:debian:stretch:amd64 -build:debian:stable:i386: - <<: *debian_stable_i386_image +build:debian:stretch:i386: + <<: *debian_stretch_i386_image <<: *build_job -test:debian:stable:i386: - <<: *debian_stable_i386_image +test:debian:stretch:i386: + <<: *debian_stretch_i386_image <<: *test_job dependencies: - - build:debian:stable:i386 + - build:debian:stretch:i386 #### -build:debian:unstable:amd64: - <<: *debian_unstable_amd64_image +build:debian:sid:amd64: + <<: *debian_sid_amd64_image <<: *build_job -test:debian:unstable:amd64: - <<: *debian_unstable_amd64_image +test:debian:sid:amd64: + <<: *debian_sid_amd64_image <<: *test_job dependencies: - - build:debian:unstable:amd64 + - build:debian:sid:amd64 -build:debian:unstable:i386: - <<: *debian_unstable_i386_image +build:debian:sid:i386: + <<: *debian_sid_i386_image <<: *build_job -test:debian:unstable:i386: - <<: *debian_unstable_i386_image +test:debian:sid:i386: + <<: *debian_sid_i386_image <<: *test_job dependencies: - - build:debian:unstable:i386 + - build:debian:sid:i386 #### -build:ubuntu:latest:amd64: - <<: *ubuntu_latest_amd64_image +build:ubuntu:xenial:amd64: + <<: *ubuntu_xenial_amd64_image <<: *build_job -test:ubuntu:latest:amd64: - <<: *ubuntu_latest_amd64_image +test:ubuntu:xenial:amd64: + <<: *ubuntu_xenial_amd64_image <<: *test_job dependencies: - - build:ubuntu:latest:amd64 + - build:ubuntu:xenial:amd64 -build:ubuntu:latest:i386: - <<: *ubuntu_latest_i386_image +build:ubuntu:xenial:i386: + <<: *ubuntu_xenial_i386_image <<: *build_job -test:ubuntu:latest:i386: - <<: *ubuntu_latest_i386_image +test:ubuntu:xenial:i386: + <<: *ubuntu_xenial_i386_image <<: *test_job dependencies: - - build:ubuntu:latest:i386 + - build:ubuntu:xenial:i386 From 2f7ff2980f88d91109443bdee7a3240ce281abc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Thu, 21 Dec 2017 13:08:58 +0100 Subject: [PATCH 13/18] Merge build and test steps --- .gitlab-ci.yml | 81 ++++++++++++-------------------------------------- 1 file changed, 19 insertions(+), 62 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d6f35a6497..1edea78633 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,7 +6,6 @@ variables: stages: - build - - test .debian-jessie-amd64: &debian_jessie_amd64_image image: "$CI_REGISTRY_IMAGE:debian-jessie-amd64" @@ -56,13 +55,25 @@ stages: - linux - docker +.ubuntu-trusty-amd64: &ubuntu_trusty_amd64_image + image: "$CI_REGISTRY_IMAGE:ubuntu-trusty-amd64" + tags: + - linux + - docker + +.ubuntu-trusty-i386: &ubuntu_trusty_i386_image + image: "$CI_REGISTRY_IMAGE:ubuntu-trusty-i386" + tags: + - linux + - docker + .ubuntu-xenial-amd64: &ubuntu_xenial_amd64_image image: "$CI_REGISTRY_IMAGE:ubuntu-xenial-amd64" tags: - linux - docker -.ubuntu-xenial-amd64: &ubuntu_xenial_i386_image +.ubuntu-xenial-i386: &ubuntu_xenial_i386_image image: "$CI_REGISTRY_IMAGE:ubuntu-xenial-i386" tags: - linux @@ -71,10 +82,12 @@ stages: .build: &build_job stage: build before_script: + - bash bin/tests/system/ifconfig.sh up - ./autogen.sh script: - ./configure - make -k all V=1 + - make -k check V=1 artifacts: untracked: true expire_in: '1 hour' @@ -82,92 +95,36 @@ stages: .test: &test_job stage: test before_script: - - bash bin/tests/system/ifconfig.sh up script: - - make -k check V=1 build:debian:jessie:amd64: <<: *debian_jessie_amd64_image <<: *build_job -test:debian:jessie:amd64: - <<: *debian_jessie_amd64_image - <<: *test_job - dependencies: - - build:debian:jessie:amd64 - build:debian:jessie:i386: <<: *debian_jessie_i386_image <<: *build_job -test:debian:jessie:i386: - <<: *debian_jessie_i386_image - <<: *test_job - dependencies: - - build:debian:jessie:i386 - -#### - build:debian:stretch:amd64: <<: *debian_stretch_amd64_image <<: *build_job -test:debian:stretch:amd64: - <<: *debian_stretch_amd64_image - <<: *test_job - dependencies: - - build:debian:stretch:amd64 - -build:debian:stretch:i386: - <<: *debian_stretch_i386_image +build:debian:buster:i386: + <<: *debian_buster_i386_image <<: *build_job -test:debian:stretch:i386: - <<: *debian_stretch_i386_image - <<: *test_job - dependencies: - - build:debian:stretch:i386 - -#### - build:debian:sid:amd64: <<: *debian_sid_amd64_image <<: *build_job -test:debian:sid:amd64: - <<: *debian_sid_amd64_image - <<: *test_job - dependencies: - - build:debian:sid:amd64 - build:debian:sid:i386: <<: *debian_sid_i386_image <<: *build_job -test:debian:sid:i386: - <<: *debian_sid_i386_image - <<: *test_job - dependencies: - - build:debian:sid:i386 - -#### - -build:ubuntu:xenial:amd64: - <<: *ubuntu_xenial_amd64_image +build:ubuntu:trusty:amd64: + <<: *ubuntu_trusty_amd64_image <<: *build_job -test:ubuntu:xenial:amd64: - <<: *ubuntu_xenial_amd64_image - <<: *test_job - dependencies: - - build:ubuntu:xenial:amd64 - build:ubuntu:xenial:i386: <<: *ubuntu_xenial_i386_image <<: *build_job - -test:ubuntu:xenial:i386: - <<: *ubuntu_xenial_i386_image - <<: *test_job - dependencies: - - build:ubuntu:xenial:i386 From b54a2fb1c04ed407a66250504a01125526db0d1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Thu, 21 Dec 2017 13:14:32 +0100 Subject: [PATCH 14/18] The interface setup needs sudo --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1edea78633..49ff7eda75 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -82,7 +82,7 @@ stages: .build: &build_job stage: build before_script: - - bash bin/tests/system/ifconfig.sh up + - sudo bash bin/tests/system/ifconfig.sh up - ./autogen.sh script: - ./configure From 730e6113775f125cd954110f2061e7bced8c4d5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Thu, 21 Dec 2017 15:10:47 +0100 Subject: [PATCH 15/18] Look a who am I --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 49ff7eda75..887f4f389d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -82,7 +82,8 @@ stages: .build: &build_job stage: build before_script: - - sudo bash bin/tests/system/ifconfig.sh up + - whoami + - bash bin/tests/system/ifconfig.sh up - ./autogen.sh script: - ./configure From f52e8fb7c2d4dcc1444fd9046bb7b7e6e915cc18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Thu, 21 Dec 2017 15:17:56 +0100 Subject: [PATCH 16/18] Check the address and routing information --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 887f4f389d..6a1f1baf9d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -83,6 +83,8 @@ stages: stage: build before_script: - whoami + - ip a s + - ip r s - bash bin/tests/system/ifconfig.sh up - ./autogen.sh script: From 98696f075c7f3c07f1ee0b20a34e4ef2bdb3bfac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Thu, 21 Dec 2017 16:24:34 +0100 Subject: [PATCH 17/18] Run the network script in debugging mode --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6a1f1baf9d..ccead4e92c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -85,7 +85,7 @@ stages: - whoami - ip a s - ip r s - - bash bin/tests/system/ifconfig.sh up + - bash -x bin/tests/system/ifconfig.sh up - ./autogen.sh script: - ./configure From 0ee2dbaaedeb1d91b325012efda2ca896e0dece8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Thu, 21 Dec 2017 17:47:45 +0100 Subject: [PATCH 18/18] Disable artifact uploading as it's not needed anymore with unified build and test --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ccead4e92c..13cda0232b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -91,9 +91,9 @@ stages: - ./configure - make -k all V=1 - make -k check V=1 - artifacts: - untracked: true - expire_in: '1 hour' +# artifacts: +# untracked: true +# expire_in: '1 hour' .test: &test_job stage: test