diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 0a17967..9e78201 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -5,6 +5,14 @@ msvsphere.ci Release Notes .. contents:: Topics +v0.1.12 +======= + +Minor Changes +------------- + +- koji_server - add support for both old and new Koji DB schema paths. + v0.1.11 ======= diff --git a/changelogs/.plugin-cache.yaml b/changelogs/.plugin-cache.yaml index da8a46c..9703a26 100644 --- a/changelogs/.plugin-cache.yaml +++ b/changelogs/.plugin-cache.yaml @@ -68,4 +68,4 @@ plugins: strategy: {} test: {} vars: {} -version: 0.1.11 +version: 0.1.12 diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml index 5a46459..221cf72 100644 --- a/changelogs/changelog.yaml +++ b/changelogs/changelog.yaml @@ -37,6 +37,13 @@ releases: fragments: - 8-install-extra-lorax-deps.yml release_date: '2024-03-06' + 0.1.12: + changes: + minor_changes: + - koji_server - add support for both old and new Koji DB schema paths. + fragments: + - 9-handle-koji-schema-path-change.yml + release_date: '2024-04-19' 0.1.2: objects: role: diff --git a/changelogs/fragments-archive/9-handle-koji-schema-path-change.yml b/changelogs/fragments-archive/9-handle-koji-schema-path-change.yml new file mode 100644 index 0000000..8a2b910 --- /dev/null +++ b/changelogs/fragments-archive/9-handle-koji-schema-path-change.yml @@ -0,0 +1,3 @@ +--- +minor_changes: + - koji_server - add support for both old and new Koji DB schema paths. diff --git a/galaxy.yml b/galaxy.yml index f89fd05..7ca0c69 100644 --- a/galaxy.yml +++ b/galaxy.yml @@ -1,6 +1,6 @@ namespace: msvsphere name: ci -version: 0.1.11 +version: 0.1.12 readme: README.md authors: - Eugene Zamriy diff --git a/roles/koji_server/tasks/main.yml b/roles/koji_server/tasks/main.yml index 99087bb..0f0ec0a 100644 --- a/roles/koji_server/tasks/main.yml +++ b/roles/koji_server/tasks/main.yml @@ -42,14 +42,28 @@ register: koji_database_initialized changed_when: "koji_database_initialized.failed" -- name: Initialize Koji database +- name: Check if /usr/share/doc/koji/docs/schema.sql file exists + ansible.builtin.stat: + path: /usr/share/doc/koji/docs/schema.sql + register: koji_docs_schema_result + +- name: Initialize Koji database from /usr/share/doc/koji/docs/schema.sql community.postgresql.postgresql_query: db: "{{ koji_db_name }}" login_user: "{{ koji_db_user }}" login_password: "{{ koji_db_password }}" login_host: "{{ koji_db_server_ip }}" path_to_script: /usr/share/doc/koji/docs/schema.sql - when: koji_database_initialized.failed + when: koji_database_initialized.failed and koji_docs_schema_result.stat.exists + +- name: Initialize Koji database from /usr/share/koji/schema.sql + community.postgresql.postgresql_query: + db: "{{ koji_db_name }}" + login_user: "{{ koji_db_user }}" + login_password: "{{ koji_db_password }}" + login_host: "{{ koji_db_server_ip }}" + path_to_script: /usr/share/koji/schema.sql + when: koji_database_initialized.failed and not koji_docs_schema_result.stat.exists - name: Check if Koji admin DB user exists community.postgresql.postgresql_query: