From 8cda3639e87d85df94c3020a076977f372ded79e Mon Sep 17 00:00:00 2001 From: Bin Qian Date: Mon, 16 Aug 2021 16:25:47 -0400 Subject: [PATCH] relocate /www to /var/www Relocate writable /www to /var/www Story: 2009101 Task: 43543 Depends-on: https://review.opendev.org/c/starlingx/metal/+/810023 Change-Id: Icf0c69acba0693d817de3a538b74740619efa3d0 Signed-off-by: Bin Qian --- automated-pytest-suite/consts/filepaths.py | 2 +- .../functional/z_containers/test_custom_containers.py | 4 ++-- automated-robot-suite/Tests/Setup.robot | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/automated-pytest-suite/consts/filepaths.py b/automated-pytest-suite/consts/filepaths.py index aa40aa1..2c86680 100755 --- a/automated-pytest-suite/consts/filepaths.py +++ b/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' diff --git a/automated-pytest-suite/testcases/functional/z_containers/test_custom_containers.py b/automated-pytest-suite/testcases/functional/z_containers/test_custom_containers.py index f9e49e0..e103a5d 100644 --- a/automated-pytest-suite/testcases/functional/z_containers/test_custom_containers.py +++ b/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 ' - - 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] diff --git a/automated-robot-suite/Tests/Setup.robot b/automated-robot-suite/Tests/Setup.robot index bf9fb62..9b0a9c3 100644 --- a/automated-robot-suite/Tests/Setup.robot +++ b/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