From 18207dc9a33034f8ce5d69214258f48de614e907 Mon Sep 17 00:00:00 2001
From: Benjamin Bertrand <benjamin.bertrand@esss.se>
Date: Mon, 25 Nov 2019 14:53:29 +0100
Subject: [PATCH] Remove default_channels
By default, we have:
default_channels:
- https://repo.anaconda.com/pkgs/main
- https://repo.anaconda.com/pkgs/r
Set it to an empty list to make sure repo.anaconda.com
is not accessed (there shouldn't be any connection to it from the TN).
JIRA INFRA-1560 #action In Progress
---
molecule/default/tests/test_conda.py | 2 ++
templates/system_condarc.j2 | 1 +
2 files changed, 3 insertions(+)
diff --git a/molecule/default/tests/test_conda.py b/molecule/default/tests/test_conda.py
index 8e7fc24..7187d49 100644
--- a/molecule/default/tests/test_conda.py
+++ b/molecule/default/tests/test_conda.py
@@ -23,6 +23,7 @@ def test_condarc_file(host):
channels:
- conda-forge
- anaconda-main
+default_channels: []
auto_update_conda: False
use_only_tar_bz2: True"""
else:
@@ -32,6 +33,7 @@ channels:
- ics-conda
- conda-forge
- anaconda-main
+default_channels: []
auto_update_conda: False
use_only_tar_bz2: True"""
diff --git a/templates/system_condarc.j2 b/templates/system_condarc.j2
index 2938230..65e6fdc 100644
--- a/templates/system_condarc.j2
+++ b/templates/system_condarc.j2
@@ -3,5 +3,6 @@ channels:
{% for channel in conda_channels %}
- {{ channel }}
{% endfor %}
+default_channels: []
auto_update_conda: False
use_only_tar_bz2: True
--
GitLab