Commit b2ad9443 authored by Tomas Krizek's avatar Tomas Krizek

Merge branch 'ci-nitpicks' into 'master'

ci: nitpicks & minor distrotests fixes

See merge request knot/knot-resolver!834
parents 625f4882 aee666ac
......@@ -508,8 +508,8 @@ obs:build:all:
<<: *deploytest
script:
- "osc results home:CZ-NIC:$OBS_REPO knot-resolver -w"
- >
! osc ls -b home:CZ-NIC:$OBS_REPO knot-resolver | \
- > # check version only for one (reliable) repo to avoid false negatives
! osc ls -b home:CZ-NIC:$OBS_REPO knot-resolver Debian_9.0 x86_64 | \
grep -E '(rpm|deb|tar\.xz)$' | grep -v $CI_COMMIT_SHORT_SHA || \
(echo "ERROR: version mismatch"; exit 1)
- >
......@@ -524,7 +524,7 @@ obs:build:all:
- >
osc results home:CZ-NIC:$OBS_REPO knot-resolver -a x86_64 -r $DISTROTEST_REPO --csv | grep 'succeeded|$' -q || \
(echo "ERROR: build failed"; exit 1)
- export LABEL="gl$(date +%s)_$DISTROTEST_REPO"
- export LABEL="gl$(date +%s)_$OBS_REPO"
- export COMMITDIR="/var/tmp/respdiff-jobs/$(git rev-parse --short HEAD)-$LABEL"
- export TESTDIR="$COMMITDIR/distrotest.$DISTROTEST_NAME"
- ln -s $COMMITDIR distrotest_commitdir
......
......@@ -39,7 +39,7 @@ while time.time() < end_time:
if state == "passed":
exit("Travis CI Result: PASSED!", code=0)
elif state == "created" or state == "started":
continue
pass
else:
exit("Travis CI Result: {}!".format(state.upper()))
else:
......
......@@ -2,3 +2,4 @@
# additional paths to search for roles in, colon separated
roles_path = ../ansible-roles
interpreter_python = auto
......@@ -9,7 +9,7 @@
package:
name: '*'
state: latest
when: update_packages
when: update_packages|bool
- name: Install packages
package:
......
......@@ -18,7 +18,12 @@ Vagrant.configure(2) do |config|
config.vm.provider :libvirt do |libvirt|
libvirt.cpus = 1
libvirt.memory = 512
libvirt.memory = 1024
end
config.vm.provider :virtualbox do |vbox|
vbox.cpus = 1
vbox.memory = 1024
end
end
......@@ -15,7 +15,12 @@ Vagrant.configure(2) do |config|
config.vm.provider :libvirt do |libvirt|
libvirt.cpus = 1
libvirt.memory = 512
libvirt.memory = 1024
end
config.vm.provider :virtualbox do |vbox|
vbox.cpus = 1
vbox.memory = 1024
end
end
......@@ -11,14 +11,19 @@ Vagrant.configure(2) do |config|
machine.vm.provision "ansible" do |ansible|
ansible.playbook = "../knot-resolver-pkgtest.yaml"
ansible.extra_vars = {
ansible_python_interpreter: "/usr/bin/python3"
ansible_python_interpreter: "/usr/bin/python3",
}
end
end
config.vm.provider :libvirt do |libvirt|
libvirt.cpus = 1
libvirt.memory = 512
libvirt.memory = 1024
end
config.vm.provider :virtualbox do |vbox|
vbox.cpus = 1
vbox.memory = 1024
end
end
......@@ -11,14 +11,19 @@ Vagrant.configure(2) do |config|
machine.vm.provision "ansible" do |ansible|
ansible.playbook = "../knot-resolver-pkgtest.yaml"
ansible.extra_vars = {
ansible_python_interpreter: "/usr/bin/python3"
ansible_python_interpreter: "/usr/bin/python3",
}
end
end
config.vm.provider :libvirt do |libvirt|
libvirt.cpus = 1
libvirt.memory = 512
libvirt.memory = 1024
end
config.vm.provider :virtualbox do |vbox|
vbox.cpus = 1
vbox.memory = 1024
end
end
......@@ -7,16 +7,5 @@
vars_files:
- repos.yaml
# HACK: (Fedora) make sure we have the latest-greatest Py3 to avoid issues
gather_facts: false
pre_tasks:
- name: dnf update to latest Python 3
raw: |
dnf install -y python3 || \
:
ignore_errors: true
- name: gather facts
setup:
roles:
- knot_resolver
......@@ -15,7 +15,12 @@ Vagrant.configure(2) do |config|
config.vm.provider :libvirt do |libvirt|
libvirt.cpus = 1
libvirt.memory = 512
libvirt.memory = 1024
end
config.vm.provider :virtualbox do |vbox|
vbox.cpus = 1
vbox.memory = 1024
end
end
......@@ -18,7 +18,12 @@ Vagrant.configure(2) do |config|
config.vm.provider :libvirt do |libvirt|
libvirt.cpus = 1
libvirt.memory = 512
libvirt.memory = 1024
end
config.vm.provider :virtualbox do |vbox|
vbox.cpus = 1
vbox.memory = 1024
end
end
......@@ -18,7 +18,12 @@ Vagrant.configure(2) do |config|
config.vm.provider :libvirt do |libvirt|
libvirt.cpus = 1
libvirt.memory = 512
libvirt.memory = 1024
end
config.vm.provider :virtualbox do |vbox|
vbox.cpus = 1
vbox.memory = 1024
end
end
......@@ -18,7 +18,12 @@ Vagrant.configure(2) do |config|
config.vm.provider :libvirt do |libvirt|
libvirt.cpus = 1
libvirt.memory = 512
libvirt.memory = 1024
end
config.vm.provider :virtualbox do |vbox|
vbox.cpus = 1
vbox.memory = 1024
end
end
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