Merge "relocate /www to /var/www"

automated-pytest-suite/consts/filepaths.py

@@ -13,7 +13,7 @@ class StxPath:
     HEAT = '~/heat/'
     BACKUPS = '/opt/backups'
     CUSTOM_HEAT_TEMPLATES = '~/custom_heat_templates/'
-    HELM_CHARTS_DIR = '/www/pages/helm_charts/'
+    HELM_CHARTS_DIR = '/var/www/pages/helm_charts/'
     DOCKER_CONF = '/etc/docker-distribution/registry/config.yml'
     DOCKER_REPO = '/var/lib/docker-distribution/docker/registry/v2/repositories'
 

automated-pytest-suite/testcases/functional/z_containers/test_custom_containers.py

@@ -292,14 +292,14 @@ def test_upload_charts_via_helm_upload(copy_test_apps):
 
     Test Steps:
         - Upload helm charts from given controller via 'helm-upload <tar_file>'
-        - Verify the charts appear at /www/pages/helm_charts/ on both
+        - Verify the charts appear at /var/www/pages/helm_charts/ on both
             controllers (if applicable)
 
     """
     app_dir = copy_test_apps
 
     LOG.tc_step("Upload helm charts via helm-upload cmd from active controller "
-                "and check charts are in /www/pages/")
+                "and check charts are in /var/www/pages/")
     file_path = container_helper.upload_helm_charts(
         tar_file=os.path.join(app_dir, HELM_TAR), delete_first=True)[1]
 

automated-robot-suite/Tests/Setup.robot

@@ -108,7 +108,7 @@ Copy Install Packages
     # -- Transfer directories with packages
     ${destination_dir}    Set Variable    /home/${CLI_USER_NAME}/
     ${destination_move}    Set Variable
-    ...    /www/pages/feed/rel-${${current_version.strip('"')}}
+    ...    /var/www/pages/feed/rel-${${current_version.strip('"')}}
     SSHLibrary.Put Directory    ${source_pkg}    ${destination_dir}   mode=0755
     SSHLibrary.Put Directory    ${source_repo}    ${destination_dir}  mode=0755
     Execute Sudo Command