From d2bd6faf5ecffbebe8eb721b7fb1bc366ca4bd9a Mon Sep 17 00:00:00 2001 From: Boden R Date: Thu, 19 Jul 2018 14:30:59 -0600 Subject: [PATCH] add rocky branch to features.yaml This patch adds the rocky branch to features.yaml so that rocky branch patches can land, for example [1] that currently fails with: ERROR: branch not allowed by features matrix: rocky [1] https://review.openstack.org/#/c/584078/ Change-Id: I235c6c3ad81dff916a65cf8b97152621812fa102 --- roles/test-matrix/files/features.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/roles/test-matrix/files/features.yaml b/roles/test-matrix/files/features.yaml index 88cd6926..debe0fd3 100644 --- a/roles/test-matrix/files/features.yaml +++ b/roles/test-matrix/files/features.yaml @@ -1,6 +1,7 @@ config: default: master: [default, ceilometer, glance, nova, placement, swift, cinder, keystone] + rocky: [default, ceilometer, glance, nova, placement, swift, cinder, keystone] queens: [default, ceilometer, glance, nova, placement, swift, cinder, keystone] pike: [default, ceilometer, glance, nova, placement, swift, cinder, keystone] ocata: [default, ceilometer, glance, nova, placement, swift, cinder, keystone] @@ -66,7 +67,7 @@ branches: # The value of ""default" is the name of the "trunk" branch default: master # Normalized branch names only here, e.g. stable/ocata => ocata - allowed: [master, queens, pike, ocata, newton, mitaka, liberty, kilo] + allowed: [master, rocky, queens, pike, ocata, newton, mitaka, liberty, kilo] primary: default: