diff --git a/roles/squash_tm/defaults/main.yml b/roles/squash_tm/defaults/main.yml index 6d322ab..ec35b7f 100644 --- a/roles/squash_tm/defaults/main.yml +++ b/roles/squash_tm/defaults/main.yml @@ -1,11 +1,11 @@ --- # Version of Shash TM to install -squashtm_version: 3.0.5 +squashtm_version: 5.1.0 # Archive URL which will be downloaded during install/upgrades squashtm_archive_url: https://nexus.squashtest.org/nexus/repository/public-releases/tm/core/squash-tm-distribution/{{ squashtm_version }}.RELEASE/squash-tm-{{ squashtm_version }}.RELEASE.tar.gz # Expected checksum of the archive -squashtm_archive_sha256: 4e5cc42a774866ac1d91bd938efd833eb952f36bbdd875a67e8bc2f0ca2407ff +squashtm_archive_sha256: f03f7df42f0d88d6ec3e704ad78ce74a34ac3e575f6d6d6621699fd2e2859183 # Should ansible handle upgrades ? (if False, only initial install and configuration will be done) squashtm_manage_upgrade: True diff --git a/roles/squash_tm/tasks/archive_post.yml b/roles/squash_tm/tasks/archive_post.yml index 6e12e95..ec94e1f 100644 --- a/roles/squash_tm/tasks/archive_post.yml +++ b/roles/squash_tm/tasks/archive_post.yml @@ -4,7 +4,6 @@ command: tar cf {{ squashtm_root_dir }}/archives/{{ squashtm_current_version }}.tar.zst --use-compress-program=zstd ./ args: chdir: "{{ squashtm_root_dir }}/archives/{{ squashtm_current_version }}" - warn: False environment: ZSTD_CLEVEL: 10 ZSTD_NBTHREADS: 0 diff --git a/roles/squash_tm/tasks/install.yml b/roles/squash_tm/tasks/install.yml index 02b1b4f..d20ca7a 100644 --- a/roles/squash_tm/tasks/install.yml +++ b/roles/squash_tm/tasks/install.yml @@ -118,7 +118,7 @@ - name: List database upgrade scripts shell: > - ls /opt/squash_tm/app/database-scripts/{{ (squashtm_db_engine == 'postgres') | ternary('postgresql', 'mysql') }}-* | + ls /opt/squash_tm/app/database-scripts/{{ (squashtm_db_engine == 'postgres') | ternary('postgresql', 'mariadb') }}-* | grep 'upgrade-to' | perl -pe 's/.*upgrade\-to\-(\d+(\.\d+)+).*/$1/' | sort --version-sort @@ -130,7 +130,7 @@ mysql_db: db: "{{ squashtm_db_name }}" state: import - target: "{{ squashtm_root_dir }}/app/database-scripts/{{ (squashtm_db_engine == 'postgres') | ternary('postgresql', 'mysql') }}-upgrade-to-{{ item }}.sql" + target: "{{ squashtm_root_dir }}/app/database-scripts/{{ (squashtm_db_engine == 'postgres') | ternary('postgresql', 'mariadb') }}-upgrade-to-{{ item }}.sql" login_host: "{{ squashtm_db_server }}" login_port: "{{ squashtm_db_port }}" login_user: "{{ squashtm_db_user }}" diff --git a/roles/squash_tm/templates/env.j2 b/roles/squash_tm/templates/env.j2 index 4bb4923..48019a9 100644 --- a/roles/squash_tm/templates/env.j2 +++ b/roles/squash_tm/templates/env.j2 @@ -6,4 +6,4 @@ CONF_DIR={{ squashtm_root_dir }}/etc LOG_DIR={{ squashtm_root_dir }}/logs TOMCAT_HOME={{ squashtm_root_dir }}/data/tomcat PLUGINS_DIR={{ squashtm_root_dir }}/app/plugins -DB_TYPE={{ (squashtm_db_engine == 'postgres') | ternary('postgresql', 'mysql') }} +DB_TYPE={{ (squashtm_db_engine == 'postgres') | ternary('postgresql', 'mariadb') }} diff --git a/roles/squash_tm/templates/squash.tm.cfg.properties.j2 b/roles/squash_tm/templates/squash.tm.cfg.properties.j2 index f68a53d..4c938b4 100644 --- a/roles/squash_tm/templates/squash.tm.cfg.properties.j2 +++ b/roles/squash_tm/templates/squash.tm.cfg.properties.j2 @@ -1,4 +1,4 @@ -spring.datasource.url=jdbc:{{ (squashtm_db_engine == 'postgres') | ternary('postgresql', 'mysql') }}://{{ squashtm_db_server }}:{{ squashtm_db_port }}/{{ squashtm_db_name }} +spring.datasource.url=jdbc:{{ (squashtm_db_engine == 'postgres') | ternary('postgresql', 'mariadb') }}://{{ squashtm_db_server }}:{{ squashtm_db_port }}/{{ squashtm_db_name }} spring.datasource.username={{ squashtm_db_user }} spring.datasource.password={{ squashtm_db_pass }}