From b66337e0cbd94024ce249c022482d03978db81c1 Mon Sep 17 00:00:00 2001
From: Jonathan Lebon <jonathan@jlebon.com>
Date: Thu, 19 Jul 2018 13:45:12 -0400
Subject: [PATCH] ci: Pepper in date markers to help debug timing

This should help out with determining what steps take the most time.

Closes: #1459
Approved by: cgwalters
---
 ci/libbuild.sh | 13 +++++++++----
 tests/compose  |  3 ++-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/ci/libbuild.sh b/ci/libbuild.sh
index d6e73888..c15e7fe5 100644
--- a/ci/libbuild.sh
+++ b/ci/libbuild.sh
@@ -1,7 +1,9 @@
 #!/usr/bin/bash
 
 pkg_upgrade() {
+    echo "Running yum -y distro-sync... $(date)"
     yum -y distro-sync
+    echo "Done yum -y distro-sync! $(date)"
 }
 
 make() {
@@ -15,7 +17,9 @@ build() {
 }
 
 pkg_install() {
+    echo "Running yum -y install... $(date)"
     yum -y install "$@"
+    echo "Done running yum -y install! $(date)"
 }
 
 pkg_install_if_os() {
@@ -31,25 +35,26 @@ pkg_install_if_os() {
 }
 
 pkg_builddep() {
+    echo "Running builddep... $(date)"
     # This is sadly the only case where it's a different command
     if test -x /usr/bin/dnf; then
         dnf builddep -y "$@"
     else
         yum-builddep -y "$@"
     fi
+    echo "Done running builddep! $(date)"
 }
 
 pkg_install_builddeps() {
     pkg=$1
     if test -x /usr/bin/dnf; then
-        yum -y install dnf-plugins-core
-        yum install -y 'dnf-command(builddep)'
+        pkg_install dnf-plugins-core 'dnf-command(builddep)'
         # Base buildroot
         pkg_install @buildsys-build
     else
-        yum -y install yum-utils
+        pkg_install yum-utils
         # Base buildroot, copied from the mock config sadly
-        yum -y install bash bzip2 coreutils cpio diffutils system-release findutils gawk gcc gcc-c++ grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz
+        pkg_install bash bzip2 coreutils cpio diffutils system-release findutils gawk gcc gcc-c++ grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz
     fi
     # builddeps+runtime deps
     pkg_builddep $pkg
diff --git a/tests/compose b/tests/compose
index 32521036..dad4bcaf 100755
--- a/tests/compose
+++ b/tests/compose
@@ -41,7 +41,7 @@ datadir_owner=$(stat -c '%u' ${test_compose_datadir})
 test ${uid} = ${datadir_owner}
 
 # Create a consistent cache of the RPMs
-echo "Preparing compose tests..."
+echo "Preparing compose tests... $(date)"
 tmp_repo=${test_compose_datadir}/tmp-repo
 if test -z "${RPMOSTREE_COMPOSE_CACHEONLY:-}"; then
     mkdir -p ${test_compose_datadir}/cache
@@ -51,6 +51,7 @@ if test -z "${RPMOSTREE_COMPOSE_CACHEONLY:-}"; then
     rpm-ostree compose --repo=${tmp_repo} tree --download-only --cachedir=${test_compose_datadir}/cache ${dn}/composedata/fedora-base.json
     (cd ${test_compose_datadir}/cache && createrepo_c .)
 fi
+echo "Done preparing compose tests! $(date)"
 rm ${tmp_repo} -rf
 
 total=0