Skip to content

Commit

Permalink
Merge pull request #2028 from tpurschke/develop
Browse files Browse the repository at this point in the history
Develop minor enhancements
  • Loading branch information
tpurschke authored Mar 18, 2023
2 parents c3f272e + f7dd063 commit 44fcfab
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 2 deletions.
4 changes: 3 additions & 1 deletion documentation/revision-history.md
Original file line number Diff line number Diff line change
Expand Up @@ -275,5 +275,7 @@ adding report template format fk and permissions
- adding import modules for Palo Alto and Azure Firewall
- Workflow Module: adding delete rule request and integrated path analysis into workflow

### 6.2.1 17.03.2023 MAIN
### 6.2.1 18.03.2023 MAIN
- fix ldap issues - closes ldap bugs #2023
- reduced logging in release mode
- hasura v2.21.0 upgrade
2 changes: 1 addition & 1 deletion inventory/group_vars/apiserver.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ api_hasura_admin_test_password: "not4production"
api_user_email: "{{ api_user }}@{{ api_network_listening_ip_address }}"
api_home: "{{ fworch_home }}/api"
api_hasura_cli_bin: "{{ fworch_home }}/api/bin/hasura"
api_hasura_version: "v2.16.1"
api_hasura_version: "v2.21.0"
api_project_name: api
api_no_metadata: false
api_rollback_is_running: false
Expand Down
11 changes: 11 additions & 0 deletions roles/test/tasks/test-web.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# this playbook contains web server availabitlity tests

# TODO - find out why UI sometimes crashes during upgrade of heavy data installations
- name: restart UI to avoid testing against crashed UI
ansible.builtin.systemd:
name: "{{ product_name }}-ui"
state: restarted
become: true
when: "'frontends' in group_names"

- name: test web server availability
uri:
url: "{{ loop_url }}"
Expand All @@ -12,6 +20,9 @@
register: web_call_result
changed_when: false
failed_when: false
until: web_call_result.status == 200
retries: 10 # 10 * 5 seconds
delay: 5 # Every 5 seconds
loop:
- "{{ middleware_uri }}/swagger/"
- https://{{ ui_hostname }}/
Expand Down

0 comments on commit 44fcfab

Please sign in to comment.