Commit 17f182ea authored by Tomas Krizek's avatar Tomas Krizek

gitlabci: cleanup

parent b4505894
...@@ -131,56 +131,37 @@ kres-gen: ...@@ -131,56 +131,37 @@ kres-gen:
tags: tags:
- docker - docker
lint:tidy: build:darwin:
<<: *test <<: *test_nodep
when: delayed
start_in: 2 minutes
script: script:
- ninja -C build_ci* tidy - ci/travis.py ${CI_COMMIT_REF_NAME}
lint:pedantic: deckard:
<<: *test_nodep <<: *test_flaky
tags: variables:
- docker TMPDIR: $CI_PROJECT_DIR
- linux
- amd64
script: script:
- meson build_pedantic_gcc -Dwerror=true -Dc_args='-Wpedantic' -Dpostinstall_tests=enabled - ${MESON_TEST} --suite integration
- ninja -C build_pedantic_gcc
- >
CC=clang CXX=clang++ meson build_pedantic_clang -Dwerror=true -Dpostinstall_tests=enabled -Dc_args='
-Wpedantic -Wno-newline-eof -Wno-gnu-zero-variadic-macro-arguments -Wno-gnu-folding-constant'
- ninja -C build_pedantic_clang
lint:other: doc:
<<: *test_nodep <<: *test_nodep
stage: test when: delayed
start_in: '30 seconds'
script: script:
- meson build_ci_lint - meson build_doc -Ddoc=enabled
- ninja -C build_ci* pylint - ninja -C build_doc doc
- ninja -C build_ci* flake8
- ninja -C build_ci* luacheck
lint:scan-build:
<<: *test
stage: test
artifacts: artifacts:
when: on_failure expire_in: 1 hour
expire_in: '1 day'
paths: paths:
- build_ci*/meson-logs/scanbuild - doc/html
before_script: []
script:
- export SCANBUILD="scan-build --status-bugs -no-failure-reports $(./scripts/get-scanbuild-args.sh)"
- ninja -C build_ci* scan-build || true
- test "$(ls build_ci*/meson-logs/scanbuild/*/report-*.html | wc -l)" = 29 # we have this many errors ATM :-)
docker: docker:
stage: test <<: *test_nodep
image: docker:latest image: docker:latest
except:
- master
tags: tags:
- dind - dind
dependencies: []
variables: variables:
DOCKER_IMAGE_NAME: knot-resolver-test:${CI_COMMIT_SHA} DOCKER_IMAGE_NAME: knot-resolver-test:${CI_COMMIT_SHA}
script: script:
...@@ -190,92 +171,51 @@ docker: ...@@ -190,92 +171,51 @@ docker:
- docker rmi ${DOCKER_IMAGE_NAME} - docker rmi ${DOCKER_IMAGE_NAME}
- docker rmi $(docker images -f "dangling=true" -q) - docker rmi $(docker images -f "dangling=true" -q)
doc: lint:other:
<<: *test_nodep <<: *test_nodep
script: when: delayed
- meson build_doc -Ddoc=enabled start_in: '30 seconds'
- ninja -C build_doc doc
artifacts:
expire_in: 1 hour
paths:
- doc/html
deckard:
<<: *test_flaky
variables:
TMPDIR: $CI_PROJECT_DIR
script:
- ${MESON_TEST} --suite integration
test:valgrind:
<<: *test
script:
- ${MESON_TEST} --suite unit --suite config --wrap="valgrind --leak-check=full --trace-children=yes --quiet --suppressions=/lj.supp"
build:darwin:
stage: test stage: test
except:
- master
script: script:
- ci/travis.py ${CI_COMMIT_REF_NAME} - meson build_ci_lint &>/dev/null
dependencies: [] - ninja -C build_ci* pylint
tags: - ninja -C build_ci* flake8
- docker - ninja -C build_ci* luacheck
# temporarily disabled - we need to fix issues first lint:pedantic:
#deckard:valgrind: <<: *test_nodep
# stage: test when: delayed
# script: start_in: '30 seconds'
# # TODO: valgrind missing parameter --error-exitcode=1 to fail make on error
# - cd tests/deckard && DAEMON=valgrind ADDITIONAL="--leak-check=full --trace-children=yes --quiet --suppressions=/lj.supp $PREFIX/sbin/kresd -f 1" MAKEFLAGS="-j $(nproc) --keep-going" make
# artifacts:
# when: on_failure
# expire_in: 1 week
# paths:
# - tmpdeckard*
# dependencies:
# - build
# tags:
# - docker
# - linux
# - amd64
pytests:lint:
stage: test
dependencies: []
except:
- master
script:
- ./ci/pytests/lint.sh
tags: tags:
- docker - docker
- linux - linux
- amd64 - amd64
script:
- meson build_pedantic_gcc -Dwerror=true -Dc_args='-Wpedantic' -Dpostinstall_tests=enabled
- ninja -C build_pedantic_gcc
- >
CC=clang CXX=clang++ meson build_pedantic_clang -Dwerror=true -Dpostinstall_tests=enabled -Dc_args='
-Wpedantic -Wno-newline-eof -Wno-gnu-zero-variadic-macro-arguments -Wno-gnu-folding-constant'
- ninja -C build_pedantic_clang
respdiff:basic: lint:scan-build:
<<: *test <<: *test
script: stage: test
- ulimit -n "$(ulimit -Hn)" # applies only for kresd ATM
- ./ci/respdiff/start-resolvers.sh
- ./ci/respdiff/run-respdiff-tests.sh udp
- cat results/respdiff.txt
- echo 'test if mismatch rate < 1.0 %'
- grep -q '^target disagrees.*0\.[0-9][0-9] %' results/respdiff.txt
after_script:
- killall --wait kresd
artifacts: artifacts:
when: always when: on_failure
expire_in: '1 week' expire_in: '1 day'
paths: paths:
- kresd.log.xz - build_ci*/meson-logs/scanbuild
- results/*.txt before_script: []
- results/*.png script:
- results/respdiff.db/data.mdb.xz - export SCANBUILD="scan-build --status-bugs -no-failure-reports $(./scripts/get-scanbuild-args.sh)"
- ./*.info - ninja -C build_ci* scan-build || true
tags: - test "$(ls build_ci*/meson-logs/scanbuild/*/report-*.html | wc -l)" = 29 # we have this many errors ATM :-)
- docker
- linux lint:tidy:
- amd64 <<: *test
script:
- ninja -C build_ci* tidy
.pkgbuild: &pkgbuild .pkgbuild: &pkgbuild
stage: test stage: test
...@@ -311,6 +251,37 @@ pkg:fedora-29: ...@@ -311,6 +251,37 @@ pkg:fedora-29:
- mock --no-clean --old-chroot -r fedora-29-x86_64 --rebuild *.src.rpm || (cat /var/lib/mock/fedora-29-x86_64/result/build.log; false) - mock --no-clean --old-chroot -r fedora-29-x86_64 --rebuild *.src.rpm || (cat /var/lib/mock/fedora-29-x86_64/result/build.log; false)
after_script: after_script:
- mv /var/lib/mock/fedora-29-x86_64/result fedora-29-x86_64 - mv /var/lib/mock/fedora-29-x86_64/result fedora-29-x86_64
respdiff:basic:
<<: *test
script:
- ulimit -n "$(ulimit -Hn)" # applies only for kresd ATM
- ./ci/respdiff/start-resolvers.sh
- ./ci/respdiff/run-respdiff-tests.sh udp
- cat results/respdiff.txt
- echo 'test if mismatch rate < 1.0 %'
- grep -q '^target disagrees.*0\.[0-9][0-9] %' results/respdiff.txt
after_script:
- killall --wait kresd
artifacts:
when: always
paths:
- kresd.log.xz
- results/*.txt
- results/*.png
- results/respdiff.db/data.mdb.xz
- ./*.info
tags:
- docker
- linux
- amd64
test:valgrind:
<<: *test
when: delayed
start_in: '30 seconds'
script:
- ${MESON_TEST} --suite unit --suite config --wrap="valgrind --leak-check=full --trace-children=yes --quiet --suppressions=/lj.supp"
# }}} # }}}
# extended {{{ # extended {{{
......
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