From 18870e4a5ef9b832772282155fa03ffd29cb9428 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Sat, 25 Jan 2014 08:53:49 -0800 Subject: [PATCH] Account for both possible projects.yaml names We're about to rename projects.yaml from review.projects.yaml.erb to review.projects.yaml and this script needs to know about that. Change-Id: I84f2caee8aeccb7816c9d367557f3bd0e8315ecf --- .../slave_scripts/check_projects_yaml_alphabetized.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/modules/jenkins/files/slave_scripts/check_projects_yaml_alphabetized.sh b/modules/jenkins/files/slave_scripts/check_projects_yaml_alphabetized.sh index 52bf97f5b2..1b05a28e7b 100755 --- a/modules/jenkins/files/slave_scripts/check_projects_yaml_alphabetized.sh +++ b/modules/jenkins/files/slave_scripts/check_projects_yaml_alphabetized.sh @@ -5,12 +5,16 @@ export TMPDIR=`/bin/mktemp -d` trap "rm -rf $TMPDIR" EXIT +if [ -f $OLDPWD/modules/openstack_project/templates/review.projects.yaml.erb ] +then + PROJECTS_LIST=$OLDPWD/modules/openstack_project/templates/review.projects.yaml.erb +else + PROJECTS_LIST=$OLDPWD/modules/openstack_project/files/review.projects.yaml +fi pushd $TMPDIR -sed -e '/^- project: /!d' -e 's/^- project: //' \ - $OLDPWD/modules/openstack_project/templates/review.projects.yaml.erb \ - > projects_list +sed -e '/^- project: /!d' -e 's/^- project: //' $PROJECTS_LIST > projects_list LC_ALL=C sort --ignore-case projects_list -o projects_list.sorted