starlingx/meta-starlingx
Code Issues Proposed changes

puppet: fix for the branch change

Browse Source 
The branch stable/pike is gone from upstream for these
puppet packages, and they don't need to be upgraded in
stx 5.0, so just add "nobranch=1" to bypass the branch
check, no actual source code update for these recipes.

Story: 2008952
Task: 42576

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Change-Id: I44e39064fc0ba0cb3db84746de41c44791a9f6fa
This commit is contained in:
Jackie Huang 2021-06-24 10:18:21 +08:00
parent 3f70ff8055
commit 474792331f
5 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
meta-stx-cloud/recipes-support/puppet/puppet-barbican_git.bb
View File

@ -11,10 +11,9 @@ RDEPENDS_${PN} += " \
PV = "11.3.0" PV = "11.3.0"
SRCREV = "8241a1d13be6c3ee6344fa46dcfc045439044e76" SRCREV = "8241a1d13be6c3ee6344fa46dcfc045439044e76"
PROTOCOL = "https" PROTOCOL = "https"
BRANCH = "stable/pike"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
SRC_URI = "git://github.com/openstack/puppet-barbican.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \ SRC_URI = "git://github.com/openstack/puppet-barbican.git;protocol=${PROTOCOL};rev=${SRCREV};nobranch=1 \
file://puppet-barbican/Add-gemspec.patch \ file://puppet-barbican/Add-gemspec.patch \
" "

3
meta-stx-cloud/recipes-support/puppet/puppet-horizon_git.bb
View File

@ -13,10 +13,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=12a15a9ebddda7d856c783f745e5ee47"
PV = "11.5.0" PV = "11.5.0"
SRCREV = "d75706e38fdf63f9c3174a526a7d07799390dfeb" SRCREV = "d75706e38fdf63f9c3174a526a7d07799390dfeb"
PROTOCOL = "https" PROTOCOL = "https"
BRANCH = "stable/pike"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
SRC_URI = "git://github.com/openstack/puppet-horizon.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \ SRC_URI = "git://github.com/openstack/puppet-horizon.git;protocol=${PROTOCOL};rev=${SRCREV};nobranch=1 \
file://${PN}/Add-gemspec.patch \ file://${PN}/Add-gemspec.patch \
" "

3
meta-stx-cloud/recipes-support/puppet/puppet-keystone_git.bb
View File

@ -7,10 +7,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=12a15a9ebddda7d856c783f745e5ee47"
PV = "11.3.0" PV = "11.3.0"
SRCREV = "305c91cac00f720ad6461b442e71b52b12f9ae57" SRCREV = "305c91cac00f720ad6461b442e71b52b12f9ae57"
PROTOCOL = "https" PROTOCOL = "https"
BRANCH = "stable/pike"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
SRC_URI = "git://github.com/openstack/puppet-keystone.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \ SRC_URI = "git://github.com/openstack/puppet-keystone.git;protocol=${PROTOCOL};rev=${SRCREV};nobranch=1 \
file://puppet-keystone/Add-gemspec.patch \ file://puppet-keystone/Add-gemspec.patch \
" "

3
meta-stx-cloud/recipes-support/puppet/puppet-openstacklib_git.bb
View File

@ -7,10 +7,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=12a15a9ebddda7d856c783f745e5ee47"
PV = "11.3.0" PV = "11.3.0"
SRCREV = "79a799f5d78667b5eee81e71782e8591f2e62ecc" SRCREV = "79a799f5d78667b5eee81e71782e8591f2e62ecc"
PROTOCOL = "https" PROTOCOL = "https"
BRANCH = "stable/pike"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
SRC_URI = "git://github.com/openstack/puppet-openstacklib.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \ SRC_URI = "git://github.com/openstack/puppet-openstacklib.git;protocol=${PROTOCOL};rev=${SRCREV};nobranch=1 \
file://puppet-openstacklib/Add-gemspec.patch \ file://puppet-openstacklib/Add-gemspec.patch \
" "

3
meta-stx-cloud/recipes-support/puppet/puppet-oslo_git.bb
View File

@ -7,10 +7,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86e96afa80a52eedda5dccc1af36b4f2"
PV = "11.3.0" PV = "11.3.0"
SRCREV = "5ad200e9d8af200a8f50f86a2db4cf3f36ab2a4c" SRCREV = "5ad200e9d8af200a8f50f86a2db4cf3f36ab2a4c"
PROTOCOL = "https" PROTOCOL = "https"
BRANCH = "stable/pike"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
SRC_URI = "git://github.com/openstack/puppet-oslo.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \ SRC_URI = "git://github.com/openstack/puppet-oslo.git;protocol=${PROTOCOL};rev=${SRCREV};nobranch=1 \
file://puppet-oslo/Add-gemspec.patch \ file://puppet-oslo/Add-gemspec.patch \
" "