Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Framework/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ configure_file(basic-functional.json.in ${CMAKE_BINARY_DIR}/tests/basic-function
add_test(NAME functional_test COMMAND o2-qc-functional-test.sh)
set_tests_properties(functional_test PROPERTIES ENVIRONMENT "JSON_DIR=${CMAKE_BINARY_DIR}/tests;UNIQUE_ID=${UNIQUE_ID}")
set_property(TEST functional_test PROPERTY LABELS slow)
set_property(TEST functional_test PROPERTY TIMEOUT 45)
set_property(TEST functional_test PROPERTY TIMEOUT 50)

include(GenerateUniquePort)
o2_generate_unique_port(UNIQUE_PORT_1)
Expand Down
4 changes: 2 additions & 2 deletions Framework/advanced-aggregator.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"config": {
"database": {
"implementation": "CCDB",
"host": "ccdb-test.cern.ch:8080",
"host": "localhost:8083",
"username": "not_applicable",
"password": "not_applicable",
"name": "not_applicable"
Expand All @@ -19,7 +19,7 @@
"url": ""
},
"conditionDB": {
"url": "ccdb-test.cern.ch:8080"
"url": "localhost:8083"
},
"infologger": { "": "Configuration of the Infologger (optional).",
"filterDiscardDebug": "true", "": "Set to true to discard debug and trace messages (default: false)",
Expand Down
4 changes: 2 additions & 2 deletions Framework/advanced-external-histo.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"config": {
"database": {
"implementation": "CCDB",
"host": "ccdb-test.cern.ch:8080",
"host": "localhost:8083",
"username": "not_applicable",
"password": "not_applicable",
"name": "not_applicable"
Expand All @@ -19,7 +19,7 @@
"url": ""
},
"conditionDB": {
"url": "ccdb-test.cern.ch:8080"
"url": "localhost:8083"
}
},
"tasks": {
Expand Down
4 changes: 2 additions & 2 deletions Framework/advanced.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"config": {
"database": {
"implementation": "CCDB",
"host": "ccdb-test.cern.ch:8080",
"host": "localhost:8083",
"username": "not_applicable",
"password": "not_applicable",
"name": "not_applicable"
Expand All @@ -19,7 +19,7 @@
"url": ""
},
"conditionDB": {
"url": "ccdb-test.cern.ch:8080"
"url": "localhost:8083"
},
"infologger": { "": "Configuration of the Infologger (optional).",
"filterDiscardDebug": "true", "": "Set to true to discard debug and trace messages (default: false)",
Expand Down
4 changes: 2 additions & 2 deletions Framework/basic-aggregator.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"config": {
"database": {
"implementation": "CCDB",
"host": "ccdb-test.cern.ch:8080",
"host": "localhost:8083",
"username": "not_applicable",
"password": "not_applicable",
"name": "not_applicable"
Expand All @@ -19,7 +19,7 @@
"url": ""
},
"conditionDB": {
"url": "ccdb-test.cern.ch:8080"
"url": "localhost:8083"
},
"infologger": { "": "Configuration of the Infologger (optional).",
"filterDiscardDebug": "false", "": "Set to 1 to discard debug and trace messages (default: false)",
Expand Down
4 changes: 2 additions & 2 deletions Framework/basic-external-histo.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"config": {
"database": {
"implementation": "CCDB",
"host": "ccdb-test.cern.ch:8080",
"host": "localhost:8083",
"username": "not_applicable",
"password": "not_applicable",
"name": "not_applicable"
Expand All @@ -19,7 +19,7 @@
"url": ""
},
"conditionDB": {
"url": "ccdb-test.cern.ch:8080"
"url": "localhost:8083"
}
},
"tasks": {
Expand Down
4 changes: 2 additions & 2 deletions Framework/basic-functional.json.in
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"config": {
"database": {
"implementation": "CCDB",
"host": "ccdb-test.cern.ch:8080",
"host": "ali-qcdb-test.cern.ch:8083",
"username": "not_applicable",
"password": "not_applicable",
"name": "not_applicable"
Expand All @@ -23,7 +23,7 @@
"url": ""
},
"conditionDB": {
"url": "ccdb-test.cern.ch:8080"
"url": "localhost:8083"
}
},
"tasks": {
Expand Down
4 changes: 2 additions & 2 deletions Framework/basic-no-sampling.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"config": {
"database": {
"implementation": "CCDB",
"host": "ccdb-test.cern.ch:8080",
"host": "localhost:8083",
"username": "not_applicable",
"password": "not_applicable",
"name": "not_applicable"
Expand All @@ -19,7 +19,7 @@
"url": ""
},
"conditionDB": {
"url": "ccdb-test.cern.ch:8080"
"url": "localhost:8083"
}
},
"tasks": {
Expand Down
7 changes: 2 additions & 5 deletions Framework/basic.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"config": {
"database": {
"implementation": "CCDB",
"host": "ccdb-test.cern.ch:8080",
"host": "localhost:8083",
"username": "not_applicable",
"password": "not_applicable",
"name": "not_applicable",
Expand All @@ -16,14 +16,11 @@
"passName": "", "": "Pass type - e.g. spass, cpass1",
"provenance": "qc", "": "Provenance - qc or qc_mc depending whether it is normal data or monte carlo data"
},
"monitoring": {
"url": "infologger:///debug?qc"
},
"consul": {
"url": ""
},
"conditionDB": {
"url": "ccdb-test.cern.ch:8080"
"url": "localhost:8083"
},
"infologger": { "": "Configuration of the Infologger (optional).",
"filterDiscardDebug": "false", "": "Set to true to discard debug and trace messages (default: false)",
Expand Down
4 changes: 2 additions & 2 deletions Framework/batch-test.json.in
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"config": {
"database": {
"implementation": "CCDB",
"host": "ccdb-test.cern.ch:8080",
"host": "localhost:8083",
"username": "not_applicable",
"password": "not_applicable",
"name": "not_applicable"
Expand All @@ -23,7 +23,7 @@
"url": ""
},
"conditionDB": {
"url": "ccdb-test.cern.ch:8080"
"url": "localhost:8083"
}
},
"tasks": {
Expand Down
2 changes: 1 addition & 1 deletion Framework/example-default.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"url": ""
},
"conditionDB": {
"url": "ccdb-test.cern.ch:8080"
"url": "localhost:8083"
}
},
"tasks": {
Expand Down
2 changes: 1 addition & 1 deletion Framework/include/QualityControl/CommonSpec.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ struct CommonSpec {
int activityOriginalNumber = 0;
std::string monitoringUrl = "infologger:///debug?qc";
std::string consulUrl;
std::string conditionDBUrl = "http://ccdb-test.cern.ch:8080";
std::string conditionDBUrl = "http://ali-qcdb-test.cern.ch:8083";
LogDiscardParameters infologgerDiscardParameters;
double postprocessingPeriod = 30.0;
std::string bookkeepingUrl;
Expand Down
4 changes: 2 additions & 2 deletions Framework/multiNode.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"config": {
"database": {
"implementation": "CCDB",
"host": "ccdb-test.cern.ch:8080",
"host": "localhost:8083",
"username": "not_applicable",
"password": "not_applicable",
"name": "not_applicable"
Expand All @@ -19,7 +19,7 @@
"url": ""
},
"conditionDB": {
"url": "ccdb-test.cern.ch:8080"
"url": "localhost:8083"
}
},
"tasks": {
Expand Down
4 changes: 2 additions & 2 deletions Framework/multinode-test.json.in
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"config": {
"database": {
"implementation": "CCDB",
"host": "ccdb-test.cern.ch:8080",
"host": "localhost:8083",
"username": "not_applicable",
"password": "not_applicable",
"name": "not_applicable"
Expand All @@ -21,7 +21,7 @@
"url": ""
},
"conditionDB": {
"url": "ccdb-test.cern.ch:8080"
"url": "localhost:8083"
}
},
"tasks": {
Expand Down
4 changes: 2 additions & 2 deletions Framework/postprocessing-async.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"config": {
"database": {
"implementation": "CCDB",
"host": "ccdb-test.cern.ch:8080",
"host": "localhost:8083",
"username": "not_applicable",
"password": "not_applicable",
"name": "not_applicable"
Expand All @@ -22,7 +22,7 @@
"url": ""
},
"conditionDB": {
"url": "ccdb-test.cern.ch:8080"
"url": "localhost:8083"
},
"postprocessing": {
"periodSeconds": "0.0001"
Expand Down
4 changes: 2 additions & 2 deletions Framework/postprocessing.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"config": {
"database": {
"implementation": "CCDB",
"host": "ccdb-test.cern.ch:8080",
"host": "localhost:8083",
"username": "not_applicable",
"password": "not_applicable",
"name": "not_applicable"
Expand All @@ -19,7 +19,7 @@
"url": ""
},
"conditionDB": {
"url": "ccdb-test.cern.ch:8080"
"url": "localhost:8083"
},
"postprocessing": {
"periodSeconds": "10"
Expand Down
4 changes: 2 additions & 2 deletions Framework/readout-no-sampling.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"config": {
"database": {
"implementation": "CCDB",
"host": "ccdb-test.cern.ch:8080",
"host": "localhost:8083",
"username": "not_applicable",
"password": "not_applicable",
"name": "not_applicable"
Expand All @@ -19,7 +19,7 @@
"url": ""
},
"conditionDB": {
"url": "ccdb-test.cern.ch:8080"
"url": "localhost:8083"
}
},
"tasks": {
Expand Down
4 changes: 2 additions & 2 deletions Framework/readout.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"config": {
"database": {
"implementation": "CCDB",
"host": "ccdb-test.cern.ch:8080",
"host": "localhost:8083",
"username": "not_applicable",
"password": "not_applicable",
"name": "not_applicable"
Expand All @@ -19,7 +19,7 @@
"url": ""
},
"conditionDB": {
"url": "ccdb-test.cern.ch:8080"
"url": "localhost:8083"
}
},
"tasks": {
Expand Down
2 changes: 1 addition & 1 deletion Framework/script/RepoCleaner/qcrepocleaner/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,4 +78,4 @@ Rules:
# policy: 1_per_hour

Ccdb:
Url: http://ccdb-test.cern.ch:8080
Url: http://ali-qcdb-test.cern.ch:8083
20 changes: 10 additions & 10 deletions Framework/script/o2-qc-functional-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,17 @@ echo "ROOT_DYN_PATH : $ROOT_DYN_PATH"

# make sure the CCDB is available otherwise we bail (no failure)
# we do not use ping because it will fail from outside CERN.
if curl --silent --connect-timeout 1 ccdb-test.cern.ch:8080 > /dev/null 2>&1 ; then
if curl --silent --connect-timeout 1 ali-qcdb-test.cern.ch:8083 > /dev/null 2>&1 ; then
echo "CCDB is reachable."
else
echo "CCDB not reachable, functional test is cancelled."
exit 0
fi

# delete data
curl -i -L ccdb-test.cern.ch:8080/truncate/qc/TST/MO/FunctionalTest${UNIQUE_ID}*
curl -i -L ccdb-test.cern.ch:8080/truncate/qc/TST/QO/FunctionalTest${UNIQUE_ID}*
curl -i -L ccdb-test.cern.ch:8080/truncate/qc/TST/QO/FunctionalTestAggregator${UNIQUE_ID}*
curl -i -L ali-qcdb-test.cern.ch:8083/truncate/qc/TST/MO/FunctionalTest${UNIQUE_ID}*
curl -i -L ali-qcdb-test.cern.ch:8083/truncate/qc/TST/QO/FunctionalTest${UNIQUE_ID}*
curl -i -L ali-qcdb-test.cern.ch:8083/truncate/qc/TST/QO/FunctionalTestAggregator${UNIQUE_ID}*

# store data
DIR="$(dirname "${BASH_SOURCE[0]}")" # get the directory name
Expand All @@ -40,7 +40,7 @@ o2-qc-run-producer --message-amount 10 -b | o2-qc --config json://${JSON_DIR}/ba

# check MonitorObject
# first the return code must be 200
code=$(curl -L ccdb-test.cern.ch:8080/qc/TST/MO/FunctionalTest${UNIQUE_ID}/example/8000000/PeriodName=LHC9000x/PassName=apass500 --write-out %{http_code} --silent --output /tmp/output${UNIQUE_ID}.root)
code=$(curl -L ali-qcdb-test.cern.ch:8083/qc/TST/MO/FunctionalTest${UNIQUE_ID}/example/8000000/PeriodName=LHC9000x/PassName=apass500 --write-out %{http_code} --silent --output /tmp/output${UNIQUE_ID}.root)
if (( $code != 200 )); then
echo "Error, monitor object could not be found."
exit 2
Expand All @@ -50,7 +50,7 @@ root -b -l -q -e 'TFile f("/tmp/output${UNIQUE_ID}.root"); f.Print();'

# check QualityObject created by the Check
# first the return code must be 200
code=$(curl -L ccdb-test.cern.ch:8080/qc/TST/QO/FunctionalTest${UNIQUE_ID}/8000000/PeriodName=LHC9000x/PassName=apass500 --write-out %{http_code} --silent --output /tmp/output${UNIQUE_ID}.root)
code=$(curl -L ali-qcdb-test.cern.ch:8083/qc/TST/QO/FunctionalTest${UNIQUE_ID}/8000000/PeriodName=LHC9000x/PassName=apass500 --write-out %{http_code} --silent --output /tmp/output${UNIQUE_ID}.root)
if (( $code != 200 )); then
echo "Error, data not found."
exit 2
Expand All @@ -60,7 +60,7 @@ root -b -l -q -e 'TFile f("/tmp/output${UNIQUE_ID}.root"); f.Print();'

# check QualityObject created by the Aggregator
# first the return code must be 200
code=$(curl -L ccdb-test.cern.ch:8080/qc/TST/QO/FunctionalTestAggregator${UNIQUE_ID}/newQuality/8000000/PeriodName=LHC9000x/PassName=apass500 --write-out %{http_code} --silent --output /tmp/output${UNIQUE_ID}.root)
code=$(curl -L ali-qcdb-test.cern.ch:8083/qc/TST/QO/FunctionalTestAggregator${UNIQUE_ID}/newQuality/8000000/PeriodName=LHC9000x/PassName=apass500 --write-out %{http_code} --silent --output /tmp/output${UNIQUE_ID}.root)
if (( $code != 200 )); then
echo "Error, data not found."
exit 2
Expand All @@ -69,6 +69,6 @@ fi
root -b -l -q -e 'TFile f("/tmp/output${UNIQUE_ID}.root"); f.Print();'

# delete the data
curl -i -L ccdb-test.cern.ch:8080/truncate/qc/TST/MO/FunctionalTest${UNIQUE_ID}*
curl -i -L ccdb-test.cern.ch:8080/truncate/qc/TST/QO/FunctionalTest${UNIQUE_ID}*
curl -i -L ccdb-test.cern.ch:8080/truncate/qc/TST/QO/FunctionalTestAggregator${UNIQUE_ID}*
curl -i -L ali-qcdb-test.cern.ch:8083/truncate/qc/TST/MO/FunctionalTest${UNIQUE_ID}*
curl -i -L ali-qcdb-test.cern.ch:8083/truncate/qc/TST/QO/FunctionalTest${UNIQUE_ID}*
curl -i -L ali-qcdb-test.cern.ch:8083/truncate/qc/TST/QO/FunctionalTestAggregator${UNIQUE_ID}*
6 changes: 3 additions & 3 deletions Framework/src/runRepositoryBenchmark.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ void addCustomOptions(bpo::options_description& options)
"Maximum number of iterations of Run/ConditionalRun/OnData (0 - infinite, default : 3)")(
"number-tasks", bpo::value<uint64_t>()->default_value(0),
"Informative only, the number of tasks being ran in parallel.")(
"database-url", bpo::value<std::string>()->default_value("ccdb-test.cern.ch:8080"),
"Database url (default : ccdb-test.cern.ch:8080")("database-username", bpo::value<std::string>()->default_value(""),
"Database username (default : <empty>)")(
"database-url", bpo::value<std::string>()->default_value("ali-qcdb-test.cern.ch:8083"),
"Database url (default : ali-qcdb-test.cern.ch:8083")("database-username", bpo::value<std::string>()->default_value(""),
"Database username (default : <empty>)")(
"database-password", bpo::value<std::string>()->default_value(""), "Database password (default : <empty>)")(
"database-name", bpo::value<std::string>()->default_value(""), "Database name (default : <empty>")(
"task-name", bpo::value<std::string>()->default_value("benchmarkTask"),
Expand Down
2 changes: 1 addition & 1 deletion Framework/test/testCheckWorkflow.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"config": {
"database": {
"implementation": "CCDB",
"host": "ccdb-test.cern.ch:8080",
"host": "localhost:8083",
"username": "not_applicable",
"password": "not_applicable",
"name": "not_applicable"
Expand Down
2 changes: 1 addition & 1 deletion Framework/test/testPostProcessingConfig.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,5 @@ BOOST_AUTO_TEST_CASE(test_configuration_read)

BOOST_CHECK_EQUAL(ppconfig.customParameters.size(), 4);

BOOST_CHECK_EQUAL(ppconfig.ccdbUrl, "ccdb-test.cern.ch:8080");
BOOST_CHECK_EQUAL(ppconfig.ccdbUrl, "localhost:8083");
}
Loading
Loading