Commit ab27b2c4 authored by Michal Berger's avatar Michal Berger Committed by Tomasz Zawadzki
Browse files

pkgdep/git: Use .x branch for the 20.01 LTS ref build 



This is done in order to workaround currently existing issues with
building spdk_abi_lts on systems with newer versions of the compiler.

Change-Id: I514580308f2cfbbffa13a821dcf72fc9fb60cd73
Signed-off-by: default avatarMichal Berger <michalx.berger@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/5716


Reviewed-by: default avatarKarol Latecki <karol.latecki@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent e7fb0e9a

test/common/config/pkgdep/git

+9 −2
Original line number Diff line number Diff line
@@ -37,12 +37,19 @@ function install_refspdk() { 
		cp -R "$GIT_REPOS/spdk_repo/spdk" "$output_dir"

	fi



	git -C "$output_dir" checkout "$release"

	git -C "$output_dir" submodule update --init

	lts_2001_fallback=false

	if [[ "$release" == v20.01* ]]; then

		# We switch to a .x branch in order to slurp all the backports which fix spdk_abi_lts

		# build for this particular release. Fetch the branch explicitly as in case of our CI,

		# jenkins will set remote.*.fetch to a particular ref the build run against, so plain

		# git fetch won't include any branches from the repo. FIXME: This could be removed

		# after new LTS is in place.

		release=${release%%-*}.x

		git -C "$output_dir" fetch origin "+refs/heads/$release:refs/heads/$release"

		lts_2001_fallback=true

	fi

	git -C "$output_dir" checkout "$release"

	git -C "$output_dir" submodule update --init



	cat > $HOME/autorun-spdk.conf <<- EOF

		SPDK_BUILD_SHARED_OBJECT=1