Test Commit

vmware · Jun 6, 2023 · 771cba3 · 771cba3
1 parent 1f23b38
commit 771cba3
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 35 deletions.
diff --git a/projects/control-service/cicd/deploy-testing-pipelines-service.sh b/projects/control-service/cicd/deploy-testing-pipelines-service.sh
@@ -88,7 +88,7 @@ fi
 #
 # image.tag is fixed during release. It is set here to deploy using latest change in source code.
 # We are using here embedded database, and we need to set the storageclass since in our test k8s no default storage class is not set.
-helm upgrade --install --debug --wait --timeout 10m0s $RELEASE_NAME . \
+helm upgrade --install --debug --wait --timeout 20m0s $RELEASE_NAME . \
       -f "$TESTING_PIPELINES_SERVICE_VALUES_FILE" \
       --set image.tag="$TAG" \
       --set operationsUi.image.tag="$FRONTEND_TAG" \

diff --git a/projects/frontend/cicd/.gitlab-ci.yml b/projects/frontend/cicd/.gitlab-ci.yml
@@ -60,32 +60,32 @@ frontend-data-pipelines-build:
     expire_in: 1 week
 
 # TODO: Add the cicd path back to the rule once e2e tests are stabilized
-frontend-data-pipelines-e2e-tests:
-  image: "versatiledatakit/vdk-cicd-base-gui:2.0.0"
-  stage: pre_release_test
-  before_script:
-    - cd projects/frontend/
-  script:
-    - ./cicd/test_e2e_data_pipelines.sh "$VDK_API_TOKEN" "$CYPRESS_test_environment" "$CI_PIPELINE_ID" "$CYPRESS_grepTags"
-  retry: !reference [.retry, retry_options]
-  rules:
-    - changes: *frontend_do_not_trigger_e2e
-      when: never
-    - if: '$CI_COMMIT_BRANCH == "main" || $CI_PIPELINE_SOURCE == "external_pull_request_event"'
-      changes:
-        - "projects/frontend/shared-components/**/*"
-    - if: '$CI_COMMIT_BRANCH == "main" || $CI_PIPELINE_SOURCE == "external_pull_request_event"'
-      changes:
-        - "projects/frontend/data-pipelines/**/*"
-  artifacts:
-    when: always
-    paths:
-      - projects/frontend/data-pipelines/gui/e2e/videos/
-      - projects/frontend/data-pipelines/gui/e2e/screenshots/
-      - projects/frontend/data-pipelines/gui/e2e/hars/
-      - projects/frontend/data-pipelines/gui/e2e/logs/
-      - projects/frontend/data-pipelines/gui/e2e/reports/
-    expire_in: 1 week
+# frontend-data-pipelines-e2e-tests:
+#   image: "versatiledatakit/vdk-cicd-base-gui:2.0.0"
+#   stage: pre_release_test
+#   before_script:
+#     - cd projects/frontend/
+#   script:
+#     - ./cicd/test_e2e_data_pipelines.sh "$VDK_API_TOKEN" "$CYPRESS_test_environment" "$CI_PIPELINE_ID" "$CYPRESS_grepTags"
+#   retry: !reference [.retry, retry_options]
+#   rules:
+#     - changes: *frontend_do_not_trigger_e2e
+#       when: never
+#     - if: '$CI_COMMIT_BRANCH == "main" || $CI_PIPELINE_SOURCE == "external_pull_request_event"'
+#       changes:
+#         - "projects/frontend/shared-components/**/*"
+#     - if: '$CI_COMMIT_BRANCH == "main" || $CI_PIPELINE_SOURCE == "external_pull_request_event"'
+#       changes:
+#         - "projects/frontend/data-pipelines/**/*"
+#   artifacts:
+#     when: always
+#     paths:
+#       - projects/frontend/data-pipelines/gui/e2e/videos/
+#       - projects/frontend/data-pipelines/gui/e2e/screenshots/
+#       - projects/frontend/data-pipelines/gui/e2e/hars/
+#       - projects/frontend/data-pipelines/gui/e2e/logs/
+#       - projects/frontend/data-pipelines/gui/e2e/reports/
+#     expire_in: 1 week
 
 frontend-data-pipelines-release:
   image: "versatiledatakit/vdk-cicd-base-gui:2.0.0"
@@ -118,9 +118,9 @@ frontend_publish_ui_image:
   rules:
     - if: '$CI_PIPELINE_SOURCE == "schedule"'
       when: never
-    - if: '$CI_COMMIT_BRANCH == "main"'
+    - if: '$CI_COMMIT_BRANCH == "main" || $CI_PIPELINE_SOURCE == "external_pull_request_event"'
       changes: *frontend_shared_components_locations
-    - if: '$CI_COMMIT_BRANCH == "main"'
+    - if: '$CI_COMMIT_BRANCH == "main" || $CI_PIPELINE_SOURCE == "external_pull_request_event"'
       changes: *frontend_data_pipelines_locations
   extends: .frontend_publish_docker_image
 
@@ -135,9 +135,9 @@ frontend_tag_ui_image_stable:
   rules:
     - if: '$CI_PIPELINE_SOURCE == "schedule"'
       when: never
-    - if: '$CI_COMMIT_BRANCH == "main"'
+    - if: '$CI_COMMIT_BRANCH == "main" || $CI_PIPELINE_SOURCE == "external_pull_request_event"'
       changes: *frontend_shared_components_locations
-    - if: '$CI_COMMIT_BRANCH == "main"'
+    - if: '$CI_COMMIT_BRANCH == "main" || $CI_PIPELINE_SOURCE == "external_pull_request_event"'
       changes: *frontend_data_pipelines_locations
   extends: .frontend_publish_docker_image
 
@@ -156,9 +156,9 @@ frontend_deploy_testing_data_pipelines:
   rules:
     - if: '$CI_PIPELINE_SOURCE == "schedule"'
       when: never
-    - if: '$CI_COMMIT_BRANCH == "main"'
+    - if: '$CI_COMMIT_BRANCH == "main" || $CI_PIPELINE_SOURCE == "external_pull_request_event"'
       changes: *frontend_shared_components_locations
-    - if: '$CI_COMMIT_BRANCH == "main"'
+    - if: '$CI_COMMIT_BRANCH == "main" || $CI_PIPELINE_SOURCE == "external_pull_request_event"'
       changes: *frontend_data_pipelines_locations
 
 frontend_heartbeat_test:
@@ -181,9 +181,9 @@ frontend_heartbeat_test:
   rules:
     - if: '$CI_PIPELINE_SOURCE == "schedule"'
       when: never
-    - if: '$CI_COMMIT_BRANCH == "main"'
+    - if: '$CI_COMMIT_BRANCH == "main" || $CI_PIPELINE_SOURCE == "external_pull_request_event"'
       changes: *frontend_shared_components_locations
-    - if: '$CI_COMMIT_BRANCH == "main"'
+    - if: '$CI_COMMIT_BRANCH == "main" || $CI_PIPELINE_SOURCE == "external_pull_request_event"'
       changes: *frontend_data_pipelines_locations
 
 frontend_publish_test_image: