diff --git a/molecule/default/tests/test_default.py b/molecule/default/tests/test_default.py index 09e1f088568dcce33c1e5f69191e5c57e49fe4a2..1e48fe7fd5a55eac1bd8c19e34cc0fa8e97ff054 100644 --- a/molecule/default/tests/test_default.py +++ b/molecule/default/tests/test_default.py @@ -5,7 +5,7 @@ import testinfra.utils.ansible_runner testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner( os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all') -PHOEBUS_VERSION = '4.6.0-SNAPSHOT' +PHOEBUS_VERSION = '4.6.0' def test_default(host): @@ -22,7 +22,7 @@ def test_default(host): def test_settings(host): - settings = host.file("/opt/ess-phoebus-{}/phoebus.ini".format(PHOEBUS_VERSION)) + settings = host.file("/opt/ess-cs-studio-phoebus-{}/phoebus.ini".format(PHOEBUS_VERSION)) assert settings.exists assert settings.is_file assert settings.contains("org.phoebus.pv.ca/addr_list=127.0.0.1") diff --git a/templates/phoebus.j2 b/templates/phoebus.j2 index 58e96bd3fb4172557371a073e33912a172d1613b..ba44c58f6add13edaff49790b7bcc808cd56e178 100644 --- a/templates/phoebus.j2 +++ b/templates/phoebus.j2 @@ -1,7 +1,7 @@ #!/usr/bin/env bash PHOEBUS_OPTS="{{ phoebus_options }}" -PHOEBUS_JAR={{ phoebus_home }}/ess-phoebus-{{ phoebus_version }}.jar +PHOEBUS_JAR={{ phoebus_home }}/ess-cs-studio-phoebus-{{ phoebus_version }}.jar if [[ -d /opt/conda/envs/csstudio/bin ]] then