diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile index 797907cd0673ef863e63b71e91f4f20079162873..8e21278f2fe2562e5f94a784bc9b812724038b4f 100755 --- a/.ci/Jenkinsfile +++ b/.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} " + diff --git a/.ci/Jenkinsfile_asic b/.ci/Jenkinsfile_asic index 045b42f8b510050dd10e7e95f8b1bde50b2badde..fe33da18091bc51ad576fabf8df130f616a81690 100755 --- a/.ci/Jenkinsfile_asic +++ b/.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} " + diff --git a/bin/yashchiki b/bin/yashchiki index 613452277e57e6781815c1ad71389ae42632a456..734a8432cfbfee3743100c37b8eda6dcfb034125 100644 --- a/bin/yashchiki +++ b/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} diff --git a/bin/yashchiki_deploy_container.sh b/bin/yashchiki_deploy_container.sh index 54c5011f1147e5d5c5ee549eb20c0f0de190bf85..b43ed8c69901385636aaafe2ab365ded960f4ca3 100755 --- a/bin/yashchiki_deploy_container.sh +++ b/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 diff --git a/lib/yashchiki/build_sandbox.sh b/lib/yashchiki/build_sandbox.sh index 97ba4ecb1bc773d1eaa961fed8d619afd1c45409..b4b1df7150966efefcb30f7dd1c0f8f532d583f1 100755 --- a/lib/yashchiki/build_sandbox.sh +++ b/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} diff --git a/lib/yashchiki/fetch.sh b/lib/yashchiki/fetch.sh index 9d32fdf29a0aa553654fc8bb3efb716ae677700f..3892f8260777b24c4119d08c10e29eb06dc8d05b 100755 --- a/lib/yashchiki/fetch.sh +++ b/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..." diff --git a/lib/yashchiki/setup_env_spack.sh b/lib/yashchiki/setup_env_spack.sh index f665d56f5d87cbf43064c3b37d78af95da973112..7d43ca6706d6d112932b1c83153e321efbafdc0c 100755 --- a/lib/yashchiki/setup_env_spack.sh +++ b/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