Cleanup migration warning

equinor · Nov 12, 2024 · b4cd732 · b4cd732
1 parent c43738f
commit b4cd732
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 33 deletions.
diff --git a/komodo/data/activator_switch.csh.tmpl b/komodo/data/activator_switch.csh.tmpl
@@ -31,11 +31,7 @@ else if ( `uname -r` =~ *el8* ) then
     setenv KOMODO_RELEASE $KOMODO_RELEASE_REAL
 {%- endif %}
 else if ( `uname -r` =~ *el6* ) then
-{% filter indent(4, True) -%}
-{% for line in migration_warning.split('\n') -%}
-    echo "{{ line }}"
-{% endfor -%}
-{% endfilter -%}
+    echo -e "{{ migration_warning }}"
 else
     echo "Attention! Your machine is running on an environment that is not supported."
 endif
diff --git a/komodo/data/activator_switch.tmpl b/komodo/data/activator_switch.tmpl
@@ -10,17 +10,7 @@ if [[ $(uname -r) == *el7* ]] ; then
         export PS1="(${KOMODO_RELEASE_REAL}) ${_PRE_KOMODO_PS1}"
         export KOMODO_RELEASE=$KOMODO_RELEASE_REAL
     else
-        echo "Attention! Your machine is running on an environment
- that is not supported. RHEL7 has been phased out.
-From October 2024, komodo versions only support RHEL8.
-Please migrate as soon as possible.
-
-To use the latest stable RHEL7 build use
- source /prog/res/komodo/deprecated-rhel7/enable
-
-If you have any questions or issues -
- contact us on #ert-users on Slack or Equinor's Yammer.
-"
+        echo -e "{{ migration_warning }}"
     fi
 elif [[ $(uname -r) == *el8* ]] ; then
     export KOMODO_ROOT={{ prefix }}

diff --git a/komodo/switch.py b/komodo/switch.py
@@ -5,9 +5,14 @@
 
 MIGRATION_WARNING = (
     "Attention! Your machine is running on an environment "
-    "that is not supported. RHEL6 has been phased out.\n"
-    "From October 2020, komodo versions only support RHEL7.\n"
-    "Please migrate as soon as possible. If you have any questions or issues - "
+    "that is not supported. RHEL7 has been phased out.\n"
+    "From November 2024, komodo versions only support RHEL8.\n"
+    "Please migrate as soon as possible.\n"
+    "To use the latest stable RHEL7 build use either: "
+    "source /prog/res/komodo/deprecated-rhel7/enable\n"
+    "source /prog/res/komodo/deprecated-rhel7/enable.csh\n"
+    "\n"
+    "If you have any questions or issues - "
     "contact us on #ert-users on Slack or Equinor's Yammer."
 )
 

diff --git a/tests/test_switch.py b/tests/test_switch.py
@@ -28,17 +28,7 @@ def test_write_activator_switches(tmpdir):
         export PS1="(${{KOMODO_RELEASE_REAL}}) ${{_PRE_KOMODO_PS1}}"
         export KOMODO_RELEASE=$KOMODO_RELEASE_REAL
     else
-        echo "Attention! Your machine is running on an environment
- that is not supported. RHEL7 has been phased out.
-From October 2024, komodo versions only support RHEL8.
-Please migrate as soon as possible.
-
-To use the latest stable RHEL7 build use
- source /prog/res/komodo/deprecated-rhel7/enable
-
-If you have any questions or issues -
- contact us on #ert-users on Slack or Equinor's Yammer.
-"
+        echo -e "{MIGRATION_WARNING}"
     fi
 elif [[ $(uname -r) == *el8* ]] ; then
     export KOMODO_ROOT={prefix}
@@ -78,9 +68,7 @@ def test_write_activator_switches(tmpdir):
     endif
     setenv KOMODO_RELEASE $KOMODO_RELEASE_REAL
 else if ( `uname -r` =~ *el6* ) then
-    echo "Attention! Your machine is running on an environment that is not supported. RHEL6 has been phased out."
-    echo "From October 2020, komodo versions only support RHEL7."
-    echo "Please migrate as soon as possible. If you have any questions or issues - contact us on #ert-users on Slack or Equinor's Yammer."
+    echo -e "{MIGRATION_WARNING}"
 else
     echo "Attention! Your machine is running on an environment that is not supported."
 endif