Commit 46b881de authored by Grzegorz Bizon's avatar Grzegorz Bizon

Merge branch 'revert-b479ddc7' into 'master'

Revert "Merge branch 'qa-use-mr-iid-in-review-app-slug' into 'master'"

See merge request gitlab-org/gitlab-ce!24521
parents ac5cfc3a 11961f05
...@@ -434,12 +434,12 @@ setup-test-env: ...@@ -434,12 +434,12 @@ setup-test-env:
cache: {} cache: {}
dependencies: [] dependencies: []
environment: &review-environment environment: &review-environment
name: review/mr-${CI_MERGE_REQUEST_IID} name: review/${CI_COMMIT_REF_NAME}
url: https://gitlab-mr-${CI_MERGE_REQUEST_IID}.${REVIEW_APPS_DOMAIN} url: https://gitlab-${CI_ENVIRONMENT_SLUG}.${REVIEW_APPS_DOMAIN}
only: only:
refs: refs:
- merge_requests@gitlab-org/gitlab-ce - branches@gitlab-org/gitlab-ce
- merge_requests@gitlab-org/gitlab-ee - branches@gitlab-org/gitlab-ee
kubernetes: active kubernetes: active
except: except:
refs: refs:
...@@ -953,8 +953,8 @@ review-deploy: ...@@ -953,8 +953,8 @@ review-deploy:
allow_failure: true allow_failure: true
variables: variables:
GIT_DEPTH: "1" GIT_DEPTH: "1"
HOST_SUFFIX: "mr-${CI_MERGE_REQUEST_IID}" HOST_SUFFIX: "${CI_ENVIRONMENT_SLUG}"
DOMAIN: "-mr-${CI_MERGE_REQUEST_IID}.${REVIEW_APPS_DOMAIN}" DOMAIN: "-${CI_ENVIRONMENT_SLUG}.${REVIEW_APPS_DOMAIN}"
GITLAB_HELM_CHART_REF: "master" GITLAB_HELM_CHART_REF: "master"
API_TOKEN: "${GITLAB_BOT_MULTI_PROJECT_PIPELINE_POLLING_TOKEN}" API_TOKEN: "${GITLAB_BOT_MULTI_PROJECT_PIPELINE_POLLING_TOKEN}"
environment: environment:
......
...@@ -74,27 +74,27 @@ Note that both jobs first wait for the `review-deploy` job to be finished. ...@@ -74,27 +74,27 @@ Note that both jobs first wait for the `review-deploy` job to be finished.
### Run a Rails console? ### Run a Rails console?
1. [Filter Workloads by your Review App slug](https://console.cloud.google.com/kubernetes/workload?project=gitlab-review-apps) 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-29951-issu-id2qax`.
1. Find and open the `task-runner` Deployment, e.g. `review-mr-24388-314997-task-runner`. 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-mr-24388-314997-task-runner-d5455cc8-2lsvz`. 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. Click on the `KUBECTL` dropdown, then `Exec` -> `task-runner`.
1. Replace `-c task-runner -- ls` with `-- /srv/gitlab/bin/rails c` from the 1. Replace `-c task-runner -- ls` with `-- /srv/gitlab/bin/rails c` from the
default command or 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 and
- Replace `review-apps-ce` with `review-apps-ee` if the Review App - Replace `review-apps-ce` with `review-apps-ee` if the Review App
is running EE, and 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. with your Pod's name.
### Dig into a Pod's logs? ### 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) 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. 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. 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. 1. Click on the `Container logs` link.
## Frequently Asked Questions ## Frequently Asked Questions
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment