From ef0678ec98cd4125b053274ece7648a3167fc4fd Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Tue, 30 Apr 2019 15:20:45 +0200
Subject: [PATCH] Fix container-build job

Fix container-build variable due to move from git.openstack.org to
opendev.org.

Also, rename the job following the naming guidelines [1]. We have a
shared namespace and job names need to start with the repo name.

[1] https://docs.openstack.org/infra/manual/drivers.html#consistent-naming-for-jobs-with-zuul-v3

Change-Id: Ieed605c8e6d020b224cacf377b5a6178669ecf1a
---
 .zuul.yaml                            | 10 +++++-----
 playbooks/container-builder-vars.yaml |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 5c04802ba6..5d33bca891 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -341,7 +341,7 @@
       image_name: centos-dcos
 
 - job:
-    name: container-build
+    name: magnum-container-build
     pre-run: playbooks/container-builder-setup-gate.yaml
     run: playbooks/container-builder.yaml
     post-run: playbooks/container-builder-copy-logs.yaml
@@ -358,8 +358,8 @@
       - ^magnum/.*$
 
 - job:
-    name: container-publish
-    parent: container-build
+    name: magnum-container-publish
+    parent: magnum-container-build
     post-run: playbooks/container-publish.yaml
     secrets:
       - magnum_docker_login
@@ -381,7 +381,7 @@
         - magnum-functional-api-python2
         - openstack-tox-cover:
            voting: false
-        - container-build
+        - magnum-container-build
     gate:
       queue: magnum
       jobs:
@@ -403,4 +403,4 @@
         - magnum-dib-buildimage-centos-dcos
     post:
       jobs:
-        - container-publish
+        - magnum-container-publish
diff --git a/playbooks/container-builder-vars.yaml b/playbooks/container-builder-vars.yaml
index 1419dc6e3f..4775e2915a 100644
--- a/playbooks/container-builder-vars.yaml
+++ b/playbooks/container-builder-vars.yaml
@@ -1,4 +1,4 @@
-magnum_src_dir: "src/git.openstack.org/openstack/magnum"
+magnum_src_dir: "src/opendev.org/openstack/magnum"
 
 magnum_repository: openstackmagnum
 kubernetes_version_v1_11: v1.11.9