diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-22 15:10:37 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-22 15:10:37 +0300 |
| commit | f2d662be68fb15a2b38abaff576693f2b8f2c2f3 (patch) | |
| tree | 226f6281ecaf11fcab954a96780a9bc58eb3f08a /.gitlab | |
| parent | 672f729cf283c4495ccf5071007e25b33c30daff (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/qa-common/main.gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | .gitlab/ci/test-on-gdk/main.gitlab-ci.yml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab/ci/qa-common/main.gitlab-ci.yml b/.gitlab/ci/qa-common/main.gitlab-ci.yml index 48d8d8ecb2d..137db656787 100644 --- a/.gitlab/ci/qa-common/main.gitlab-ci.yml +++ b/.gitlab/ci/qa-common/main.gitlab-ci.yml @@ -6,7 +6,7 @@ workflow: include: - project: gitlab-org/quality/pipeline-common - ref: 5.1.1 + ref: 5.2.1 file: - /ci/base.gitlab-ci.yml - /ci/allure-report.yml diff --git a/.gitlab/ci/test-on-gdk/main.gitlab-ci.yml b/.gitlab/ci/test-on-gdk/main.gitlab-ci.yml index c8b9aa54afb..f55950d56b4 100644 --- a/.gitlab/ci/test-on-gdk/main.gitlab-ci.yml +++ b/.gitlab/ci/test-on-gdk/main.gitlab-ci.yml @@ -33,6 +33,7 @@ variables: FF_NETWORK_PER_BUILD: 1 GDK_URL: http://gdk.test:3000 before_script: + - echo "SUITE_RAN=true" > suite_status.env - echo -e "\e[0Ksection_start:`date +%s`:pull_image\r\e[0KPull GDK QA image" - docker pull ${GDK_IMAGE} - echo -e "\e[0Ksection_end:`date +%s`:pull_image\r\e[0K" @@ -55,7 +56,6 @@ variables: - cd qa && bundle install - retry_exponential test_url ${GDK_URL}/users/sign_in - echo -e "\e[0Ksection_end:`date +%s`:launch_gdk\r\e[0K" - - echo "SUITE_RAN=true" > suite_status.env script: - echo -e "\e[0Ksection_start:`date +%s`:run_tests\r\e[0KRun E2E tests" - QA_COMMAND="bundle exec bin/qa Test::Instance::All ${GDK_URL} -- ${RSPEC_TAGS} ${RSPEC_REPORT_OPTS}" |