Skip to content

Commit f748973

Browse files
committed
fix tests
1 parent a046022 commit f748973

3 files changed

Lines changed: 14 additions & 14 deletions

File tree

Framework/script/o2-qc-batch-test.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ done
2222
#trap cleanup EXIT
2323

2424
function delete_data() {
25-
curl -i -L ccdb-test.cern.ch:8080/truncate/qc/TST/MO/BatchTestTask${UNIQUE_ID}*
26-
curl -i -L ccdb-test.cern.ch:8080/truncate/qc/TST/QO/BatchTestCheck${UNIQUE_ID}*
25+
curl -i -L ali-qcdb-test.cern.ch:8083/truncate/qc/TST/MO/BatchTestTask${UNIQUE_ID}*
26+
curl -i -L ali-qcdb-test.cern.ch:8083/truncate/qc/TST/QO/BatchTestCheck${UNIQUE_ID}*
2727

2828
rm -f /tmp/batch_test_mergedA${UNIQUE_ID}.root
2929
rm -f /tmp/batch_test_mergedB${UNIQUE_ID}.root
@@ -46,7 +46,7 @@ fi
4646

4747
# make sure the CCDB is available otherwise we bail (no failure)
4848
# we do not use ping because it will fail from outside CERN.
49-
if curl --silent --connect-timeout 1 ccdb-test.cern.ch:8080 > /dev/null 2>&1 ; then
49+
if curl --silent --connect-timeout 1 ali-qcdb-test.cern.ch:8083 > /dev/null 2>&1 ; then
5050
echo "CCDB is reachable."
5151
else
5252
echo "CCDB not reachable, batch test is cancelled."
@@ -66,7 +66,7 @@ o2-qc --config json:/${JSON_DIR}/batch-test.json --remote-batch /tmp/batch_test_
6666

6767
# check the integrated MonitorObject
6868
# first the return code must be 200
69-
code=$(curl -L ccdb-test.cern.ch:8080/qc/TST/MO/BatchTestTask${UNIQUE_ID}/example/8000000/PeriodName=LHC9000x/PassName=apass500 --write-out %{http_code} --silent --output /tmp/batch_test_obj${UNIQUE_ID}.root)
69+
code=$(curl -L ali-qcdb-test.cern.ch:8083/qc/TST/MO/BatchTestTask${UNIQUE_ID}/example/8000000/PeriodName=LHC9000x/PassName=apass500 --write-out %{http_code} --silent --output /tmp/batch_test_obj${UNIQUE_ID}.root)
7070
if (( $code != 200 )); then
7171
echo "Error, monitor object of the QC Task could not be found."
7272
# delete_data
@@ -90,7 +90,7 @@ fi
9090

9191
# check the moving window MonitorObject
9292
# first the return code must be 200
93-
code=$(curl -L ccdb-test.cern.ch:8080/qc/TST/MO/BatchTestTask${UNIQUE_ID}/mw/example/8000000/PeriodName=LHC9000x/PassName=apass500 --write-out %{http_code} --silent --output /tmp/batch_test_obj_mw${UNIQUE_ID}.root)
93+
code=$(curl -L ali-qcdb-test.cern.ch:8083/qc/TST/MO/BatchTestTask${UNIQUE_ID}/mw/example/8000000/PeriodName=LHC9000x/PassName=apass500 --write-out %{http_code} --silent --output /tmp/batch_test_obj_mw${UNIQUE_ID}.root)
9494
if (( $code != 200 )); then
9595
echo "Error, monitor object of the QC Task could not be found."
9696
delete_data
@@ -114,7 +114,7 @@ fi
114114

115115
# check QualityObject
116116
# first the return code must be 200
117-
code=$(curl -L ccdb-test.cern.ch:8080/qc/TST/QO/BatchTestCheck${UNIQUE_ID}/8000000/PeriodName=LHC9000x/PassName=apass500 --write-out %{http_code} --silent --output /tmp/batch_test_check${UNIQUE_ID}.root)
117+
code=$(curl -L ali-qcdb-test.cern.ch:8083/qc/TST/QO/BatchTestCheck${UNIQUE_ID}/8000000/PeriodName=LHC9000x/PassName=apass500 --write-out %{http_code} --silent --output /tmp/batch_test_check${UNIQUE_ID}.root)
118118
if (( $code != 200 )); then
119119
echo "Error, quality object of the QC Task could not be found."
120120
delete_data

Framework/script/o2-qc-multinode-test.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ function check_if_port_in_use() {
4444
}
4545

4646
function delete_data() {
47-
curl -i -L ccdb-test.cern.ch:8080/truncate/qc/TST/MO/MNLTest${UNIQUE_PORT_1}*
48-
curl -i -L ccdb-test.cern.ch:8080/truncate/qc/TST/MO/MNRTest${UNIQUE_PORT_2}*
49-
curl -i -L ccdb-test.cern.ch:8080/truncate/qc/TST/QO/MNLTest
50-
curl -i -L ccdb-test.cern.ch:8080/truncate/qc/TST/QO/MNRTest
47+
curl -i -L ali-qcdb-test.cern.ch:8083/truncate/qc/TST/MO/MNLTest${UNIQUE_PORT_1}*
48+
curl -i -L ali-qcdb-test.cern.ch:8083/truncate/qc/TST/MO/MNRTest${UNIQUE_PORT_2}*
49+
curl -i -L ali-qcdb-test.cern.ch:8083/truncate/qc/TST/QO/MNLTest
50+
curl -i -L ali-qcdb-test.cern.ch:8083/truncate/qc/TST/QO/MNRTest
5151

5252
cd /tmp
5353
# mv in /tmp is guaranteed to be atomic
@@ -72,7 +72,7 @@ fi
7272

7373
# make sure the CCDB is available otherwise we bail (no failure)
7474
# we do not use ping because it will fail from outside CERN.
75-
if curl --silent --connect-timeout 1 ccdb-test.cern.ch:8080 > /dev/null 2>&1 ; then
75+
if curl --silent --connect-timeout 1 ali-qcdb-test.cern.ch:8083 > /dev/null 2>&1 ; then
7676
echo "CCDB is reachable."
7777
else
7878
echo "CCDB not reachable, multinode test is cancelled."
@@ -89,7 +89,7 @@ wait
8989

9090
# check MonitorObject
9191
# first the return code must be 200
92-
code=$(curl -L ccdb-test.cern.ch:8080/qc/TST/MO/MNLTest${UNIQUE_PORT_1}/example/8000000 --write-out %{http_code} --silent --output /tmp/${UNIQUE_TEST_NAME}/multinode_test_obj${UNIQUE_PORT_1}.root)
92+
code=$(curl -L ali-qcdb-test.cern.ch:8083/qc/TST/MO/MNLTest${UNIQUE_PORT_1}/example/8000000 --write-out %{http_code} --silent --output /tmp/${UNIQUE_TEST_NAME}/multinode_test_obj${UNIQUE_PORT_1}.root)
9393
if (( $code != 200 )); then
9494
echo "Error, monitor object of the local QC Task could not be found."
9595
delete_data
@@ -113,7 +113,7 @@ fi
113113

114114
# check MonitorObject
115115
# first the return code must be 200
116-
code=$(curl -L ccdb-test.cern.ch:8080/qc/TST/MO/MNRTest${UNIQUE_PORT_2}/example/8000000 --write-out %{http_code} --silent --output /tmp/${UNIQUE_TEST_NAME}/multinode_test_obj${UNIQUE_PORT_2}.root)
116+
code=$(curl -L ali-qcdb-test.cern.ch:8083/qc/TST/MO/MNRTest${UNIQUE_PORT_2}/example/8000000 --write-out %{http_code} --silent --output /tmp/${UNIQUE_TEST_NAME}/multinode_test_obj${UNIQUE_PORT_2}.root)
117117
if (( $code != 200 )); then
118118
echo "Error, monitor object of the remote QC Task could not be found."
119119
delete_data

Framework/test/testDbFactory.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ BOOST_AUTO_TEST_CASE(db_ccdb_listing)
6868
auto* ccdb = dynamic_cast<CcdbDatabase*>(database3.get());
6969
BOOST_CHECK(ccdb);
7070

71-
ccdb->connect("ccdb-test.cern.ch:8080", "", "", "");
71+
ccdb->connect("ali-qcdb-test.cern.ch:8083", "", "", "");
7272

7373
// prepare stuff in the db
7474
string prefixPath = "qc/TST/MO/";

0 commit comments

Comments
 (0)