From 9bc813daa7343e8b867e4716e30fe3d7eeef7682 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Evrard Date: Thu, 20 Jun 2019 11:36:46 +0200 Subject: [PATCH] Dockerhub now returns 200 for DELETEs We need to adapt to this, else the promote pipeline fails. Change-Id: Ie617efc8b9a7fefb565c67c796d42c87a1ee998f --- roles/promote-docker-image/tasks/promote-cleanup.yaml | 2 +- roles/promote-docker-image/tasks/promote-retag-inner.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/promote-docker-image/tasks/promote-cleanup.yaml b/roles/promote-docker-image/tasks/promote-cleanup.yaml index d8435b439..69e66eaa1 100644 --- a/roles/promote-docker-image/tasks/promote-cleanup.yaml +++ b/roles/promote-docker-image/tasks/promote-cleanup.yaml @@ -15,6 +15,6 @@ uri: url: "https://hub.docker.com/v2/repositories/{{ image.repository }}/tags/{{ docker_tag.name }}/" method: DELETE - status_code: 204 + status_code: [200,204] headers: Authorization: "JWT {{ jwt_token.json.token }}" diff --git a/roles/promote-docker-image/tasks/promote-retag-inner.yaml b/roles/promote-docker-image/tasks/promote-retag-inner.yaml index ed947d879..3d4d73391 100644 --- a/roles/promote-docker-image/tasks/promote-retag-inner.yaml +++ b/roles/promote-docker-image/tasks/promote-retag-inner.yaml @@ -23,6 +23,6 @@ uri: url: "https://hub.docker.com/v2/repositories/{{ image.repository }}/tags/change_{{ zuul.change }}_{{ image_tag }}/" method: DELETE - status_code: 204 + status_code: [200,204] headers: Authorization: "JWT {{ jwt_token.json.token }}"