From 9e2f7c6d5193af33e09484a1f55fb02b77adc97e Mon Sep 17 00:00:00 2001
From: David Michael <david.michael@coreos.com>
Date: Fri, 30 Jun 2017 17:13:40 -0700
Subject: [PATCH] jenkins: Drop conditions not affecting this branch

---
 jenkins/formats-amd64-usr.txt |  1 -
 jenkins/images.sh             | 29 +----------------------------
 jenkins/packages.sh           | 13 -------------
 jenkins/vm.sh                 |  3 ---
 4 files changed, 1 insertion(+), 45 deletions(-)

diff --git a/jenkins/formats-amd64-usr.txt b/jenkins/formats-amd64-usr.txt
index 9f98a63209..a6b3352f9c 100644
--- a/jenkins/formats-amd64-usr.txt
+++ b/jenkins/formats-amd64-usr.txt
@@ -23,7 +23,6 @@ rackspace_onmetal
 rackspace_vhd
 vagrant
 vagrant_parallels
-vagrant_virtualbox
 vagrant_vmware_fusion
 virtualbox
 vmware
diff --git a/jenkins/images.sh b/jenkins/images.sh
index a2b41eb05c..c2d38729ce 100644
--- a/jenkins/images.sh
+++ b/jenkins/images.sh
@@ -1,7 +1,7 @@
 #!/bin/bash -ex
 
 # Clear out old images.
-sudo rm -rf chroot/build src/build torcx
+sudo rm -rf chroot/build src/build
 
 enter() {
         local verify_key=
@@ -12,7 +12,6 @@ enter() {
         sudo ln -f "${GS_DEVEL_CREDS}" chroot/etc/portage/gangue.json
         bin/cork enter --experimental -- env \
             COREOS_DEV_BUILDS="${DOWNLOAD_ROOT}" \
-            PORTAGE_SSH_OPTS= \
             {FETCH,RESUME}COMMAND_GS="/usr/bin/gangue get \
 --json-key=/etc/portage/gangue.json $verify_key \
 "'"${URI}" "${DISTDIR}/${FILE}"' \
@@ -23,8 +22,6 @@ script() {
         enter "/mnt/host/source/src/scripts/$@"
 }
 
-sudo cp bin/gangue chroot/usr/bin/gangue  # XXX: until SDK mantle has it
-
 source .repo/manifests/version.txt
 export COREOS_BUILD_ID
 
@@ -43,29 +40,6 @@ else
         script set_official --board="${BOARD}" --noofficial
 fi
 
-# Try to find the version's torcx store, but don't require it.
-torcx_store=
-enter gsutil cp -r \
-    "${DOWNLOAD_ROOT}/boards/${BOARD}/${COREOS_VERSION}/torcx" \
-    /mnt/host/source/ &&
-torcx_store=/mnt/host/source/torcx &&
-for image in torcx/*.torcx.tgz
-do
-        gpg --verify "${image}.sig"
-done
-
-# Work around the lack of symlink support in GCS.
-shopt -s nullglob
-for default in torcx/*:com.coreos.cl.torcx.tgz
-do
-        for image in torcx/*.torcx.tgz
-        do
-                [ "x${default}" != "x${image}" ] &&
-                cmp --silent -- "${default}" "${image}" &&
-                ln -fns "${image##*/}" "${default}"
-        done
-done
-
 script build_image \
     --board="${BOARD}" \
     --group="${GROUP}" \
@@ -73,6 +47,5 @@ script build_image \
     --getbinpkgver="${COREOS_VERSION}" \
     --sign="${SIGNING_USER}" \
     --sign_digests="${SIGNING_USER}" \
-    ${torcx_store:+--torcx_store="${torcx_store}"} \
     --upload_root="${UPLOAD_ROOT}" \
     --upload prod container
diff --git a/jenkins/packages.sh b/jenkins/packages.sh
index 9702ce045c..89aad56847 100644
--- a/jenkins/packages.sh
+++ b/jenkins/packages.sh
@@ -16,7 +16,6 @@ enter() {
             CCACHE_DIR=/mnt/host/source/.cache/ccache \
             CCACHE_MAXSIZE=5G \
             COREOS_DEV_BUILDS="${DOWNLOAD_ROOT}" \
-            PORTAGE_SSH_OPTS= \
             {FETCH,RESUME}COMMAND_GS="/usr/bin/gangue get \
 --json-key=/etc/portage/gangue.json $verify_key \
 "'"${URI}" "${DISTDIR}/${FILE}"' \
@@ -27,8 +26,6 @@ script() {
         enter "/mnt/host/source/src/scripts/$@"
 }
 
-sudo cp bin/gangue chroot/usr/bin/gangue  # XXX: until SDK mantle has it
-
 source .repo/manifests/version.txt
 export COREOS_BUILD_ID
 
@@ -48,16 +45,6 @@ script build_packages \
     --board="${BOARD}" \
     --getbinpkgver=${RELEASE_BASE:-"${COREOS_VERSION}" --toolchainpkgonly} \
     --skip_chroot_upgrade \
-    $([ -x src/scripts/build_torcx_store ] && echo --skip_torcx_store) \
-    --sign="${SIGNING_USER}" \
-    --sign_digests="${SIGNING_USER}" \
-    --upload_root="${UPLOAD_ROOT}" \
-    --upload
-
-# Build and upload torcx images if this version supports it.
-[ -x src/scripts/build_torcx_store ] &&
-script build_torcx_store \
-    --board="${BOARD}" \
     --sign="${SIGNING_USER}" \
     --sign_digests="${SIGNING_USER}" \
     --upload_root="${UPLOAD_ROOT}" \
diff --git a/jenkins/vm.sh b/jenkins/vm.sh
index a4c79a5308..88b3d8873f 100644
--- a/jenkins/vm.sh
+++ b/jenkins/vm.sh
@@ -12,7 +12,6 @@ enter() {
         sudo ln -f "${GS_DEVEL_CREDS}" chroot/etc/portage/gangue.json
         bin/cork enter --experimental -- env \
             COREOS_DEV_BUILDS="${GS_DEVEL_ROOT}" \
-            PORTAGE_SSH_OPTS= \
             {FETCH,RESUME}COMMAND_GS="/usr/bin/gangue get \
 --json-key=/etc/portage/gangue.json $verify_key \
 "'"${URI}" "${DISTDIR}/${FILE}"' \
@@ -23,8 +22,6 @@ script() {
         enter "/mnt/host/source/src/scripts/$@"
 }
 
-sudo cp bin/gangue chroot/usr/bin/gangue  # XXX: until SDK mantle has it
-
 source .repo/manifests/version.txt
 export COREOS_BUILD_ID