| index : builder | |
| Archlinux32 build system | gitolite user |
| summaryrefslogtreecommitdiff |
| -rwxr-xr-x | lib/load-configuration | 39 |
diff --git a/lib/load-configuration b/lib/load-configuration index 4c825f1..94ec6d9 100755 --- a/lib/load-configuration +++ b/lib/load-configuration @@ -73,9 +73,7 @@ fi if ${i_am_the_master}; then releng_directory="${work_dir}/repos/releng" else - repo_names='packages community archlinux32' - repo_paths__packages="${work_dir}/repos/packages" - repo_paths__community="${work_dir}/repos/community" + repo_names='archlinux32' repo_paths__archlinux32="${work_dir}/repos/packages32" fi @@ -101,10 +99,11 @@ source_by_hash_mirror='https://sources.archlinux32.org/' # what should be tried in what order to somehow repair a broken build straws_that_might_repair_failing_builds=$( printf '%s\n' \ - ':mirrored_source:mirrored_source_by_hash:' \ + ':mirrored_source_by_hash:' \ ':clean_chroot:haskell_without_check:' \ ':with_build_support:' \ - ':with_build_support:clean_chroot:' + ':with_build_support:clean_chroot:' \ + ':with_build_support:haskell_without_check:' ) # root directory of the webserver @@ -126,7 +125,7 @@ mirror_update_command='' mirror_refresh_trigger_urls='' # command to access the mysql database -mysql_command='mysql buildmaster' +mysql_command='mariadb buildmaster' # how long should packages be in [community-testing]/[testing] before # automatically being marked as tested @@ -143,21 +142,23 @@ fi # possibly pull in custom modifications -if [ -r "${base_dir}/conf/common.conf" ]; then +conf_dir="${CONFIG_DIR:-${base_dir}/conf}" + +if [ -r "${conf_dir}/common.conf" ]; then # shellcheck source=/dev/null - . "${base_dir}/conf/common.conf" + . "${conf_dir}/common.conf" fi if ${i_am_the_master} && \ - [ -r "${base_dir}/conf/master.conf" ]; then + [ -r "${conf_dir}/master.conf" ]; then # shellcheck source=/dev/null - . "${base_dir}/conf/master.conf" + . "${conf_dir}/master.conf" fi if ! ${i_am_the_master} && \ - [ -r "${base_dir}/conf/slave.conf" ]; then + [ -r "${conf_dir}/slave.conf" ]; then # shellcheck source=../conf/slave.conf.example - . "${base_dir}/conf/slave.conf" + . "${conf_dir}/slave.conf" fi # check / set up environment @@ -166,10 +167,18 @@ if [ -z "${build_list_lock_file}" ]; then build_list_lock_file="${work_dir}/build-list.lock" fi +if [ -z "${check_mirrors_lock_file}" ]; then + check_mirrors_lock_file="${work_dir}/check-mirrors.lock" +fi + if [ -z "${harvest_commit_times_lock_file}" ]; then harvest_commit_times_lock_file="${work_dir}/harvest-commit-times.lock" fi +if [ -z "${intentions_lock_file}" ]; then + intentions_lock_file="${work_dir}/intentions.lock" +fi + if [ -z "${package_database_lock_file}" ]; then package_database_lock_file="${work_dir}/package-database.lock" fi @@ -212,8 +221,12 @@ for repo in ${repo_names} 'releng'; do 'releng') repo_source='git@git.archlinux32.org:archlinux32/releng.git' ;; + 'state') + repo_source='https://gitlab.archlinux.org/archlinux/packaging/state.git' + ;; *) - repo_source="https://github.com/archlinux/svntogit-${repo}.git" + >&2 printf 'unknown repository "%s"\n' "${repo}" + exit 1 ;; esac git clone --mirror "${repo_source}" "${repo_path}" |