diff options
| author | Bryan Drewery <bryan@shatow.net> | 2021-08-23 06:36:56 +0300 |
|---|---|---|
| committer | Bryan Drewery <bryan@shatow.net> | 2022-11-10 08:35:55 +0300 |
| commit | cc14e50f166e67bbe61e2c76fd58f3379bc0be1e (patch) | |
| tree | abe564ebd59b7d27479eb85a889bc4164195328f | |
| parent | 55e596cb4c159384982320d1c5777b1c442454bd (diff) | |
bulk/testport: Store bulk output in logs/{bulk,testport}.log
| -rwxr-xr-x | src/share/poudriere/bulk.sh | 9 | ||||
| -rwxr-xr-x | src/share/poudriere/common.sh | 3 | ||||
| -rw-r--r-- | src/share/poudriere/html/build.html | 2 | ||||
| -rwxr-xr-x | src/share/poudriere/testport.sh | 6 |
4 files changed, 13 insertions, 7 deletions
diff --git a/src/share/poudriere/bulk.sh b/src/share/poudriere/bulk.sh index ddf34b1b..39823da5 100755 --- a/src/share/poudriere/bulk.sh +++ b/src/share/poudriere/bulk.sh @@ -237,16 +237,17 @@ read_packages_from_params "$@" CLEANUP_HOOK=bulk_cleanup -run_hook bulk start - -jail_start "${JAILNAME}" "${PTNAME}" "${SETNAME}" - _log_path LOGD if [ -d ${LOGD} -a ${CLEAN} -eq 1 ]; then msg "Cleaning up old logs in ${LOGD}" [ ${DRY_RUN} -eq 0 ] && rm -Rf ${LOGD} 2>/dev/null fi +log_start bulk 1 +run_hook bulk start + +jail_start "${JAILNAME}" "${PTNAME}" "${SETNAME}" + prepare_ports show_build_summary show_dry_run_summary diff --git a/src/share/poudriere/common.sh b/src/share/poudriere/common.sh index 23171b03..744eeba6 100755 --- a/src/share/poudriere/common.sh +++ b/src/share/poudriere/common.sh @@ -377,7 +377,8 @@ _logfile() { # the issue by looking for files older than 1 minute. # Make sure directory exists - mkdir -p "${_log}/logs" "${_latest_log}" + mkdir -p "${_log}/logs" "${_latest_log}" \ + "${_log}/../latest-per-pkg" :> "${_logfile}" diff --git a/src/share/poudriere/html/build.html b/src/share/poudriere/html/build.html index f7d5766e..7a20bd52 100644 --- a/src/share/poudriere/html/build.html +++ b/src/share/poudriere/html/build.html @@ -75,6 +75,8 @@ <ul class="dropdown-menu"> <li><a href="logs/" class="data_url" target="logs"><span class="glyphicon glyphicon-share-alt"></span>All Logs</a></li> <li><a href="logs/errors/" class="data_url" target="logs"><span class="glyphicon glyphicon-share-alt"></span>Error Logs</a></li> + <li><a href="logs/bulk.log" class="data_url" target="logs"><span class="glyphicon glyphicon-share-alt"></span>Bulk Log</a></li> + <li><a href="logs/testport.log" class="data_url" target="logs"><span class="glyphicon glyphicon-share-alt"></span>Testport Log</a></li> <li><a href=".poudriere.pkg_deps%25" class="data_url" target="dependecny_graph"><span class="glyphicon glyphicon-share-alt"></span>Dependency graph</a></li> </ul> </li> diff --git a/src/share/poudriere/testport.sh b/src/share/poudriere/testport.sh index 07b78831..ea483c90 100755 --- a/src/share/poudriere/testport.sh +++ b/src/share/poudriere/testport.sh @@ -191,6 +191,9 @@ export MASTERNAME export MASTERMNT export POUDRIERE_BUILD_TYPE=bulk +_log_path log +log_start testport 1 + jail_start "${JAILNAME}" "${PTNAME}" "${SETNAME}" _pget portsdir ${PTNAME} mnt @@ -250,8 +253,6 @@ prepare_ports show_dry_run_summary markfs prepkg ${MASTERMNT} -_log_path log - PARALLEL_JOBS=${BUILD_PARALLEL_JOBS} POUDRIERE_BUILD_TYPE=bulk parallel_build ${JAILNAME} ${PTNAME} ${SETNAME} @@ -320,6 +321,7 @@ if [ -n "${MAX_MEMORY}" -o -n "${MAX_FILES}" ]; then JEXEC_LIMITS=1 fi unset PKGNAME_VARNAME +log_stop log_start "${PKGNAME}" 1 buildlog_start "${PKGNAME}" "${ORIGINSPEC}" ret=0 |