From: dklawren Date: Wed, 3 Jul 2019 20:56:00 +0000 (-0400) Subject: Revert "no bug - Do not create qa data if not running qa tests" (#1358) X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3d3c6eca6a2bcb216ba891efe858a23048080066;p=thirdparty%2Fbugzilla.git Revert "no bug - Do not create qa data if not running qa tests" (#1358) This reverts commit 0985893416bff1050a639dd09e22fb8aec307a47. --- diff --git a/.circleci/config.yml b/.circleci/config.yml index 1492610ae..e683f9842 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -53,7 +53,6 @@ defaults: <<: *bmo_env BZ_QA_CONF_FILE: /app/.circleci/selenium_test.conf BZ_QA_ANSWERS_FILE: /app/.circleci/checksetup_answers.txt - BZ_QA_CONFIG: 1 - <<: *mysql_image environment: *mysql_env - <<: *selenium_firefox_image @@ -174,8 +173,7 @@ jobs: - <<: *bmo_slim_image environment: *bmo_env steps: - - run: | - mkdir -p /app && cd /tmp/_circleci_local_build_repo && git ls-files -z | xargs -s 2091853 -0 tar -c | tar -x -C /app && cp -a /tmp/_circleci_local_build_repo/.git /app + - checkout - attach_workspace: at: /app/build_info - run: | diff --git a/scripts/entrypoint.pl b/scripts/entrypoint.pl index b3b166644..e9700df15 100755 --- a/scripts/entrypoint.pl +++ b/scripts/entrypoint.pl @@ -142,12 +142,9 @@ sub cmd_load_test_data { '--param', 'use_mailer_queue=0' ); - if ($ENV{BZ_QA_CONFIG}) { - chdir '/app/qa/config'; - say 'chdir(/app/qa/config)'; - run('perl', 'generate_test_data.pl'); - chdir '/app'; - } + chdir '/app/qa/config'; + say 'chdir(/app/qa/config)'; + run('perl', 'generate_test_data.pl'); } sub cmd_test_webservices {