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

ktsakalozos · web-flow · commit c915a1cfda1d · 2022-04-01T20:35:13.000+03:00
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,

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ export K8S_DQLITE_TAG="${K8S_DQLITE_TAG:-v1.0.4}"`
`50`	`50`	`export KUBE_SNAP_ROOT="$(readlink -f .)"`
`51`	`51`
`52`	`52`	`export ADDONS_REPOS="`
`53`		`-core,${CORE_ADDONS_REPO:-https://github.com/canonical/microk8s-core-addons},${CORE_ADDONS_REPO_BRANCH:-strict}`
	`53`	`+core,${CORE_ADDONS_REPO:-https://github.com/canonical/microk8s-core-addons},${CORE_ADDONS_REPO_BRANCH:-main}`
`54`	`54`	`community,${COMMUNITY_ADDONS_REPO:-https://github.com/canonical/microk8s-addons},${COMMUNITY_ADDONS_REPO_BRANCH:-strict}`
`55`	`55`	`"`
`56`	`56`	`export ADDONS_REPOS_ENABLED="core"`