Commit 9001b6b7 authored by ale's avatar ale

Merge branch 'debian-dist' into 'master'

Limit float_debian_dist to switching apt sources

See merge request !92
parents 468e5182 b161243f
Pipeline #6019 failed with stages
in 12 minutes and 48 seconds
......@@ -5,10 +5,10 @@
- set_fact:
container_runtime: "docker"
when: "float_debian_dist == 'stretch'"
when: "ansible_distribution_release == 'stretch'"
- include_tasks: buster_upgrade.yml
when: "float_debian_dist == 'buster'"
when: "ansible_distribution_release == 'buster'"
- include_tasks: docker.yml
when: "container_runtime == 'docker'"
......
......@@ -104,7 +104,7 @@
register: mariadb_systemd_unit
- name: Bootstrap data directory
shell: "/usr/bin/mysql_install_db --defaults-file={{ mariadb_config }} --datadir={{ mariadb_data_dir }} --user=mysql --auth-root-authentication-method=socket {{ float_debian_dist == 'stretch' and '--skip-auth-anonymous-user' or '' }} && date > {{ mariadb_data_dir }}/.float-bootstrap-ok"
shell: "/usr/bin/mysql_install_db --defaults-file={{ mariadb_config }} --datadir={{ mariadb_data_dir }} --user=mysql --auth-root-authentication-method=socket {{ ansible_distribution_release == 'stretch' and '--skip-auth-anonymous-user' or '' }} && date > {{ mariadb_data_dir }}/.float-bootstrap-ok"
args:
creates: "{{ mariadb_data_dir }}/.float-bootstrap-ok"
......
......@@ -13,11 +13,11 @@
docker_image:
name: registry.git.autistici.org/ai3/float:integration-test
force: true
when: "float_debian_dist == 'stretch'"
when: "ansible_distribution_release == 'stretch'"
- name: Setup test Docker image
command: "podman pull registry.git.autistici.org/ai3/float:integration-test"
when: "float_debian_dist != 'stretch'"
when: "ansible_distribution_release != 'stretch'"
- name: Run tests
command: docker run --net host --mount type=bind,source=/tmp/test-config.yml,destination=/test-config.yml registry.git.autistici.org/ai3/float:integration-test
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