Update branch to stable/wallaby for DevStack

And fix docker build
Change-Id: Ibeac722420c266b97d2fe06fcb6adf27f6a4025e

Change-Id: Id7a874e691f13480653d3a6d74651c96875efa27

.zuul.yaml

@@ -199,10 +199,7 @@
     templates:
       - check-requirements
       - openstack-cover-jobs
-      - openstack-lower-constraints-jobs
       - openstack-python3-wallaby-jobs
-      - publish-openstack-docs-pti
-      - release-notes-jobs-python3
     check:
       jobs:
         - monasca-tempest-log-python3-influxdb

devstack/settings

@@ -142,39 +142,39 @@ MONASCA_SCHEMA_DIR=${DEST}/monasca/schema
 
 # Repository settings
 MONASCA_API_REPO=${MONASCA_API_REPO:-${GIT_BASE}/openstack/monasca-api.git}
-MONASCA_API_BRANCH=${MONASCA_API_BRANCH:-master}
+MONASCA_API_BRANCH=${MONASCA_API_BRANCH:-stable/wallaby}
 MONASCA_API_DIR=${MONASCA_BASE}/monasca-api
 
 MONASCA_PERSISTER_REPO=${MONASCA_PERSISTER_REPO:-${GIT_BASE}/openstack/monasca-persister.git}
-MONASCA_PERSISTER_BRANCH=${MONASCA_PERSISTER_BRANCH:-master}
+MONASCA_PERSISTER_BRANCH=${MONASCA_PERSISTER_BRANCH:-stable/wallaby}
 MONASCA_PERSISTER_DIR=${MONASCA_BASE}/monasca-persister
 
 MONASCA_NOTIFICATION_REPO=${MONASCA_NOTIFICATION_REPO:-${GIT_BASE}/openstack/monasca-notification.git}
-MONASCA_NOTIFICATION_BRANCH=${MONASCA_NOTIFICATION_BRANCH:-master}
+MONASCA_NOTIFICATION_BRANCH=${MONASCA_NOTIFICATION_BRANCH:-stable/wallaby}
 MONASCA_NOTIFICATION_DIR=${MONASCA_BASE}/monasca-notification
 
 MONASCA_THRESH_REPO=${MONASCA_THRESH_REPO:-${GIT_BASE}/openstack/monasca-thresh.git}
-MONASCA_THRESH_BRANCH=${MONASCA_THRESH_BRANCH:-master}
+MONASCA_THRESH_BRANCH=${MONASCA_THRESH_BRANCH:-stable/wallaby}
 MONASCA_THRESH_DIR=${MONASCA_BASE}/monasca-thresh
 
 MONASCA_CLIENT_REPO=${MONASCA_CLIENT_REPO:-${GIT_BASE}/openstack/python-monascaclient.git}
-MONASCA_CLIENT_BRANCH=${MONASCA_CLIENT_BRANCH:-master}
+MONASCA_CLIENT_BRANCH=${MONASCA_CLIENT_BRANCH:-stable/wallaby}
 MONASCA_CLIENT_DIR=${MONASCA_BASE}/python-monascaclient
 
 MONASCA_AGENT_REPO=${MONASCA_AGENT_REPO:-${GIT_BASE}/openstack/monasca-agent.git}
-MONASCA_AGENT_BRANCH=${MONASCA_AGENT_BRANCH:-master}
+MONASCA_AGENT_BRANCH=${MONASCA_AGENT_BRANCH:-stable/wallaby}
 MONASCA_AGENT_DIR=${MONASCA_BASE}/monasca-agent
 
 MONASCA_UI_REPO=${MONASCA_UI_REPO:-${GIT_BASE}/openstack/monasca-ui.git}
-MONASCA_UI_BRANCH=${MONASCA_UI_BRANCH:-master}
+MONASCA_UI_BRANCH=${MONASCA_UI_BRANCH:-stable/wallaby}
 MONASCA_UI_DIR=${MONASCA_BASE}/monasca-ui
 
 MONASCA_COMMON_REPO=${MONASCA_COMMON_REPO:-${GIT_BASE}/openstack/monasca-common.git}
-MONASCA_COMMON_BRANCH=${MONASCA_COMMON_BRANCH:-master}
+MONASCA_COMMON_BRANCH=${MONASCA_COMMON_BRANCH:-stable/wallaby}
 MONASCA_COMMON_DIR=${MONASCA_BASE}/monasca-common
 
 MONASCA_STATSD_REPO=${MONASCA_STATSD_REPO:-${GIT_BASE}/openstack/monasca-statsd.git}
-MONASCA_STATSD_BRANCH=${MONASCA_STATSD_BRANCH:-master}
+MONASCA_STATSD_BRANCH=${MONASCA_STATSD_BRANCH:-stable/wallaby}
 MONASCA_STATSD_DIR=${MONASCA_BASE}/monasca-statsd
 
 MONASCA_GRAFANA_DATASOURCE_REPO=${MONASCA_GRAFANA_DATASOURCE_REPO:-${GIT_BASE}/openstack/monasca-grafana-datasource.git}

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" ] && \