use main branch instead of master (#153)

linux-system-roles · Dec 13, 2023 · 71d7589 · 71d7589
1 parent dd06619
commit 71d7589
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/src/tox_lsr/config_files/tox-default.ini b/src/tox_lsr/config_files/tox-default.ini
@@ -26,7 +26,7 @@ setenv =
     LSR_CONFIGDIR = {lsr_configdir}
     LSR_TOX_ENV_NAME = {envname}
     LSR_TOX_ENV_DIR = {envdir}
-    LSR_ROLE2COLL_VERSION = master
+    LSR_ROLE2COLL_VERSION = main
     LSR_ROLE2COLL_NAMESPACE = fedora
     LSR_ROLE2COLL_NAME = linux_system_roles
     LSR_TOX_ENV_TMP_DIR = {envtmpdir}
@@ -221,7 +221,7 @@ deps =
     jmespath
     ruamel.yaml
 commands =
-    bash {lsr_scriptdir}/runcollection.sh {env:LSR_ROLE2COLL_VERSION:master}
+    bash {lsr_scriptdir}/runcollection.sh {env:LSR_ROLE2COLL_VERSION:main}
 
 [testenv:shellcheck]
 changedir = {env:LSR_RUN_TEST_DIR:{toxinidir}}
@@ -386,7 +386,7 @@ deps =
 setenv =  # change this to ANSIBLE_COLLECTIONS_PATH if using a later ansible version
     ANSIBLE_COLLECTIONS_PATHS = {envdir}
 commands =
-    curl -L -o {envdir}/report-modules-plugins.py https://raw.githubusercontent.com/linux-system-roles/auto-maintenance/master/report-modules-plugins.py
+    curl -L -o {envdir}/report-modules-plugins.py https://raw.githubusercontent.com/linux-system-roles/auto-maintenance/main/report-modules-plugins.py
     bash -c '\
     set -euxo pipefail; \
     for file in meta/collection-requirements.yml tests/collection-requirements.yml; do \

diff --git a/src/tox_lsr/test_scripts/runcollection.sh b/src/tox_lsr/test_scripts/runcollection.sh
@@ -12,7 +12,7 @@ SCRIPTDIR=$(readlink -f "$(dirname "$0")")
 
 # Collection commands that are run when `tox -e collection`:
 role=$(basename "${TOPDIR}")
-STABLE_TAG=${1:-master}
+STABLE_TAG=${1:-main}
 
 testlist="yamllint,flake8,shellcheck,ansible-plugin-scan"
 # py38 - pyunit testing is not yet supported

diff --git a/tests/fixtures/test_tox_merge_ini/result.ini b/tests/fixtures/test_tox_merge_ini/result.ini
@@ -22,7 +22,7 @@ setenv = PYTHONPATH = {env:LSR_PYTHONPATH:}{toxinidir}/library:{toxinidir}/modul
 	LSR_CONFIGDIR = {lsr_configdir}
 	LSR_TOX_ENV_NAME = {envname}
 	LSR_TOX_ENV_DIR = {envdir}
-	LSR_ROLE2COLL_VERSION = master
+	LSR_ROLE2COLL_VERSION = main
 	LSR_ROLE2COLL_NAMESPACE = fedora
 	LSR_ROLE2COLL_NAME = linux_system_roles
 	LSR_TOX_ENV_TMP_DIR = {envtmpdir}
@@ -184,7 +184,7 @@ commands = {[testenv:molecule_version]commands}
 changedir = {toxinidir}
 deps = jmespath
 	ruamel.yaml
-commands = bash {lsr_scriptdir}/runcollection.sh {env:LSR_ROLE2COLL_VERSION:master}
+commands = bash {lsr_scriptdir}/runcollection.sh {env:LSR_ROLE2COLL_VERSION:main}
 
 [testenv:shellcheck]
 changedir = {env:LSR_RUN_TEST_DIR:{toxinidir}}
@@ -306,7 +306,7 @@ deps = ansible==6.*
 	jinja2==2.7.* ; python_version <= "3.7"
 setenv = # change this to ANSIBLE_COLLECTIONS_PATH if using a later ansible version
 	ANSIBLE_COLLECTIONS_PATHS = {envdir}
-commands = curl -L -o {envdir}/report-modules-plugins.py https://raw.githubusercontent.com/linux-system-roles/auto-maintenance/master/report-modules-plugins.py
+commands = curl -L -o {envdir}/report-modules-plugins.py https://raw.githubusercontent.com/linux-system-roles/auto-maintenance/main/report-modules-plugins.py
 	bash -c '\
 	set -euxo pipefail; \
 	for file in meta/collection-requirements.yml tests/collection-requirements.yml; do \

diff --git a/tests/unit/test_hooks4.py b/tests/unit/test_hooks4.py
@@ -40,7 +40,7 @@
         "passenv": "*",
         "setenv": (
             "\nLC_ALL = C.UTF-8"
-            "\nLSR_ROLE2COLL_VERSION = master"
+            "\nLSR_ROLE2COLL_VERSION = main"
             "\nLSR_ROLE2COLL_NAMESPACE = fedora"
             "\nLSR_ROLE2COLL_NAME = linux_system_roles"
             "\nLSR_SCRIPTDIR = {lsr_scriptdir}"
@@ -69,7 +69,7 @@
         "passenv": "*",
         "setenv": (
             "\nLC_ALL = C.UTF-8"
-            "\nLSR_ROLE2COLL_VERSION = master"
+            "\nLSR_ROLE2COLL_VERSION = main"
             "\nLSR_ROLE2COLL_NAMESPACE = fedora"
             "\nLSR_ROLE2COLL_NAME = linux_system_roles"
             "\nLSR_SCRIPTDIR = ./scripts"
@@ -112,7 +112,7 @@
         "passenv": "*",
         "setenv": (
             "\nLC_ALL = C.UTF-8"
-            "\nLSR_ROLE2COLL_VERSION = master"
+            "\nLSR_ROLE2COLL_VERSION = main"
             "\nLSR_ROLE2COLL_NAMESPACE = fedora"
             "\nLSR_ROLE2COLL_NAME = linux_system_roles"
             "\nLSR_SCRIPTDIR = ./scripts"