2234.99.0

This commit is contained in:
Flatcar Buildbot 2019-08-28 09:50:25 +02:00 committed by Dongsu Park
parent eac3c577ee
commit 155f24c679
7 changed files with 18 additions and 9 deletions

View File

@ -19,7 +19,7 @@ set randomize_disk_guid=""
set oem_id=""
# Anything else the OEM adds should use this variable.
set linux_append=""
set linux_append="systemd.unified_cgroup_hierarchy=false systemd.legacy_systemd_cgroup_controller=false"
set secure_boot="0"

View File

@ -201,7 +201,7 @@ if [ -n "${VM_PFLASH_RO}" ] && [ -n "${VM_PFLASH_RW}" ]; then
fi
if [ -n "${IGNITION_CONFIG_FILE}" ]; then
set -- -fw_cfg name=opt/org.flatcar-linux/config,file="${IGNITION_CONFIG_FILE}" "$@"
set -- -fw_cfg name=opt/com.coreos/config,file="${IGNITION_CONFIG_FILE}" "$@"
fi
case "${VM_BOARD}" in

View File

@ -4,6 +4,7 @@
GLSA_WHITELIST=(
201412-09 # incompatible CA certificate version numbers
201908-14 # polkit
)
glsa_image() {

View File

@ -237,14 +237,12 @@ function torcx_package() {
# for each package will point at the last version specified. This can handle
# swapping default package versions for different OS releases by reordering.
DEFAULT_IMAGES=(
=app-torcx/docker-1.12
=app-torcx/docker-18.06
=app-torcx/docker-19.03
)
# This list contains extra images which will be uploaded and included in the
# generated manifest, but won't be included in the vendor store.
EXTRA_IMAGES=(
=app-torcx/docker-17.03
)
mkdir -p "${BUILD_DIR}"

View File

@ -2,7 +2,7 @@
# Use a ccache dir that persists across SDK recreations.
# XXX: alternatively use a ccache dir that is usable by all jobs on a given node.
mkdir -p ccache
mkdir -p .cache/ccache
enter() {
local verify_key=
@ -13,7 +13,7 @@ enter() {
sudo ln -f "${GOOGLE_APPLICATION_CREDENTIALS}" \
chroot/etc/portage/gangue.json
bin/cork enter --bind-gpg-agent=false -- env \
CCACHE_DIR=/mnt/host/source/ccache \
CCACHE_DIR=/mnt/host/source/.cache/ccache \
CCACHE_MAXSIZE=5G \
FLATCAR_DEV_BUILDS="${DOWNLOAD_ROOT}" \
{FETCH,RESUME}COMMAND_GS="/usr/bin/gangue get \

View File

@ -13,8 +13,13 @@ gpg --import "${GPG_SECRET_KEY_FILE}"
# Wipe all of catalyst.
sudo rm -rf src/build
enter sudo /mnt/host/source/src/scripts/bootstrap_sdk \
S=/mnt/host/source/src/scripts
enter sudo emerge -uv --jobs=2 catalyst
enter sudo ${S}/bootstrap_sdk \
--sign="${SIGNING_USER}" \
--sign_digests="${SIGNING_USER}" \
--upload_root="${UPLOAD_ROOT}" \
--upload
# Free some disk space only on success to allow debugging failures.
sudo rm -rf src/build/catalyst/builds

View File

@ -13,8 +13,13 @@ gpg --import "${GPG_SECRET_KEY_FILE}"
# Wipe all of catalyst.
sudo rm -rf src/build
enter sudo /mnt/host/source/src/scripts/build_toolchains \
S=/mnt/host/source/src/scripts
enter sudo emerge -uv --jobs=2 catalyst
enter sudo ${S}/build_toolchains \
--sign="${SIGNING_USER}" \
--sign_digests="${SIGNING_USER}" \
--upload_root="${UPLOAD_ROOT}" \
--upload
# Free some disk space only on success to allow debugging failures.
sudo rm -rf src/build/catalyst/builds