Commit b33a9d9c authored Dec 09, 2020 by Michal Berger Committed by Tomasz Zawadzki Dec 11, 2020

pkgdep/git: Look up only annotated tags for refspdk builds



Since --tags also works with lightweight tags, it simply returns "LTS"
string when tree is switched directly to that particular tag. Make sure
only annotated tags are checked so the release version lookup can work
as expected.

Change-Id: Ica875bf406c8e23529ee2961645c5bf6b6bc00fa
Signed-off-by: Michal Berger <michalx.berger@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/5492


Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Karol Latecki <karol.latecki@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>

parent 11b5e6f9

test/common/config/pkgdep/git

+2 −2

Original line number	Diff line number	Diff line
		@@ -27,7 +27,7 @@ function install_refspdk() {
		release=$(git -C "$GIT_REPOS/spdk_repo/spdk" tag \| sort --version-sort \| grep -v rc \| tail -n 1)
		output_dir="$GIT_REPOS/spdk_abi_latest"
		elif [[ "$version" == "LTS" ]]; then
		release="LTS"
		release=$(git -C "$GIT_REPOS/spdk_repo/spdk" describe LTS)
		output_dir="$GIT_REPOS/spdk_abi_lts"
		fi

		@@ -38,7 +38,7 @@ function install_refspdk() {
		git -C "$output_dir" checkout "$release"
		git -C "$output_dir" submodule update --init
		lts_2001_fallback=false
		if [[ $(git -C "$output_dir" describe --tags) == v20.01* ]]; then
		if [[ "$release" == v20.01* ]]; then
		lts_2001_fallback=true
		fi