diff options
| author | Rémy Coutable <remy@rymai.me> | 2019-01-21 08:13:38 +0000 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2019-01-21 18:23:49 +0900 |
| commit | 11961f05eca99ac35dafb8bd03fbe7db9cb53a49 (patch) | |
| tree | 8756c7b303a6e66feca3dd16559cdf700c051380 | |
| parent | 764f26785a0af9aaa472537e56386ffd5ce3d875 (diff) | |
| download | gitlab-ce-11961f05eca99ac35dafb8bd03fbe7db9cb53a49.tar.gz | |
Revert "Merge branch 'qa-use-mr-iid-in-review-app-slug' into 'master'"
This reverts merge request
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24388
| -rw-r--r-- | .gitlab-ci.yml | 12 | ||||
| -rw-r--r-- | doc/development/testing_guide/review_apps.md | 16 |
2 files changed, 14 insertions, 14 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 099a3bb5259..68dea56a67d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -434,12 +434,12 @@ setup-test-env: cache: {} dependencies: [] environment: &review-environment - name: review/mr-${CI_MERGE_REQUEST_IID} - url: https://gitlab-mr-${CI_MERGE_REQUEST_IID}.${REVIEW_APPS_DOMAIN} + name: review/${CI_COMMIT_REF_NAME} + url: https://gitlab-${CI_ENVIRONMENT_SLUG}.${REVIEW_APPS_DOMAIN} only: refs: - - merge_requests@gitlab-org/gitlab-ce - - merge_requests@gitlab-org/gitlab-ee + - branches@gitlab-org/gitlab-ce + - branches@gitlab-org/gitlab-ee kubernetes: active except: refs: @@ -953,8 +953,8 @@ review-deploy: allow_failure: true variables: GIT_DEPTH: "1" - HOST_SUFFIX: "mr-${CI_MERGE_REQUEST_IID}" - DOMAIN: "-mr-${CI_MERGE_REQUEST_IID}.${REVIEW_APPS_DOMAIN}" + HOST_SUFFIX: "${CI_ENVIRONMENT_SLUG}" + DOMAIN: "-${CI_ENVIRONMENT_SLUG}.${REVIEW_APPS_DOMAIN}" GITLAB_HELM_CHART_REF: "master" API_TOKEN: "${GITLAB_BOT_MULTI_PROJECT_PIPELINE_POLLING_TOKEN}" environment: diff --git a/doc/development/testing_guide/review_apps.md b/doc/development/testing_guide/review_apps.md index 13f178297b9..309babb5f94 100644 --- a/doc/development/testing_guide/review_apps.md +++ b/doc/development/testing_guide/review_apps.md @@ -74,27 +74,27 @@ Note that both jobs first wait for the `review-deploy` job to be finished. ### Run a Rails console? 1. [Filter Workloads by your Review App slug](https://console.cloud.google.com/kubernetes/workload?project=gitlab-review-apps) - , e.g. `review-mr-24388-314997`. -1. Find and open the `task-runner` Deployment, e.g. `review-mr-24388-314997-task-runner`. -1. Click on the Pod in the "Managed pods" section, e.g. `review-mr-24388-314997-task-runner-d5455cc8-2lsvz`. + , e.g. `review-29951-issu-id2qax`. +1. Find and open the `task-runner` Deployment, e.g. `review-29951-issu-id2qax-task-runner`. +1. Click on the Pod in the "Managed pods" section, e.g. `review-29951-issu-id2qax-task-runner-d5455cc8-2lsvz`. 1. Click on the `KUBECTL` dropdown, then `Exec` -> `task-runner`. 1. Replace `-c task-runner -- ls` with `-- /srv/gitlab/bin/rails c` from the default command or - - Run `kubectl exec --namespace review-apps-ce -it review-mr-24388-314997-task-runner-d5455cc8-2lsvz -- /srv/gitlab/bin/rails c` + - Run `kubectl exec --namespace review-apps-ce -it review-29951-issu-id2qax-task-runner-d5455cc8-2lsvz -- /srv/gitlab/bin/rails c` and - Replace `review-apps-ce` with `review-apps-ee` if the Review App is running EE, and - - Replace `review-mr-24388-314997-task-runner-d5455cc8-2lsvz` + - Replace `review-29951-issu-id2qax-task-runner-d5455cc8-2lsvz` with your Pod's name. ### Dig into a Pod's logs? 1. [Filter Workloads by your Review App slug](https://console.cloud.google.com/kubernetes/workload?project=gitlab-review-apps) - , e.g. `review-mr-24388-314997`. + , e.g. `review-1979-1-mul-dnvlhv`. 1. Find and open the `migrations` Deployment, e.g. - `review-mr-24388-314997-migrations.1`. + `review-1979-1-mul-dnvlhv-migrations.1`. 1. Click on the Pod in the "Managed pods" section, e.g. - `review-mr-24388-314997-migrations.1-nqwtx`. + `review-1979-1-mul-dnvlhv-migrations.1-nqwtx`. 1. Click on the `Container logs` link. ## Frequently Asked Questions |