mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2026-03-04 04:51:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

*: Use new manifests location

Browse Source
This commit is contained in:
Krzesimir Nowak 2023-10-25 10:17:01 +02:00
parent 6843fb701e
commit 051e5e980a
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build_toolchains
View File

@ -41,8 +41,9 @@ create_provenance_overlay() {
read scripts_hash<"${scripts_git}/${scripts_hash#ref: }"
echo "${scripts_hash}" >"${root_overlay}${scripts_git}/HEAD"
fi
mkdir -p "${root_overlay}/mnt/host/source/.repo/manifests"
cp "${REPO_MANIFESTS_DIR}/version.txt" "${root_overlay}/mnt/host/source/.repo/manifests"
local mdir="${root_overlay}/mnt/host/source/src/scripts/manifests"
mkdir -p "${mdir}"
cp "${REPO_MANIFESTS_DIR}/version.txt" "${mdir}"
}
catalyst_init "$@"

2
common.sh
View File

@ -294,7 +294,7 @@ SRC_INTERNAL="${GCLIENT_ROOT}/src-internal"
SCRIPTS_DIR="${SRC_ROOT}/scripts"
BUILD_LIBRARY_DIR="${SCRIPTS_DIR}/build_library"
REPO_CACHE_DIR="${REPO_ROOT}/.cache"
REPO_MANIFESTS_DIR="${REPO_ROOT}/.repo/manifests"
REPO_MANIFESTS_DIR="${SCRIPTS_DIR}/manifests"
# Source FLATCAR_VERSION_ID from manifest.
if [[ -f "${REPO_MANIFESTS_DIR}/version.txt" ]]; then

8
retag-for-jenkins
View File

@ -26,8 +26,12 @@ BUILD_PATCH=$(git format-patch --output=/dev/stdout "${TAG}~1..${TAG}")
git checkout --recurse-submodules "${TAG}"
git reset --hard "${BRANCH}"
echo "${BUILD_PATCH}" | git am -3 || {
git checkout "${TAG}" -- sdk_container/.repo/manifests/version.txt
git add sdk_container/.repo/manifests/version.txt
vertxt='manifest/version.txt'
if ! git checkout "${TAG}" -- "${vertxt}"; then
vertxt='sdk_container/.repo/manifest/version.txt'
git checkout "${TAG}" -- "${vertxt}"
fi
git add "${vertxt}"
git am --continue
# This does not handle submodule conflicts: It should use the one
# from the TAG (similar to version.txt) unless an explicit new

4
run_local_tests.sh
View File

@ -26,7 +26,7 @@
# ./run_local_tests.sh
#
# Optional prerequisites:
# - Custom Mantle container image / version in sdk_container/.repo/manifests/mantle-container.
# - Custom Mantle container image / version in manifests/mantle-container.
# This comes in handy if you've built a local mantle/kola which you want to test.
# Just edit the file and put in the whole containerr image name and version.
#
@ -70,7 +70,7 @@ function run_local_tests() (
rm -f results.*
local mantle_container="$(cat "sdk_container/.repo/manifests/mantle-container")"
local mantle_container="$(cat "manifests/mantle-container")"
local tests=""
local update_tests=false