fix handling of *_COMMIT parameters in make system

Bug #1364076 reported by Aleksandra Fedorova
8
This bug affects 1 person
Affects Status Importance Assigned to Milestone
Fuel for OpenStack
Fix Released
High
Sergey Kulanov

Bug Description

We have several *_COMMIT parameters in our make scripts

FUELLIB_COMMIT
NAILGUN_COMMIT
ASTUTE_COMMIT
OSTF_COMMIT

But they only support branch names and don't support commit hash.
if someone specify commit hash there, build will fail with the following error:

Cloning into '<repo>'...
fatal: Remote branch <commit_hash> not found in upstream origin

We need to replace "git clone --branch <smth>" string here

https://github.com/stackforge/fuel-main/blob/2379783517e4830868f66b5fbab512eec4695679/repos.mk#L21

with something which supports both: branch name and commit hash.

Tags: devops make
tags: added: make
Mike Scherbakov (mihgen)
Changed in fuel:
status: New → Confirmed
importance: Undecided → High
assignee: nobody → Fuel DevOps (fuel-devops)
tags: added: devops
Igor Shishkin (teran)
Changed in fuel:
assignee: Fuel DevOps (fuel-devops) → Sergey Kulanov (skulanov)
Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Fix proposed to fuel-main (master)

Fix proposed to branch: master
Review: https://review.openstack.org/121618

Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Fix merged to fuel-main (master)

Reviewed: https://review.openstack.org/121618
Committed: https://git.openstack.org/cgit/stackforge/fuel-main/commit/?id=eef9afebe4c9a7e8e43ef536c881aa8f7ad52cfa
Submitter: Jenkins
Branch: master

commit eef9afebe4c9a7e8e43ef536c881aa8f7ad52cfa
Author: Sergey Kulanov <email address hidden>
Date: Mon Sep 15 19:25:30 2014 +0300

    Extends COMMIT parameters with git hash in make system

    We can define the exact commit hash or branch that
    want to use for building packages from.

    Value should be defined in config.mk with format:
     REPONAME_COMMIT?=branch
      or
     REPONAME_COMMIT?=hash
    for example:
     FUELLIB_COMMIT?=stable/5.1
     FUELLIB_COMMIT?=203ef3179007cffe3236032e61ecbaf1cd20605f

    Change-Id: Ifa225003f03dfa41028abb6db0a5ac83ad22f81e
    Close-bug: #1364076

Changed in fuel:
status: Confirmed → Fix Released
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.