Test fix

Author: filippomc

deployment/codefresh-test.yaml

@@ -13,13 +13,26 @@ steps:
     repo: ${{CF_REPO_OWNER}}/${{CF_REPO_NAME}}
     revision: ${{CF_BRANCH}}
     git: github
+  post_main_clone:
+    title: Post main clone
+    type: parallel
+    stage: prepare
+    steps:
+      clone_cloud_harness:
+        title: Cloning cloud-harness repository...
+        type: git-clone
+        stage: prepare
+        repo: https://github.com/MetaCell/cloud-harness.git
+        revision: ${{CLOUDHARNESS_BRANCH}}
+        working_directory: .
+        git: github
   prepare_deployment:
     title: Prepare helm chart
     image: python:3.12
     stage: prepare
     working_directory: .
     commands:
-    - bash ./install.sh
+    - bash cloud-harness/install.sh
     - export HELM_NAME_ARG="$( [ -n "${{CHART_NAME}}" ] && printf -- "--name %s" "${{CHART_NAME}}"
       )"
     - export HELM_CHART_VERSION_ARG="$( [ -n "${{CHART_VERSION}}" ] && printf -- "--chart-version
@@ -531,11 +544,11 @@ steps:
     commands:
     - kubectl config use-context ${{CLUSTER_NAME}}
     - kubectl config set-context --current --namespace=test-${{NAMESPACE_BASENAME}}
-    - kubectl rollout status deployment/workflows
-    - kubectl rollout status deployment/accounts
-    - kubectl rollout status deployment/volumemanager
     - kubectl rollout status deployment/samples
+    - kubectl rollout status deployment/accounts
     - kubectl rollout status deployment/common
+    - kubectl rollout status deployment/volumemanager
+    - kubectl rollout status deployment/workflows
     - sleep 60
   tests_nfs_failover:
     stage: qa
@@ -564,6 +577,10 @@ steps:
           image: alpine
           commands:
           - cf_export  FAILED=failed
+    when:
+      condition:
+        all:
+          nfs_test_enabled: '"${{TEST_NFS_FAILOVER}}" == "true"'
   tests_api:
     stage: qa
     title: Api tests
@@ -599,12 +616,12 @@ steps:
         - ${{CF_REPO_NAME}}/applications/samples:/home/test
         - ${{CF_REPO_NAME}}/deployment/helm/values.yaml:/opt/cloudharness/resources/allvalues.yaml
         environment:
-        - APP_URL=https://samples.${{DOMAIN}}/api
+        - APP_URL=https://www.${{DOMAIN}}/api
         - USERNAME=sample@testuser.com
         - PASSWORD=test
         commands:
         - st --pre-run cloudharness_test.apitest_init run api/openapi.yaml --base-url
-          https://samples.${{DOMAIN}}/api -c all --skip-deprecated-operations --exclude-operation-id=submit_sync
+          https://www.${{DOMAIN}}/api -c all --skip-deprecated-operations --exclude-operation-id=submit_sync
           --exclude-operation-id=submit_sync_with_results --exclude-operation-id=error
           --hypothesis-suppress-health-check=too_slow --hypothesis-deadline=180000
           --request-timeout=180000 --hypothesis-max-examples=2 --show-trace --exclude-checks=ignored_auth
@@ -636,7 +653,7 @@ steps:
         volumes:
         - ${{CF_REPO_NAME}}/applications/samples/test/e2e:/home/test/__tests__/samples
         environment:
-        - APP_URL=https://samples.${{DOMAIN}}
+        - APP_URL=https://www.${{DOMAIN}}
         - USERNAME=sample@testuser.com
         - PASSWORD=test
     hooks:

tools/cloudharness-test/cloudharness_test/apitest_init.py

@@ -10,7 +10,7 @@
 
 if "APP_URL" or "APP_SCHEMA_FILE" in os.environ:
     app_schema = os.environ.get("APP_SCHEMA_FILE", None)
-    app_url = os.environ.get("APP_URL", "http://samples.ch.local/api")
+    app_url = os.environ.get("APP_URL", "http://www.ch.local/api")
 
     parsed_url = urlparse(app_url)
     base_url = f"{parsed_url.scheme}://{parsed_url.netloc}".rstrip("/")

tools/deployment-cli-tools/tests/test_codefresh.py

@@ -226,7 +226,7 @@ def test_create_codefresh_configuration_tests():
 
         assert "samples_e2e_test" in e2e_steps, "samples e2e test step must be included"
         test_step = e2e_steps["samples_e2e_test"]
-        assert "APP_URL=https://samples.${{DOMAIN}}" in test_step[
+        assert "APP_URL=https://www.${{DOMAIN}}" in test_step[
             'environment'], "APP_URL must be provided as environment variable"
         assert len(test_step['volumes']) == 1
 
@@ -235,7 +235,7 @@ def test_create_codefresh_configuration_tests():
         assert "test-api" in l1_steps[STEP_1]["steps"]["test-api"]["dockerfile"], "test-api image must be built from root context"
         api_steps = l1_steps['tests_api']['scale']
         test_step = api_steps["samples_api_test"]
-        assert "APP_URL=https://samples.${{DOMAIN}}/api" in test_step[
+        assert "APP_URL=https://www.${{DOMAIN}}/api" in test_step[
             'environment'], "APP_URL must be provided as environment variable"
         assert len(test_step['volumes']) == 2