Get the core addons for strict from the main addons branch (#3022)

canonical · Apr 1, 2022 · c915a1c · c915a1c
1 parent 6f33fb3
commit c915a1c
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/build-scripts/set-env-variables.sh b/build-scripts/set-env-variables.sh
@@ -50,7 +50,7 @@ export K8S_DQLITE_TAG="${K8S_DQLITE_TAG:-v1.0.4}"
 export KUBE_SNAP_ROOT="$(readlink -f .)"
 
 export ADDONS_REPOS="
-core,${CORE_ADDONS_REPO:-https://github.com/canonical/microk8s-core-addons},${CORE_ADDONS_REPO_BRANCH:-strict}
+core,${CORE_ADDONS_REPO:-https://github.com/canonical/microk8s-core-addons},${CORE_ADDONS_REPO_BRANCH:-main}
 community,${COMMUNITY_ADDONS_REPO:-https://github.com/canonical/microk8s-addons},${COMMUNITY_ADDONS_REPO_BRANCH:-strict}
 "
 export ADDONS_REPOS_ENABLED="core"

diff --git a/tests/test-upgrade-path.py b/tests/test-upgrade-path.py
@@ -1,7 +1,6 @@
 import pytest
 import os
 import time
-import requests
 from utils import (
     wait_for_installation,
     run_until_success,