chore: Remove proxy settings

Proxy related settings should already be set before calling the script.

Change-Id: If2b047ec2e6165e0a1d33d32fe52d490df7b058e

.ci/Jenkinsfile

@@ -37,8 +37,6 @@ pipeline {
 				YASHCHIKI_CACHES_ROOT = "${HOME}"
 				YASHCHIKI_SPACK_PATH = "${env.WORKSPACE}/spack"
 				YASHCHIKI_SANDBOXES = "sandboxes"
-				YASHCHIKI_PROXY_HTTP = "http://proxy.kip.uni-heidelberg.de:8080"
-				YASHCHIKI_PROXY_HTTPS = "http://proxy.kip.uni-heidelberg.de:8080"
 				YASHCHIKI_BUILD_CACHE_ON_FAILURE_NAME = get_build_cache_on_failure_name()
 				BUILD_CACHE_NAME = "${params.BUILD_CACHE_NAME}"  // propagate parameter to environment
 			}
@@ -96,8 +94,6 @@ pipeline {
 
 								sh "python3 bin/yashchiki visionary ${WORKSPACE}/spack singularity_visionary_temp.img " +
 								   "--log-dir=log " +
-								   "--proxy-http=${YASHCHIKI_PROXY_HTTP} " +
-								   "--proxy-https=${YASHCHIKI_PROXY_HTTPS} " +
 								   "--tmp-subdir=${env.NODE_NAME} " +
 								   "--meta-dir=${YASHCHIKI_META_DIR} " +
 								   "--caches-dir=${YASHCHIKI_CACHES_ROOT} " +

.ci/Jenkinsfile_asic

@@ -37,8 +37,6 @@ pipeline {
 				YASHCHIKI_CACHES_ROOT = "${HOME}"
 				YASHCHIKI_SPACK_PATH = "${env.WORKSPACE}/spack"
 				YASHCHIKI_SANDBOXES = "sandboxes"
-				YASHCHIKI_PROXY_HTTP = "http://proxy.kip.uni-heidelberg.de:8080"
-				YASHCHIKI_PROXY_HTTPS = "http://proxy.kip.uni-heidelberg.de:8080"
 				YASHCHIKI_BUILD_CACHE_ON_FAILURE_NAME = get_build_cache_on_failure_name()
 				BUILD_CACHE_NAME = "${params.BUILD_CACHE_NAME}"  // propagate parameter to environment
 			}
@@ -97,8 +95,6 @@ pipeline {
 
 								sh "python3 bin/yashchiki visionary ${WORKSPACE}/spack singularity_asic_temp.img " +
 								   "--log-dir=log " +
-								   "--proxy-${YASHCHIKI_PROXY_HTTP} " +
-								   "--proxy-https=${YASHCHIKI_PROXY_HTTPS} " +
 								   "--tmp-subdir=${env.NODE_NAME} " +
 								   "--meta-dir=${YASHCHIKI_META_DIR} " +
 								   "--caches-dir=${YASHCHIKI_CACHES_ROOT} " +

bin/yashchiki

@@ -103,12 +103,6 @@ parser.add_argument(
          "<CACHES_DIR>/build_caches/failed/<BUILD_CACHE_NAME> and is "
          "postfix'ed with an ascending integer.")
 # optional options
-parser.add_argument(
-    "--proxy-http", type=str,
-    help="HTTP proxy to use when required.")
-parser.add_argument(
-    "--proxy-https", type=str,
-    help="HTTPS proxy to use when required.")
 parser.add_argument(
     "--debug", action="store_true",
     help="Enable debug-level logging.")
@@ -173,14 +167,6 @@ env = {
     "YASHCHIKI_CACHES_ROOT": args.caches_dir,
 } | os.environ
 
-
-# optionally forward http{,s} proxy if argument given
-if args.proxy_http:
-    env = env | {"YASHCHIKI_PROXY_HTTP": args.proxy_http}
-
-if args.proxy_https:
-    env = env | {"YASHCHIKI_PROXY_HTTPS": args.proxy_https}
-
 if args.build_cache_on_failure_name:
     env = env | {"YASHCHIKI_BUILD_CACHE_ON_FAILURE_NAME": args.build_cache_on_failure_name}
 

bin/yashchiki_deploy_container.sh

@@ -52,9 +52,6 @@ if [ "${CONTAINER_BUILD_TYPE}" = "stable" ]; then
 
     # Announce new container in "Building & Deployment" channel
     # Since the output of this script is used in other parts, we have to hide curl's output
-    export http_proxy=http://proxy.kip.uni-heidelberg.de:8080
-    export https_proxy=http://proxy.kip.uni-heidelberg.de:8080
-
     curl -i -X POST -H 'Content-Type: application/json' \
         -d "{\"text\": \"@channel New stable ${CONTAINER_PREFIX} container built: \`${CONTAINER_NAME}\`\"}" \
         https://chat.bioai.eu/hooks/iuhwp9k3h38c3d98uhwh5fxe9h &>/dev/null

lib/yashchiki/build_sandbox.sh

@@ -14,14 +14,6 @@ unset LC_NUMERIC
 unset LC_TIME
 unset LC_MESSAGES
 
-# build the container (using scripts from above)
-if [ -n "${YASHCHIKI_PROXY_HTTP:-}" ]; then
-	export http_proxy=${YASHCHIKI_PROXY_HTTP}
-fi
-if [ -n "${YASHCHIKI_PROXY_HTTPS:-}" ]; then
-	export https_proxy=${YASHCHIKI_PROXY_HTTPS}
-fi
-
 TARGET_FOLDER="${YASHCHIKI_SANDBOXES}/${CONTAINER_STYLE}"
 
 mkdir ${YASHCHIKI_SANDBOXES}

lib/yashchiki/fetch.sh

@@ -45,14 +45,6 @@ compilers:
     spec: ${YASHCHIKI_SPACK_GCC}
 EOF
 
-# May need proxy to fetch all the packages (also needed in container due to pip)
-if [ -n "${YASHCHIKI_PROXY_HTTP:-}" ]; then
-	export http_proxy=${YASHCHIKI_PROXY_HTTP}
-fi
-if [ -n "${YASHCHIKI_PROXY_HTTPS:-}" ]; then
-	export https_proxy=${YASHCHIKI_PROXY_HTTPS}
-fi
-
 # fetch "everything" (except for pip shitness)
 echo "FETCHING..."
 

lib/yashchiki/setup_env_spack.sh

@@ -30,11 +30,3 @@ fi
 if [ ! -d "${TMPDIR}" ]; then
     mkdir -p "${TMPDIR}"
 fi
-
-# pip alterrrr
-if [ -n "${YASHCHIKI_PROXY_HTTP:-}" ]; then
-	export http_proxy=${YASHCHIKI_PROXY_HTTP}
-fi
-if [ -n "${YASHCHIKI_PROXY_HTTPS:-}" ]; then
-	export https_proxy=${YASHCHIKI_PROXY_HTTPS}
-fi