Merge branch 'fix-etc-host-avoidance' into 'master'

[bootstrap,deploy] Fix bootstrap and deployment base servers for (internal) CI builds

See merge request !333

.gitlab-ci.yml

@@ -6,7 +6,6 @@ variables:
 
 
 before_script:
-  - if [[ $CI_RUNNER_TAGS == *"docker,"* ]]; then git config --global --add safe.directory ${CI_PROJECT_DIR}; fi
   - python3 ./bob/devtools/bootstrap.py -vv build
   - source ${CONDA_ROOT}/etc/profile.d/conda.sh
   - conda activate base
@@ -38,6 +37,11 @@ stages:
     - bob
     - docker
   image: quay.io/condaforge/linux-anvil-cos7-x86_64
+  before_script:
+    - git config --global --add safe.directory ${CI_PROJECT_DIR}
+    - python3 ./bob/devtools/bootstrap.py -vv build
+    - source ${CONDA_ROOT}/etc/profile.d/conda.sh
+    - conda activate base
   artifacts:
     paths:
       - dist/*.zip
@@ -174,6 +178,7 @@ build_macos_arm_bob_devtools:
 .release_template:
   image: quay.io/condaforge/linux-anvil-cos7-x86_64
   before_script:
+    - git config --global --add safe.directory ${CI_PROJECT_DIR}
     - python3 ./bob/devtools/bootstrap.py -vv local base
     - source ${CONDA_ROOT}/etc/profile.d/conda.sh
     - conda activate base

bob/devtools/bootstrap.py

@@ -34,7 +34,7 @@ show_channel_urls: true #!final
 ssl_verify: false #!final
 """
 
-_SERVER = "http://www.idiap.ch"
+_SERVER = "http://bobconda.lab.idiap.ch"
 
 _INTERVALS = (
     ("weeks", 604800),  # 60 * 60 * 24 * 7

bob/devtools/deploy.py

@@ -11,7 +11,7 @@ logger = logging.getLogger(__name__)
 
 # This must be a copy of what is in bootstrap.py.
 # Notice this script is also called independently of bob.devtools!
-_SERVER = "http://www.idiap.ch"
+_SERVER = "http://bobconda.lab.idiap.ch"
 
 _WEBDAV_PATHS = {
     True: {  # stable?