IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix failing end to end tests job for release (#18323)

Browse Source 
Create and push the expected tag to grafana-dev repository
and use this instead for running the end to end tests
for the release.
This commit is contained in:
Sofia Papagiannaki 2019-08-01 16:52:00 +03:00 committed by Leonard Gram
parent 69b7b8bb46
commit c9f7e3059f
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.circleci/config.yml
View File

@ -101,7 +101,7 @@ jobs:
end-to-end-test-release: end-to-end-test-release:
docker: docker:
- image: circleci/node:10-browsers - image: circleci/node:10-browsers
- image: grafana/grafana:$CIRCLE_TAG - image: grafana/grafana-dev:$CIRCLE_TAG
steps: steps:
- run: dockerize -wait tcp://127.0.0.1:3000 -timeout 120s - run: dockerize -wait tcp://127.0.0.1:3000 -timeout 120s
- checkout - checkout

2
packaging/docker/build.sh
View File

@ -67,6 +67,8 @@ fi
# Tag as 'latest' for official release; otherwise tag as grafana/grafana:master # Tag as 'latest' for official release; otherwise tag as grafana/grafana:master
if echo "$_grafana_tag" | grep -q "^v"; then if echo "$_grafana_tag" | grep -q "^v"; then
docker_tag_all "${_docker_repo}" "latest" docker_tag_all "${_docker_repo}" "latest"
# Create the expected tag for running the end to end tests successfully
docker tag "${_docker_repo}:${_grafana_version}" "grafana/grafana-dev:${_grafana_tag}"
else else
docker_tag_all "${_docker_repo}" "master" docker_tag_all "${_docker_repo}" "master"
docker tag "${_docker_repo}:${_grafana_version}" "grafana/grafana-dev:${_grafana_version}" docker tag "${_docker_repo}:${_grafana_version}" "grafana/grafana-dev:${_grafana_version}"

6
packaging/docker/push_to_docker_hub.sh
View File

@ -38,8 +38,14 @@ if echo "$_grafana_tag" | grep -q "^v" && echo "$_grafana_tag" | grep -vq "beta"
echo "pushing ${_docker_repo}:latest" echo "pushing ${_docker_repo}:latest"
docker_push_all "${_docker_repo}" "latest" docker_push_all "${_docker_repo}" "latest"
docker_push_all "${_docker_repo}" "${_grafana_version}" docker_push_all "${_docker_repo}" "${_grafana_version}"
# Push to the grafana-dev repository with the expected tag
# for running the end to end tests successfully
docker push "grafana/grafana-dev:${_grafana_tag}"
elif echo "$_grafana_tag" | grep -q "^v" && echo "$_grafana_tag" | grep -q "beta"; then elif echo "$_grafana_tag" | grep -q "^v" && echo "$_grafana_tag" | grep -q "beta"; then
docker_push_all "${_docker_repo}" "${_grafana_version}" docker_push_all "${_docker_repo}" "${_grafana_version}"
# Push to the grafana-dev repository with the expected tag
# for running the end to end tests successfully
docker push "grafana/grafana-dev:${_grafana_tag}"
elif echo "$_grafana_tag" | grep -q "master"; then elif echo "$_grafana_tag" | grep -q "master"; then
docker_push_all "${_docker_repo}" "master" docker_push_all "${_docker_repo}" "master"
docker push "grafana/grafana-dev:${_grafana_version}" docker push "grafana/grafana-dev:${_grafana_version}"