Merge "Modify 'starlingx' ref of feed ostree repo on controller"

This commit is contained in:
Zuul 2022-10-07 18:33:01 +00:00 committed by Gerrit Code Review
commit fcdb9f32fa
2 changed files with 12 additions and 0 deletions

View File

@ -2638,6 +2638,12 @@ if [ "${controller}" = true ] ; then
ilog "Replacing ostree sysroot remote with: ${file_feed} ${feed_branch}"
ostree --repo=/sysroot/ostree/repo remote delete ${instname}
ostree --repo=/sysroot/ostree/repo remote add ${instname} ${file_feed} ${feed_branch}
# Set feed ostree remote "starlingx" to point to active controller's feed ostree repo
feed_remote_name="starlingx"
feed_remote_url="http://controller:8080/feed/rel-${sw_release}/ostree_repo/"
ilog "Replacing ostree feed remote with: ${feed_remote_url} ${feed_remote_name}"
ostree --repo=${repo} remote delete ${feed_remote_name}
ostree --repo=${repo} remote add ${feed_remote_name} ${feed_remote_url} ${feed_branch}
# This fetch is only needed once because the repo is stored in /var
set_variable "ostree_repo_fetched"

View File

@ -2197,6 +2197,12 @@ if [ "${controller}" = true ] ; then
ilog "Replacing ostree sysroot remote ${instname} with: ${file_feed} ${feed_branch}"
ostree --repo=/sysroot/ostree/repo remote delete ${instname}
ostree --repo=/sysroot/ostree/repo remote add ${instname} ${file_feed} ${feed_branch}
# Set feed ostree remote "starlingx" to point to active controller's feed ostree repo
feed_remote_name="starlingx"
feed_remote_url="http://controller:8080/feed/rel-${sw_release}/ostree_repo/"
ilog "Replacing ostree feed remote with: ${feed_remote_url} ${feed_remote_name}"
ostree --repo=${repo} remote delete ${feed_remote_name}
ostree --repo=${repo} remote add ${feed_remote_name} ${feed_remote_url} ${feed_branch}
# This fetch is only needed once because the repo is stored in /var
set_variable "ostree_repo_fetched"