mirror of
https://github.com/flatcar/scripts.git
synced 2025-09-22 14:11:07 +02:00
jenkins: do not configure ccache variables
Setting the invalid CCACHE_ variables resulted in strange failure in projects depending on meson, newer version like 0.55.3. For example systemd build fails like the following errors: ``` * ACCESS DENIED: utimes: /mnt/host/source/ccache * ACCESS DENIED: utimes: /mnt/host/source/ccache F: utimes S: deny P: /mnt/host/source/ccache A: /mnt/host/source/ccache R: /mnt/host/source/ccache C: ccache cc /build/amd64-usr/var/tmp/portage/sys-apps/systemd-246/work/systemd-246-abi_x86_64.amd64/meson-private/sanitycheckc.c -o /build/amd64-usr/var/tmp/portage/sys-apps/systemd-246/work/systemd-246-abi_x86_64.amd64/meson-private/sanitycheckc.exe -O1 -pipe -pipe -D_FILE_OFFSET_BITS=64 ``` We should not set up ccache at all, as it has been already disabled in coreos-overlay repo.
This commit is contained in:
parent
4ae32d068e
commit
829cec45e8
@ -236,12 +236,9 @@ catalyst_init() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
write_configs() {
|
write_configs() {
|
||||||
# No catalyst config option, so defined via environment
|
|
||||||
export CCACHE_DIR="$TEMPDIR/ccache"
|
|
||||||
|
|
||||||
info "Creating output directories..."
|
info "Creating output directories..."
|
||||||
mkdir -m 775 -p "$TEMPDIR/portage/repos.conf" "$DISTDIR" "$CCACHE_DIR"
|
mkdir -m 775 -p "$TEMPDIR/portage/repos.conf" "$DISTDIR"
|
||||||
chown portage:portage "$DISTDIR" "$CCACHE_DIR"
|
chown portage:portage "$DISTDIR"
|
||||||
info "Writing out catalyst configs..."
|
info "Writing out catalyst configs..."
|
||||||
info " catalyst.conf"
|
info " catalyst.conf"
|
||||||
catalyst_conf > "$TEMPDIR/catalyst.conf"
|
catalyst_conf > "$TEMPDIR/catalyst.conf"
|
||||||
|
@ -344,7 +344,6 @@ install_cross_toolchain() {
|
|||||||
|
|
||||||
# Setup environment and wrappers for our shiny new toolchain
|
# Setup environment and wrappers for our shiny new toolchain
|
||||||
gcc_set_latest_profile "${cross_chost}"
|
gcc_set_latest_profile "${cross_chost}"
|
||||||
$sudo CC_QUIET=1 ccache-config --install-links "${cross_chost}"
|
|
||||||
$sudo CC_QUIET=1 sysroot-config --install-links "${cross_chost}"
|
$sudo CC_QUIET=1 sysroot-config --install-links "${cross_chost}"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,9 +1,5 @@
|
|||||||
#!/bin/bash -ex
|
#!/bin/bash -ex
|
||||||
|
|
||||||
# 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
|
|
||||||
|
|
||||||
enter() {
|
enter() {
|
||||||
local verify_key=
|
local verify_key=
|
||||||
trap 'sudo rm -f chroot/etc/portage/gangue.*' RETURN
|
trap 'sudo rm -f chroot/etc/portage/gangue.*' RETURN
|
||||||
@ -13,8 +9,6 @@ enter() {
|
|||||||
sudo ln -f "${GOOGLE_APPLICATION_CREDENTIALS}" \
|
sudo ln -f "${GOOGLE_APPLICATION_CREDENTIALS}" \
|
||||||
chroot/etc/portage/gangue.json
|
chroot/etc/portage/gangue.json
|
||||||
bin/cork enter --bind-gpg-agent=false -- env \
|
bin/cork enter --bind-gpg-agent=false -- env \
|
||||||
CCACHE_DIR=/mnt/host/source/ccache \
|
|
||||||
CCACHE_MAXSIZE=5G \
|
|
||||||
FLATCAR_DEV_BUILDS="${DOWNLOAD_ROOT}" \
|
FLATCAR_DEV_BUILDS="${DOWNLOAD_ROOT}" \
|
||||||
FLATCAR_DEV_BUILDS_SDK="${DOWNLOAD_ROOT_SDK}" \
|
FLATCAR_DEV_BUILDS_SDK="${DOWNLOAD_ROOT_SDK}" \
|
||||||
{FETCH,RESUME}COMMAND_GS="/usr/bin/gangue get \
|
{FETCH,RESUME}COMMAND_GS="/usr/bin/gangue get \
|
||||||
@ -33,9 +27,6 @@ export FLATCAR_BUILD_ID
|
|||||||
# Set up GPG for signing uploads.
|
# Set up GPG for signing uploads.
|
||||||
gpg --import "${GPG_SECRET_KEY_FILE}"
|
gpg --import "${GPG_SECRET_KEY_FILE}"
|
||||||
|
|
||||||
# Figure out if ccache is doing us any good in this scheme.
|
|
||||||
enter ccache --zero-stats
|
|
||||||
|
|
||||||
script setup_board \
|
script setup_board \
|
||||||
--board="${BOARD}" \
|
--board="${BOARD}" \
|
||||||
--getbinpkgver=${RELEASE_BASE:-"${FLATCAR_VERSION}" --toolchainpkgonly} \
|
--getbinpkgver=${RELEASE_BASE:-"${FLATCAR_VERSION}" --toolchainpkgonly} \
|
||||||
@ -61,5 +52,3 @@ script build_torcx_store \
|
|||||||
--torcx_upload_root="${TORCX_PKG_DOWNLOAD_ROOT}" \
|
--torcx_upload_root="${TORCX_PKG_DOWNLOAD_ROOT}" \
|
||||||
--tectonic_torcx_download_root="${TECTONIC_TORCX_DOWNLOAD_ROOT}" \
|
--tectonic_torcx_download_root="${TECTONIC_TORCX_DOWNLOAD_ROOT}" \
|
||||||
--upload
|
--upload
|
||||||
|
|
||||||
enter ccache --show-stats
|
|
||||||
|
@ -71,7 +71,7 @@ PORTAGE_BINHOST="$FLAGS_binhost $(get_sdk_binhost)"
|
|||||||
: ${PORTAGE_USERNAME:=${USER}}
|
: ${PORTAGE_USERNAME:=${USER}}
|
||||||
|
|
||||||
# Clean up old distfiles cache. It used to be split for 'host' and
|
# Clean up old distfiles cache. It used to be split for 'host' and
|
||||||
# 'target' but that just duplicates files. Also a ccache was in there.
|
# 'target' but that just duplicates files.
|
||||||
if [[ -d "${REPO_CACHE_DIR}/distfiles/host" ]]; then
|
if [[ -d "${REPO_CACHE_DIR}/distfiles/host" ]]; then
|
||||||
info "Cleaning up old distfiles cache..."
|
info "Cleaning up old distfiles cache..."
|
||||||
sudo mv "${REPO_CACHE_DIR}"/{distfiles/host,distfiles.host}
|
sudo mv "${REPO_CACHE_DIR}"/{distfiles/host,distfiles.host}
|
||||||
@ -95,7 +95,6 @@ PORT_LOGDIR="/var/log/portage"
|
|||||||
PORTAGE_BINHOST="$PORTAGE_BINHOST"
|
PORTAGE_BINHOST="$PORTAGE_BINHOST"
|
||||||
PORTAGE_USERNAME="${PORTAGE_USERNAME}"
|
PORTAGE_USERNAME="${PORTAGE_USERNAME}"
|
||||||
MAKEOPTS="--jobs=${NUM_JOBS} --load-average=$((NUM_JOBS * 2))"
|
MAKEOPTS="--jobs=${NUM_JOBS} --load-average=$((NUM_JOBS * 2))"
|
||||||
CCACHE_UMASK="002"
|
|
||||||
|
|
||||||
# Generally there isn't any need to add packages to @world by default.
|
# Generally there isn't any need to add packages to @world by default.
|
||||||
# You can use --select to override this.
|
# You can use --select to override this.
|
||||||
@ -214,7 +213,6 @@ EMERGE_CMD="emerge"
|
|||||||
# can cause serious issues later.
|
# can cause serious issues later.
|
||||||
info "Updating basic system packages"
|
info "Updating basic system packages"
|
||||||
sudo -E ${EMERGE_CMD} --quiet "${EMERGE_FLAGS[@]}" \
|
sudo -E ${EMERGE_CMD} --quiet "${EMERGE_FLAGS[@]}" \
|
||||||
dev-util/ccache \
|
|
||||||
sys-apps/portage \
|
sys-apps/portage \
|
||||||
sys-devel/crossdev \
|
sys-devel/crossdev \
|
||||||
sys-devel/sysroot-wrappers \
|
sys-devel/sysroot-wrappers \
|
||||||
|
Loading…
x
Reference in New Issue
Block a user