From 5b2af7db13f04e9df03e23e9001c133347494ade Mon Sep 17 00:00:00 2001
From: Pierre Riteau <pierre@stackhpc.com>
Date: Thu, 20 May 2021 18:29:19 +0200
Subject: [PATCH] Fix Docker build

The default nodeset was just changed to focal [1], which in the absence
of the python-is-python3 package doesn't provide a python binary.

Enable again the docker-build and docker-publish Zuul jobs.

[1] https://review.opendev.org/c/opendev/base-jobs/+/789098

Change-Id: Ic78169052517701b235e906852923388d93776e8
---
 .zuul.yaml            | 10 ++++++++++
 docker/build_image.sh |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 81a1da4be..48d68fe66 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -208,11 +208,21 @@
         - monasca-tempest-log-python3-influxdb
         - monasca-tempest-python3-influxdb
         - monasca-tempest-python3-cassandra
+        - build-monasca-docker-image
     gate:
       queue: monasca
       jobs:
         - monasca-tempest-python3-influxdb
         - monasca-tempest-log-python3-influxdb
+    post:
+      jobs:
+        - publish-monasca-api-docker-image
+    periodic:
+      jobs:
+        - publish-monasca-api-docker-image
+    release:
+      jobs:
+        - publish-monasca-api-docker-image
 
 - job:
     name: publish-monasca-api-docker-image
diff --git a/docker/build_image.sh b/docker/build_image.sh
index 2c3505523..59f2325f2 100755
--- a/docker/build_image.sh
+++ b/docker/build_image.sh
@@ -45,7 +45,7 @@ set -eo pipefail  # Exit the script if any statement returns error.
 #   $ ./build_image.sh master master refs/changes/19/595719/3
 
 # Go to folder with Docker files.
-REAL_PATH=$(python -c "import os,sys; print(os.path.realpath('$0'))")
+REAL_PATH=$(python3 -c "import os,sys; print(os.path.realpath('$0'))")
 cd "$(dirname "$REAL_PATH")/../docker/"
 
 [ -z "$DOCKER_IMAGE" ] && \