mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-22 14:11:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

ci-automation: git author and curl verboseness

Browse Source 
- Git author configuration moves to tagging function and put under a
  condition so as to not pollute peoples' workspaces.
- curl now less verbose since it was spamming logs with TLS debug
  information.

Signed-off-by: Thilo Fromm <thilo@kinvolk.io>
This commit is contained in:
Thilo Fromm 2022-02-17 12:12:08 +01:00
parent 3a416fbf32
commit 95ef0b7322
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ci-automation/ci_automation_common.sh
View File

@ -9,14 +9,6 @@
source ci-automation/ci-config.env source ci-automation/ci-config.env
: ${PIGZ:=pigz} : ${PIGZ:=pigz}
# set up author and email so git does not complain when tagging
if ! git config --get user.name ; then
git -C . config user.name "${CI_GIT_AUTHOR}"
fi
if ! git config --get user.email ; then
git -C . config user.email "${CI_GIT_EMAIL}"
fi
function init_submodules() { function init_submodules() {
git submodule init git submodule init
git submodule update git submodule update
@ -31,7 +23,6 @@ function update_submodule() {
git fetch --all --tags git fetch --all --tags
git checkout "${commit_ish}" git checkout "${commit_ish}"
cd - cd -
} }
# -- # --
@ -58,6 +49,14 @@ function update_submodules() {
function update_and_push_version() { function update_and_push_version() {
local version="$1" local version="$1"
# set up author and email so git does not complain when tagging
if ! git config --get user.name >/dev/null 2>&1 ; then
git -C . config user.name "${CI_GIT_AUTHOR}"
fi
if ! git config --get user.email >/dev/null 2>&1 ; then
git -C . config user.email "${CI_GIT_EMAIL}"
fi
# Add and commit local changes # Add and commit local changes
git add "sdk_container/src/third_party/coreos-overlay" git add "sdk_container/src/third_party/coreos-overlay"
git add "sdk_container/src/third_party/portage-stable" git add "sdk_container/src/third_party/portage-stable"
@ -102,7 +101,7 @@ function copy_from_buildcache() {
local where_to="$2" local where_to="$2"
mkdir -p "$where_to" mkdir -p "$where_to"
curl --verbose --fail --silent --show-error --location --retry-delay 1 --retry 60 \ curl --fail --silent --show-error --location --retry-delay 1 --retry 60 \
--retry-connrefused --retry-max-time 60 --connect-timeout 20 \ --retry-connrefused --retry-max-time 60 --connect-timeout 20 \
--remote-name --output-dir "${where_to}" "https://${BUILDCACHE_SERVER}/${what}" --remote-name --output-dir "${where_to}" "https://${BUILDCACHE_SERVER}/${what}"
} }
@ -194,7 +193,7 @@ function docker_image_from_buildcache() {
local url="https://${BUILDCACHE_SERVER}/containers/${version}/${tgz}" local url="https://${BUILDCACHE_SERVER}/containers/${version}/${tgz}"
curl --verbose --fail --silent --show-error --location --retry-delay 1 --retry 60 \ curl --fail --silent --show-error --location --retry-delay 1 --retry 60 \
--retry-connrefused --retry-max-time 60 --connect-timeout 20 \ --retry-connrefused --retry-max-time 60 --connect-timeout 20 \
--remote-name "${url}" --remote-name "${url}"