add support for ad-hoc timing

buildjob

@@ -19,11 +19,13 @@ set -eo pipefail
 ##   commit as a new package on opam when done.  Requires the
 ##   $OPAM_UPDATE_SECRET variable to be set.  This only happens if the current
 ##   branch is `master`.
-## - $TIMING_PROJECT, $TIMING_CONF, $TIMING_SECRET: When running on the
-##   `coop-timing` runner, submit timing information to coq-speed with the given
-##   project name and configuration string.  $TIMING_PROJECT defaults to the
-##   repository name.  $TIMING_CONF defaults to the job name.  Reqires the
-##   $TIMING_SECRET variable to be set.
+## - $TIMING_PROJECT, $TIMING_SECRET: When running on the `coop-timing` runner,
+##   submit timing information to coq-speed with the given project name.
+##   $TIMING_PROJECT defaults to the repository name. Reqires the $TIMING_SECRET
+##   variable to be set. The timing "branch" is determined by $CI_COMMIT_BRANCH
+##   and the "config" by the job name, but that can be overwritten by setting
+##   $TIMING_AD_HOC_ID. In that case the branch will be set to `@hoc` and the
+##   configuration will be set to the $TIMING_AD_HOC_ID.
 ## - $DOC_DIR, $DOC_KEY, $DOC_OPTS: If $DOC_DIR is non-empty, run coqdoc and
 ##   upload the results to the given directory.  This only happens if the
 ##   current branch is `master`.  Requires the $DOC_KEY variable to be set to
@@ -36,7 +38,6 @@ status "[buildjob] Pipeline source: $CI_PIPELINE_SOURCE; commit branch (empty fo
 OCAML=${OCAML:-ocaml-base-compiler.4.08.1}
 MAKE_TARGET=${MAKE_TARGET:-all}
 TIMING_PROJECT=${TIMING_PROJECT:-$CI_PROJECT_NAME}
-TIMING_CONF=${TIMING_CONF:-$CI_JOB_NAME}
 
 # Environment sanity checks
 if [[ -n "$VALIDATE" ]]; then
@@ -89,14 +90,21 @@ if [[ "$CI_RUNNER_DESCRIPTION" == "coop-timing" && -n "$CI_COMMIT_BRANCH" ]]; th
     if [[ -z "$TIMING_SECRET" ]]; then
         panic "[buildjob] TIMING_SECRET variable is missing"
     fi
+    # determine branch and config
+    TIMING_BRANCH=$CI_COMMIT_BRANCH
+    TIMING_CONFIG=$CI_JOB_NAME
+    if [[ -n "$TIMING_AD_HOC_ID" ]]; then
+        TIMING_BRANCH="@hoc"
+        TIMING_CONFIG=$TIMING_AD_HOC_ID
+    fi
     # Submit to webhook endpoint
     status "[buildjob] Submitting timing information to coq-speed (Project: $TIMING_PROJECT, Branch: $CI_COMMIT_BRANCH, Config: $TIMING_CONF)"
     curl --fail -sS -X POST https://coq-speed.mpi-sws.org/webhook/build_times \
          --user "$TIMING_SECRET" \
-         -H "X-Commit: $CI_COMMIT_SHA" \
          -H "X-Project: $TIMING_PROJECT" \
-         -H "X-Branch: $CI_COMMIT_BRANCH" \
-         -H "X-Config: $TIMING_CONF" \
+         -H "X-Branch: $TIMING_BRANCH" \
+         -H "X-Config: $TIMING_CONFIG" \
+         -H "X-Commit: $CI_COMMIT_SHA" \
          -H "X-Date: $(git show $CI_COMMIT_SHA -s --pretty=%cI)" \
          --data-binary @- < build-times.txt
 fi