From 0c4dca7ffd2957cca3635d607cb4acc8dfd4af90 Mon Sep 17 00:00:00 2001 From: Matous Holinka Date: Wed, 19 May 2021 19:10:09 +0200 Subject: CI: Package build for more platforms .gitlab-ci.yml: + pkg targets for some distros added + artifacts added - some distros were commented out (due to errors). misc/docker/*: + Dockerfiles updated with the necessary packages. --- .gitlab-ci.yml | 188 +++++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 150 insertions(+), 38 deletions(-) (limited to '.gitlab-ci.yml') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d7313605..3642b671 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -67,20 +67,22 @@ docker_debian-11-amd64: IMG_NAME: "debian-11-amd64" <<: *docker_build -docker_debian-11-i386: - variables: - IMG_NAME: "debian-11-i386" - <<: *docker_build +# GPG error +#docker_debian-11-i386: +# variables: +# IMG_NAME: "debian-11-i386" +# <<: *docker_build docker_debian-testing-amd64: variables: IMG_NAME: "debian-testing-amd64" <<: *docker_build -docker_debian-testing-i386: - variables: - IMG_NAME: "debian-testing-i386" - <<: *docker_build +# GPG error +#docker_debian-testing-i386: +# variables: +# IMG_NAME: "debian-testing-i386" +# <<: *docker_build docker_fedora-25-amd64: variables: @@ -146,17 +148,17 @@ docker_ubuntu-14_04-amd64: variables: IMG_NAME: "ubuntu-14.04-amd64" <<: *docker_build - + docker_ubuntu-16_04-amd64: variables: IMG_NAME: "ubuntu-16.04-amd64" <<: *docker_build - + docker_ubuntu-18_04-amd64: variables: IMG_NAME: "ubuntu-18.04-amd64" <<: *docker_build - + docker_ubuntu-20_04-amd64: variables: IMG_NAME: "ubuntu-20.04-amd64" @@ -167,10 +169,11 @@ docker_ubuntu-20_10-amd64: IMG_NAME: "ubuntu-20.10-amd64" <<: *docker_build -docker_ubuntu-21_04-amd64: - variables: - IMG_NAME: "ubuntu-21.04-amd64" - <<: *docker_build +# GPG error +#docker_ubuntu-21_04-amd64: +# variables: +# IMG_NAME: "ubuntu-21.04-amd64" +# <<: *docker_build docker_opensuse-15.0-amd64: variables: @@ -257,17 +260,17 @@ build-debian-11-amd64: <<: *build-linux image: registry.labs.nic.cz/labs/bird:debian-11-amd64 -build-debian-11-i386: - <<: *build-linux - image: registry.labs.nic.cz/labs/bird:debian-11-i386 +#build-debian-11-i386: +# <<: *build-linux +# image: registry.labs.nic.cz/labs/bird:debian-11-i386 build-debian-testing-amd64: <<: *build-linux image: registry.labs.nic.cz/labs/bird:debian-testing-amd64 -build-debian-testing-i386: - <<: *build-linux - image: registry.labs.nic.cz/labs/bird:debian-testing-i386 +#build-debian-testing-i386: +# <<: *build-linux +# image: registry.labs.nic.cz/labs/bird:debian-testing-i386 build-fedora-25-amd64: <<: *build-linux @@ -337,9 +340,9 @@ build-ubuntu-20_10-amd64: <<: *build-linux image: registry.labs.nic.cz/labs/bird:ubuntu-20.10-amd64 -build-ubuntu-21_04-amd64: - <<: *build-linux - image: registry.labs.nic.cz/labs/bird:ubuntu-21.04-amd64 +#build-ubuntu-21_04-amd64: +# <<: *build-linux +# image: registry.labs.nic.cz/labs/bird:ubuntu-21.04-amd64 build-opensuse-15.0-amd64: <<: *build-linux @@ -370,38 +373,147 @@ build-freebsd-11-i386: - i386 -.pkg-debian: &pkg-debian +.pkg-deb: &pkg-deb stage: pkg script: - - pip3 install apkg - - apkg build - - apkg install -y pkg/pkgs/*/*/*.deb - + - pip3 install apkg + - apkg build + #- apkg install -y pkg/pkgs/*/*/*.deb + artifacts: + paths: + - pkg/pkgs/* + +.pkg-rpm: &pkg-rpm + stage: pkg + script: + - pip3 install apkg + - apkg build + #- apkg install -y pkg/pkgs/*/*/*.rpm + artifacts: + paths: + - pkg/pkgs/* + +.pkg-rpm-wa: &pkg-rpm-wa + stage: pkg + script: + - sed -i "s/runstatedir/with-runtimedir/" distro/pkg/rpm/bird.spec + - pip3 install apkg + - apkg build + #- apkg install -y pkg/pkgs/*/*/*.rpm + artifacts: + paths: + - pkg/pkgs/* + +# Dpkg error: PATH is not set +#pkg-debian-8-amd64: +# <<: *pkg-deb +# needs: [build-debian-8-amd64] +# image: registry.labs.nic.cz/labs/bird:debian-8-amd64 + +# Dpkg error: PATH is not set +#pkg-debian-8-i386: +# <<: *pkg-deb +# needs: [build-debian-8-i386] +# image: registry.labs.nic.cz/labs/bird:debian-8-i386 + +# Dpkg error: PATH is not set pkg-debian-9-amd64: - <<: *pkg-debian + <<: *pkg-deb needs: [build-debian-9-amd64] image: registry.labs.nic.cz/labs/bird:debian-9-amd64 +# Dpkg error: PATH is not set pkg-debian-9-i386: - <<: *pkg-debian + <<: *pkg-deb needs: [build-debian-9-i386] image: registry.labs.nic.cz/labs/bird:debian-9-i386 pkg-debian-10-amd64: - <<: *pkg-debian + <<: *pkg-deb needs: [build-debian-10-amd64] image: registry.labs.nic.cz/labs/bird:debian-10-amd64 pkg-debian-10-i386: - <<: *pkg-debian + <<: *pkg-deb needs: [build-debian-10-i386] image: registry.labs.nic.cz/labs/bird:debian-10-i386 pkg-debian-11-amd64: - <<: *pkg-debian + <<: *pkg-deb needs: [build-debian-11-amd64] image: registry.labs.nic.cz/labs/bird:debian-11-amd64 +pkg-fedora-30-amd64: + <<: *pkg-rpm-wa + needs: [build-fedora-30-amd64] + image: registry.labs.nic.cz/labs/bird:fedora-30-amd64 + +pkg-fedora-31-amd64: + <<: *pkg-rpm-wa + needs: [build-fedora-31-amd64] + image: registry.labs.nic.cz/labs/bird:fedora-31-amd64 + +pkg-fedora-32-amd64: + <<: *pkg-rpm-wa + needs: [build-fedora-32-amd64] + image: registry.labs.nic.cz/labs/bird:fedora-32-amd64 + +pkg-fedora-33-amd64: + <<: *pkg-rpm-wa + needs: [build-fedora-33-amd64] + image: registry.labs.nic.cz/labs/bird:fedora-33-amd64 + +pkg-fedora-34-amd64: + <<: *pkg-rpm + needs: [build-fedora-34-amd64] + image: registry.labs.nic.cz/labs/bird:fedora-34-amd64 + +# UnicodeDecodeError +#pkg-centos-7-amd64: +# <<: *pkg-rpm-wa +# needs: [build-centos-7-amd64] +# image: registry.labs.nic.cz/labs/bird:centos-7-amd64 + +pkg-centos-8-amd64: + <<: *pkg-rpm-wa + needs: [build-centos-8-amd64] + image: registry.labs.nic.cz/labs/bird:centos-8-amd64 + +pkg-ubuntu-18.04-amd64: + <<: *pkg-deb + needs: [build-ubuntu-18_04-amd64] + image: registry.labs.nic.cz/labs/bird:ubuntu-18.04-amd64 + +pkg-ubuntu-20.04-amd64: + <<: *pkg-deb + needs: [build-ubuntu-20_04-amd64] + image: registry.labs.nic.cz/labs/bird:ubuntu-20.04-amd64 + +pkg-ubuntu-20.10-amd64: + <<: *pkg-deb + needs: [build-ubuntu-20_10-amd64] + image: registry.labs.nic.cz/labs/bird:ubuntu-20.10-amd64 + +#pkg-ubuntu-21.04-amd64: +# <<: *pkg-deb +# needs: [build-ubuntu-21_04-amd64] +# image: registry.labs.nic.cz/labs/bird:ubuntu-21.04-amd64 + +pkg-opensuse-15.1-amd64: + <<: *pkg-rpm-wa + needs: [build-opensuse-15.1-amd64] + image: registry.labs.nic.cz/labs/bird:opensuse-15.1-amd64 + +pkg-opensuse-15.2-amd64: + <<: *pkg-rpm-wa + needs: [build-opensuse-15.2-amd64] + image: registry.labs.nic.cz/labs/bird:opensuse-15.2-amd64 + +pkg-opensuse-15.3-amd64: + <<: *pkg-rpm-wa + needs: [build-opensuse-15.3-amd64] + image: registry.labs.nic.cz/labs/bird:opensuse-15.3-amd64 + build-birdlab: stage: build @@ -454,10 +566,10 @@ test-ospf-ptmp: variables: TEST_NAME: cf-ospf-ptmp -# test-ospf-authentication: -# <<: *test-base -# variables: -# TEST_NAME: cf-ospf-authentication +test-ospf-authentication: + <<: *test-base + variables: + TEST_NAME: cf-ospf-authentication test-ospf-bfd: <<: *test-base -- cgit v1.2.3