Prechádzať zdrojové kódy

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

Create and push the expected tag to grafana-dev repository
and use this instead for running the end to end tests
for the release.
Sofia Papagiannaki 6 rokov pred
rodič
commit
c9f7e3059f

+ 1 - 1
.circleci/config.yml

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

+ 2 - 0
packaging/docker/build.sh

@@ -67,6 +67,8 @@ fi
 # Tag as 'latest' for official release; otherwise tag as grafana/grafana:master
 if echo "$_grafana_tag" | grep -q "^v"; then
 	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
 	docker_tag_all "${_docker_repo}" "master"
 	docker tag "${_docker_repo}:${_grafana_version}" "grafana/grafana-dev:${_grafana_version}"

+ 6 - 0
packaging/docker/push_to_docker_hub.sh

@@ -38,8 +38,14 @@ if echo "$_grafana_tag" | grep -q "^v" && echo "$_grafana_tag" | grep -vq "beta"
 	echo "pushing ${_docker_repo}:latest"
 	docker_push_all "${_docker_repo}" "latest"
 	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
 	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
 	docker_push_all "${_docker_repo}" "master"
 	docker push "grafana/grafana-dev:${_grafana_version}"