gitlabci: simplyfy config

parent 8c8cd69a
...@@ -5,28 +5,27 @@ variables: ...@@ -5,28 +5,27 @@ variables:
stages: stages:
- test - test
test:augeas: .test: &test
stage: test stage: test
script:
- augparse pydnstest/deckard.aug
tags: tags:
- docker - docker
- linux - linux
- amd64 - amd64
test:augeas:
<<: *test
script:
- augparse pydnstest/deckard.aug
test:pep8: test:pep8:
stage: test <<: *test
script: script:
- cp ci/common.sh /tmp - cp ci/common.sh /tmp
- cp ci/compare-pep8.sh /tmp - cp ci/compare-pep8.sh /tmp
- /tmp/compare-pep8.sh - /tmp/compare-pep8.sh
tags:
- docker
- linux
- amd64
test:pylint: test:pylint:
stage: test <<: *test
script: script:
- cp ci/common.sh /tmp - cp ci/common.sh /tmp
- cp ci/compare-pylint.sh /tmp - cp ci/compare-pylint.sh /tmp
...@@ -37,34 +36,22 @@ test:pylint: ...@@ -37,34 +36,22 @@ test:pylint:
paths: paths:
- base.log - base.log
- head.log - head.log
tags:
- docker
- linux
- amd64
test:rplint: test:rplint:
stage: test <<: *test
script: script:
- cp ci/common.sh /tmp - cp ci/common.sh /tmp
- cp ci/compare-rplint.sh /tmp - cp ci/compare-rplint.sh /tmp
- /tmp/compare-rplint.sh - /tmp/compare-rplint.sh
tags:
- docker
- linux
- amd64
test:unittests: test:unittests:
stage: test <<: *test
script: script:
- make check - make check
tags:
- docker
- linux
- amd64
# changes in Deckard itself must not change result of tests # changes in Deckard itself must not change result of tests
test:comparative:kresd: test:comparative:kresd:
stage: test <<: *test
script: script:
# test kresd binary # test kresd binary
- git clone --depth=1 https://gitlab.labs.nic.cz/knot/knot-resolver.git /tmp/kresd-local-build - git clone --depth=1 https://gitlab.labs.nic.cz/knot/knot-resolver.git /tmp/kresd-local-build
...@@ -84,15 +71,11 @@ test:comparative:kresd: ...@@ -84,15 +71,11 @@ test:comparative:kresd:
- modified_tests - modified_tests
- base.xml - base.xml
- head.xml - head.xml
tags:
- docker
- linux
- amd64
# Run all tests on the latest kresd version to ensure that we not push tests # Run all tests on the latest kresd version to ensure that we not push tests
# which do not work on latest kresd. It would lead to breakage in kresd CI. # which do not work on latest kresd. It would lead to breakage in kresd CI.
test:latest:kresd: test:latest:kresd:
stage: test <<: *test
script: script:
- git clone --depth=1 https://gitlab.labs.nic.cz/knot/knot-resolver.git kresd-local-build - git clone --depth=1 https://gitlab.labs.nic.cz/knot/knot-resolver.git kresd-local-build
- GIT_DIR=$(pwd)/kresd-local-build/.git git log -1 - GIT_DIR=$(pwd)/kresd-local-build/.git git log -1
...@@ -105,16 +88,12 @@ test:latest:kresd: ...@@ -105,16 +88,12 @@ test:latest:kresd:
expire_in: 1 week expire_in: 1 week
paths: paths:
- tmpdeckard* - tmpdeckard*
tags:
- docker
- linux
- amd64
# sanity check that Unbound under Deckard still works # sanity check that Unbound under Deckard still works
# I've selected the only tests which are working # I've selected the only tests which are working
# on kresd and Unbound 1.5.8 as well as 1.6.0 # on kresd and Unbound 1.5.8 as well as 1.6.0
test:sanity:unbound: test:sanity:unbound:
stage: test <<: *test
script: script:
- TMPDIR=$(pwd) ./unbound_run.sh -k sets/resolver/iter_hint_lame.rpl - TMPDIR=$(pwd) ./unbound_run.sh -k sets/resolver/iter_hint_lame.rpl
- TMPDIR=$(pwd) ./unbound_run.sh -k sets/resolver/iter_lame_root.rpl - TMPDIR=$(pwd) ./unbound_run.sh -k sets/resolver/iter_lame_root.rpl
...@@ -126,16 +105,12 @@ test:sanity:unbound: ...@@ -126,16 +105,12 @@ test:sanity:unbound:
expire_in: 1 week expire_in: 1 week
paths: paths:
- tmpdeckard* - tmpdeckard*
tags:
- docker
- linux
- amd64
# sanity check that PowerDNS recursor under Deckard still works # sanity check that PowerDNS recursor under Deckard still works
# I've selected couple tests which are working # I've selected couple tests which are working
# on kresd and PowerDNS recursor 4.0.0~alpha2 as well as 4.0.4 # on kresd and PowerDNS recursor 4.0.0~alpha2 as well as 4.0.4
test:sanity:pdnsrecursor: test:sanity:pdnsrecursor:
stage: test <<: *test
script: script:
- TMPDIR=$(pwd) ./pdns_run.sh -k sets/resolver/iter_recurse.rpl - TMPDIR=$(pwd) ./pdns_run.sh -k sets/resolver/iter_recurse.rpl
- TMPDIR=$(pwd) ./pdns_run.sh -k sets/resolver/iter_tcbit.rpl - TMPDIR=$(pwd) ./pdns_run.sh -k sets/resolver/iter_tcbit.rpl
...@@ -144,7 +119,3 @@ test:sanity:pdnsrecursor: ...@@ -144,7 +119,3 @@ test:sanity:pdnsrecursor:
expire_in: 1 week expire_in: 1 week
paths: paths:
- tmpdeckard* - tmpdeckard*
tags:
- docker
- linux
- amd64
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