blsmith/dc-deployments-automation
1
0
Fork 0
mirror of https://bitbucket.org/atlassian/dc-deployments-automation.git synced 2025-12-14 00:43:06 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix tests

Browse Source
This commit is contained in:
Lee Goolsbee
2020-08-26 16:34:48 -05:00
parent 45c2d01b17
commit 529df0cafd
6 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
roles/confluence_config/molecule/default/tests/test_default.py
View File

@@ -81,8 +81,7 @@ def test_confluence_config_file(host):
assert f.contains('<property name="hibernate.c3p0.preferredTestQuery">select 1;</property>') assert f.contains('<property name="hibernate.c3p0.preferredTestQuery">select 1;</property>')
@pytest.mark.parametrize('font', [ @pytest.mark.parametrize('font', [
# '/usr/lib/jvm/java/lib/fonts/fallback/NotoSansJavanese-Regular.ttf', # '/usr/lib/jvm/java/lib/fonts/fallback/NotoSansJavanese-Regular.ttf'
# '/usr/lib/jvm/jre/lib/fonts/fallback/NotoSansJavanese-Regular.ttf'
'/opt/atlassian/confluence/current/jre/lib/fonts/fallback/NotoSansJavanese-Regular.ttf' '/opt/atlassian/confluence/current/jre/lib/fonts/fallback/NotoSansJavanese-Regular.ttf'
]) ])
def test_fonts_installed_and_linked(host, font): def test_fonts_installed_and_linked(host, font):

3
roles/confluence_config/molecule/system_jdk/tests/test_default.py
View File

@@ -12,8 +12,7 @@ def test_seraph_file(host):
assert f.contains('<param-value>COOKIEAGE</param-value>') assert f.contains('<param-value>COOKIEAGE</param-value>')
@pytest.mark.parametrize('font', [ @pytest.mark.parametrize('font', [
'/usr/lib/jvm/java/lib/fonts/fallback/NotoSansJavanese-Regular.ttf', '/usr/lib/jvm/java/lib/fonts/fallback/NotoSansJavanese-Regular.ttf'
'/usr/lib/jvm/jre/lib/fonts/fallback/NotoSansJavanese-Regular.ttf'
]) ])
def test_fonts_installed_and_linked(host, font): def test_fonts_installed_and_linked(host, font):
f = host.file(font) f = host.file(font)

1
roles/confluence_config/tasks/main.yml
View File

@@ -52,7 +52,6 @@
insertafter: "EOF" insertafter: "EOF"
line: 'export CATALINA_OPTS="${CATALINA_OPTS} {{ atl_catalina_opts }} {{ atl_catalina_opts_extra }}"' line: 'export CATALINA_OPTS="${CATALINA_OPTS} {{ atl_catalina_opts }} {{ atl_catalina_opts_extra }}"'
- name: Configure login properties - name: Configure login properties
template: template:
src: seraph-config.xml.j2 src: seraph-config.xml.j2

3
roles/product_common/molecule/system_jdk/tests/test_default.py
View File

@@ -15,8 +15,7 @@ def test_user_created(host):
@pytest.mark.parametrize('exe', [ @pytest.mark.parametrize('exe', [
'/usr/bin/git', '/usr/bin/git',
'/usr/bin/javac', '/usr/bin/javac',
'/usr/lib/jvm/java/bin/java', '/usr/lib/jvm/java/bin/java'
'/usr/lib/jvm/java/jre/bin/java'
]) ])
def test_package_exes(host, exe): def test_package_exes(host, exe):
assert host.file(exe).exists assert host.file(exe).exists

17
roles/product_common/tasks/ubuntu.yml
View File

@@ -3,6 +3,21 @@
- name: Add AdoptOpenJDK repo and install if necessary on Ubuntu - name: Add AdoptOpenJDK repo and install if necessary on Ubuntu
block: block:
- name: Create translation matrix for ansible_architecture values to Ubuntu/Debian nomenclature
set_fact:
debian_architecture_translations:
x86_64: amd64
aarch64: arm64
- name: Set debian_architecture based on ansible_architecture
set_fact:
debian_architecture: >-
{%- if ansible_architecture in debian_architecture_translations -%}
{{ debian_architecture_translations[ansible_architecture] }}
{%- else -%}
{{ ansible_architecture }}
{%- endif %}
- name: Install gnupg - name: Install gnupg
apt: apt:
name: gnupg name: gnupg
@@ -29,7 +44,7 @@
alternatives: alternatives:
link: "/usr/lib/jvm/java" link: "/usr/lib/jvm/java"
name: "java_sdk" name: "java_sdk"
path: "/usr/lib/jvm/adoptopenjdk-{{ java_major_version }}-hotspot" path: "/usr/lib/jvm/adoptopenjdk-{{ java_major_version }}-hotspot-{{ debian_architecture }}"
priority: 99 priority: 99
when: atl_use_system_jdk when: atl_use_system_jdk