From 74b822f352797130b9750c6afdf41d1b11f5d4d0 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Tue, 17 Mar 2020 13:02:20 -0500 Subject: [PATCH] Use version 2 for docker-compose for review Also - update the test job to use xenial nodes, since that's what our gerrit servers are. docker-compose in xenial is too old for version 3 file format - but we didn't get an error in the test becuase we're running on bionic. Change-Id: I855c3df241932098c95de84cf9f92383b335702f --- .zuul.yaml | 4 ++-- playbooks/roles/gerrit/templates/docker-compose.yaml.j2 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index f34f28f9b4..9cc4b923d5 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1092,9 +1092,9 @@ - name: bridge.openstack.org label: ubuntu-bionic - name: review01.openstack.org - label: ubuntu-bionic + label: ubuntu-xenial - name: review-dev01.opendev.org - label: ubuntu-bionic + label: ubuntu-xenial vars: run_playbooks: - playbooks/service-letsencrypt.yaml diff --git a/playbooks/roles/gerrit/templates/docker-compose.yaml.j2 b/playbooks/roles/gerrit/templates/docker-compose.yaml.j2 index 2f3e32acea..8753e6d591 100644 --- a/playbooks/roles/gerrit/templates/docker-compose.yaml.j2 +++ b/playbooks/roles/gerrit/templates/docker-compose.yaml.j2 @@ -1,4 +1,4 @@ -version: '3' +version: '2' services: gerrit: