From 010f2703a40f7387fcf19eca33ce42d352b93606 Mon Sep 17 00:00:00 2001 From: Mehdi Abaakouk Date: Tue, 28 Jun 2016 17:48:48 +0200 Subject: [PATCH] gnocchi: fix var for setting the Gnocchi branch Change-Id: I1756a1f1959c1a1ee5910b31364a7b3c5cb88f75 --- jenkins/jobs/gnocchi.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jenkins/jobs/gnocchi.yaml b/jenkins/jobs/gnocchi.yaml index 4baa583595..cfc4295476 100644 --- a/jenkins/jobs/gnocchi.yaml +++ b/jenkins/jobs/gnocchi.yaml @@ -75,17 +75,17 @@ fi case "{oldbranch}" in - "1.x") export GRENADE_OLD_BRANCH=stable/1.3;; + "1.x") export OVERRIDE_GNOCCHI_PROJECT_BRANCH=stable/1.3;; "2.x") STABLE_BRANCH=${{ZUUL_BRANCH#stable/}} if [ "${{STABLE_BRANCH}}" != "${{ZUUL_BRANCH}}" ]; then # We are on stable branch MAJOR=${{STABLE_BRANCH%.?}} MINOR=${{STABLE_BRANCH#?.}} - export GRENADE_OLD_BRANCH=stable/${{MAJOR}}.$((MINOR - 1)) + export OVERRIDE_GNOCCHI_PROJECT_BRANCH=stable/${{MAJOR}}.$((MINOR - 1)) else # We are on master - export GRENADE_OLD_BRANCH=stable/2.1 + export OVERRIDE_GNOCCHI_PROJECT_BRANCH=stable/2.1 fi ;; esac