summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLingxian Kong <anlin.kong@gmail.com>2019-09-26 14:29:32 +1200
committerLingxian Kong <anlin.kong@gmail.com>2019-09-26 19:43:33 +0000
commit319e5249de269709ad482e1e6657ea0a37b80c3e (patch)
tree666facee5433ebf1fd81b50f976d6640593db5b9
parentced017e13003633c612a2059cb4dc46477e20943 (diff)
downloadtrove-319e5249de269709ad482e1e6657ea0a37b80c3e.tar.gz
Build images for Train
Change-Id: I1e2e62c213a7dfc6c641104f25157074d8b87db0
-rw-r--r--.zuul.yaml5
-rw-r--r--integration/scripts/files/elements/guest-agent/source-repository-guest-agent4
-rw-r--r--playbooks/image-build/run.yaml2
3 files changed, 6 insertions, 5 deletions
diff --git a/.zuul.yaml b/.zuul.yaml
index 3056e7cd..8cbbf5f4 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -58,7 +58,7 @@
jobs:
- publish-trove-guest-image-mysql-ubuntu-xenial:
branches:
- - master
+ - stable/train
- job:
name: trove-legacy-dsvm-base
@@ -363,4 +363,5 @@
datastore_type: mysql
guest_os: ubuntu
guest_os_release: xenial
- guest_username: ubuntu \ No newline at end of file
+ guest_username: ubuntu
+ branch: train \ No newline at end of file
diff --git a/integration/scripts/files/elements/guest-agent/source-repository-guest-agent b/integration/scripts/files/elements/guest-agent/source-repository-guest-agent
index ff2a8b0b..fb937fd3 100644
--- a/integration/scripts/files/elements/guest-agent/source-repository-guest-agent
+++ b/integration/scripts/files/elements/guest-agent/source-repository-guest-agent
@@ -1,3 +1,3 @@
# This is used for source-based builds
-guest-agent git /opt/guest-agent https://opendev.org/openstack/trove
-upper-constraints file /opt/upper-constraints.txt https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt
+guest-agent git /opt/guest-agent https://opendev.org/openstack/trove stable/train
+upper-constraints file /opt/upper-constraints.txt https://releases.openstack.org/constraints/upper/train
diff --git a/playbooks/image-build/run.yaml b/playbooks/image-build/run.yaml
index c5ca0fa9..91e3da90 100644
--- a/playbooks/image-build/run.yaml
+++ b/playbooks/image-build/run.yaml
@@ -12,7 +12,7 @@
{{ guest_os_release }} \
false \
{{ guest_username }} \
- {{ ansible_user_dir }}/images/trove-{{ zuul.branch }}-{{ datastore_type }}-{{ guest_os }}-{{ guest_os_release }}.qcow2
+ {{ ansible_user_dir }}/images/trove-{{ branch }}-{{ datastore_type }}-{{ guest_os }}-{{ guest_os_release }}.qcow2
args:
chdir: "{{ ansible_user_dir }}/src/opendev.org/openstack/trove/integration/scripts"
tags: