#!/bin/bash
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
EXITCODE=0
INSTANCE=$1
+REVISION=$2
if [[ "$INSTANCE" == '' ]]; then
- echo "Syntax: $0 <instance>"
+ echo "Syntax: $0 <instance> [revision]"
exit 1
fi
+if [[ "$REVISION" == '' ]]; then
+ # See if there's a configuration file with the revision?
+ CONFIG_PATH=/home/jenkins/configuration/$INSTANCE.arvadosapi.com-versions.conf
+ if [[ -f $CONFIG_PATH ]]; then
+ echo "Loading git revision from $CONFIG_PATH"
+ . $CONFIG_PATH
+ REVISION=$ARVADOS_GIT_REVISION
+ fi
+fi
+
+if [[ "$REVISION" != '' ]]; then
+ echo "Git revision is $REVISION"
+else
+ echo "No valid git revision found, proceeding with what is in place."
+fi
+
# Sanity check
if ! [[ -n "$WORKSPACE" ]]; then
echo "WORKSPACE environment variable not set"
cd $WORKSPACE
+if [[ "$REVISION" != '' ]]; then
+ git checkout $REVISION
+fi
+
+ECODE=$?
+
+if [[ "$ECODE" != "0" ]]; then
+ title "!!!!!! DIAGNOSTICS FAILED (`timer`) !!!!!!"
+ EXITCODE=$(($EXITCODE + $ECODE))
+ exit $EXITCODE
+fi
+
cp -f /home/jenkins/diagnostics/arvados-workbench/$INSTANCE-application.yml $WORKSPACE/apps/workbench/config/application.yml
cd $WORKSPACE/apps/workbench
mkdir tmp
fi
-RAILS_ENV=diagnostics bundle exec rake TEST=test/diagnostics/pipeline_test.rb
+if [ $INSTANCE == '9tee4' ]
+then
+ RAILS_ENV=diagnostics bundle exec rake TEST=test/diagnostics/container_request_test.rb
+else
+ RAILS_ENV=diagnostics bundle exec rake TEST=test/diagnostics/pipeline_test.rb
+fi
ECODE=$?
+if [[ "$REVISION" != '' ]]; then
+ git checkout main
+fi
+
if [[ "$ECODE" != "0" ]]; then
title "!!!!!! DIAGNOSTICS FAILED (`timer`) !!!!!!"
EXITCODE=$(($EXITCODE + $ECODE))