From c915a1cfda1d8fe5cf91bb9cd2c19e4f5c53a81f Mon Sep 17 00:00:00 2001
From: Konstantinos Tsakalozos <konstantinos.tsakalozos@canonical.com>
Date: Fri, 1 Apr 2022 20:35:13 +0300
Subject: [PATCH] Get the core addons for strict from the main addons branch
 (#3022)

---
 build-scripts/set-env-variables.sh | 2 +-
 tests/test-upgrade-path.py         | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/build-scripts/set-env-variables.sh b/build-scripts/set-env-variables.sh
index c8eec9d74a..2945bce68c 100755
--- 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
index fbd89edbaf..7bca25fb10 100644
--- 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,