diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-27 09:27:52 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-27 09:27:52 +0000 |
| commit | 996683657578757cf42ef7478a5c3b9874b312f0 (patch) | |
| tree | adbc8884ee6f1fb381ea027fa8b51f68143c9dcf /scripts/gitlab_component_helpers.sh | |
| parent | 3fbe43541ef99c27a9e4ab9c545ec0eb9bb50a9e (diff) | |
| download | gitlab-ce-996683657578757cf42ef7478a5c3b9874b312f0.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts/gitlab_component_helpers.sh')
| -rw-r--r-- | scripts/gitlab_component_helpers.sh | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/scripts/gitlab_component_helpers.sh b/scripts/gitlab_component_helpers.sh index 0c34b5669a8..d7e5519f057 100644 --- a/scripts/gitlab_component_helpers.sh +++ b/scripts/gitlab_component_helpers.sh @@ -56,6 +56,7 @@ export GITLAB_ASSETS_PACKAGE_URL="${API_PACKAGES_BASE_URL}/assets/${NODE_ENV}-${ # Fixtures constants export FIXTURES_PATH="tmp/tests/frontend/**/*" +export REUSE_FRONTEND_FIXTURES_ENABLED="${REUSE_FRONTEND_FIXTURES_ENABLED:-"true"}" # Workhorse functions function gitlab_workhorse_archive_doesnt_exist() { @@ -105,7 +106,7 @@ function upload_gitlab_assets_package() { # Fixtures functions function check_fixtures_download() { - if [[ "${REUSE_FRONTEND_FIXTURES_ENABLED:-}" != "true" ]]; then + if [[ "${REUSE_FRONTEND_FIXTURES_ENABLED}" != "true" ]]; then echoinfo "INFO: Reusing frontend fixtures is disabled due to REUSE_FRONTEND_FIXTURES_ENABLED=${REUSE_FRONTEND_FIXTURES_ENABLED}." return 1 fi @@ -118,7 +119,7 @@ function check_fixtures_download() { if [[ -z "${CI_MERGE_REQUEST_IID:-}" ]]; then return 1 else - if tooling/bin/find_only_js_changes && ! fixtures_archive_doesnt_exist; then + if tooling/bin/find_only_allowed_files_changes && ! fixtures_archive_doesnt_exist; then return 0 else return 1 @@ -127,7 +128,7 @@ function check_fixtures_download() { } function check_fixtures_reuse() { - if [[ "${REUSE_FRONTEND_FIXTURES_ENABLED:-}" != "true" ]]; then + if [[ "${REUSE_FRONTEND_FIXTURES_ENABLED}" != "true" ]]; then echoinfo "INFO: Reusing frontend fixtures is disabled due to REUSE_FRONTEND_FIXTURES_ENABLED=${REUSE_FRONTEND_FIXTURES_ENABLED}." rm -rf "tmp/tests/frontend"; return 1 @@ -142,8 +143,8 @@ function check_fixtures_reuse() { if [[ -d "tmp/tests/frontend" ]]; then # Remove tmp/tests/frontend/ except on the first parallelized job so that depending # jobs don't download the exact same artifact multiple times. - if [[ -n "${CI_NODE_INDEX:-}" ]] && [[ "${CI_NODE_INDEX}" -ne 1 ]]; then - echoinfo "INFO: Removing 'tmp/tests/frontend' as we're on node ${CI_NODE_INDEX}. Dependent jobs will use the artifacts from the first parallelized job."; + if [[ -n "${CI_NODE_INDEX:-}" ]] && [[ "${CI_NODE_INDEX:-}" -ne 1 ]]; then + echoinfo "INFO: Removing 'tmp/tests/frontend' as we're on node ${CI_NODE_INDEX:-}. Dependent jobs will use the artifacts from the first parallelized job."; rm -rf "tmp/tests/frontend"; fi return 0 |