Commit 2f7ff298 authored by Ondřej Surý's avatar Ondřej Surý
Browse files

Merge build and test steps

parent a795dfde
...@@ -6,7 +6,6 @@ variables: ...@@ -6,7 +6,6 @@ variables:
stages: stages:
- build - build
- test
.debian-jessie-amd64: &debian_jessie_amd64_image .debian-jessie-amd64: &debian_jessie_amd64_image
image: "$CI_REGISTRY_IMAGE:debian-jessie-amd64" image: "$CI_REGISTRY_IMAGE:debian-jessie-amd64"
...@@ -56,13 +55,25 @@ stages: ...@@ -56,13 +55,25 @@ stages:
- linux - linux
- docker - 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 .ubuntu-xenial-amd64: &ubuntu_xenial_amd64_image
image: "$CI_REGISTRY_IMAGE:ubuntu-xenial-amd64" image: "$CI_REGISTRY_IMAGE:ubuntu-xenial-amd64"
tags: tags:
- linux - linux
- docker - docker
.ubuntu-xenial-amd64: &ubuntu_xenial_i386_image .ubuntu-xenial-i386: &ubuntu_xenial_i386_image
image: "$CI_REGISTRY_IMAGE:ubuntu-xenial-i386" image: "$CI_REGISTRY_IMAGE:ubuntu-xenial-i386"
tags: tags:
- linux - linux
...@@ -71,10 +82,12 @@ stages: ...@@ -71,10 +82,12 @@ stages:
.build: &build_job .build: &build_job
stage: build stage: build
before_script: before_script:
- bash bin/tests/system/ifconfig.sh up
- ./autogen.sh - ./autogen.sh
script: script:
- ./configure - ./configure
- make -k all V=1 - make -k all V=1
- make -k check V=1
artifacts: artifacts:
untracked: true untracked: true
expire_in: '1 hour' expire_in: '1 hour'
...@@ -82,92 +95,36 @@ stages: ...@@ -82,92 +95,36 @@ stages:
.test: &test_job .test: &test_job
stage: test stage: test
before_script: before_script:
- bash bin/tests/system/ifconfig.sh up
script: script:
- make -k check V=1
build:debian:jessie:amd64: build:debian:jessie:amd64:
<<: *debian_jessie_amd64_image <<: *debian_jessie_amd64_image
<<: *build_job <<: *build_job
test:debian:jessie:amd64:
<<: *debian_jessie_amd64_image
<<: *test_job
dependencies:
- build:debian:jessie:amd64
build:debian:jessie:i386: build:debian:jessie:i386:
<<: *debian_jessie_i386_image <<: *debian_jessie_i386_image
<<: *build_job <<: *build_job
test:debian:jessie:i386:
<<: *debian_jessie_i386_image
<<: *test_job
dependencies:
- build:debian:jessie:i386
####
build:debian:stretch:amd64: build:debian:stretch:amd64:
<<: *debian_stretch_amd64_image <<: *debian_stretch_amd64_image
<<: *build_job <<: *build_job
test:debian:stretch:amd64: build:debian:buster:i386:
<<: *debian_stretch_amd64_image <<: *debian_buster_i386_image
<<: *test_job
dependencies:
- build:debian:stretch:amd64
build:debian:stretch:i386:
<<: *debian_stretch_i386_image
<<: *build_job <<: *build_job
test:debian:stretch:i386:
<<: *debian_stretch_i386_image
<<: *test_job
dependencies:
- build:debian:stretch:i386
####
build:debian:sid:amd64: build:debian:sid:amd64:
<<: *debian_sid_amd64_image <<: *debian_sid_amd64_image
<<: *build_job <<: *build_job
test:debian:sid:amd64:
<<: *debian_sid_amd64_image
<<: *test_job
dependencies:
- build:debian:sid:amd64
build:debian:sid:i386: build:debian:sid:i386:
<<: *debian_sid_i386_image <<: *debian_sid_i386_image
<<: *build_job <<: *build_job
test:debian:sid:i386: build:ubuntu:trusty:amd64:
<<: *debian_sid_i386_image <<: *ubuntu_trusty_amd64_image
<<: *test_job
dependencies:
- build:debian:sid:i386
####
build:ubuntu:xenial:amd64:
<<: *ubuntu_xenial_amd64_image
<<: *build_job <<: *build_job
test:ubuntu:xenial:amd64:
<<: *ubuntu_xenial_amd64_image
<<: *test_job
dependencies:
- build:ubuntu:xenial:amd64
build:ubuntu:xenial:i386: build:ubuntu:xenial:i386:
<<: *ubuntu_xenial_i386_image <<: *ubuntu_xenial_i386_image
<<: *build_job <<: *build_job
test:ubuntu:xenial:i386:
<<: *ubuntu_xenial_i386_image
<<: *test_job
dependencies:
- build:ubuntu:xenial:i386
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment