Merge pull request #20 from flatcar-linux/dongsu/merge-upstream-2019-08-30

Merge upstream 2019-08-30

build_library/test_image_content.sh

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

jenkins/packages.sh

@@ -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 .cache/ccache
+mkdir -p 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/.cache/ccache \
+            CCACHE_DIR=/mnt/host/source/ccache \
             CCACHE_MAXSIZE=5G \
             FLATCAR_DEV_BUILDS="${DOWNLOAD_ROOT}" \
             {FETCH,RESUME}COMMAND_GS="/usr/bin/gangue get \

jenkins/sdk.sh

@@ -13,13 +13,8 @@ gpg --import "${GPG_SECRET_KEY_FILE}"
 # Wipe all of catalyst.
 sudo rm -rf src/build
 
-S=/mnt/host/source/src/scripts
-enter sudo emerge -uv --jobs=2 catalyst
-enter sudo ${S}/bootstrap_sdk \
+enter sudo /mnt/host/source/src/scripts/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

jenkins/toolchains.sh

@@ -13,13 +13,8 @@ gpg --import "${GPG_SECRET_KEY_FILE}"
 # Wipe all of catalyst.
 sudo rm -rf src/build
 
-S=/mnt/host/source/src/scripts
-enter sudo emerge -uv --jobs=2 catalyst
-enter sudo ${S}/build_toolchains \
+enter sudo /mnt/host/source/src/scripts/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