Skip to content

[v7r1] Few fixes for the integration tests on jenkins #4645

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
atsareg merged 3 commits into from
Jun 29, 2020
Merged

[v7r1] Few fixes for the integration tests on jenkins #4645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
21ee399
REMOVE READLONLY VARIABLES
chaen Jun 16, 2020
1900ac8
SMS: drop tables in the correct order
chaen Jun 16, 2020
8c09485
tests: fix dropDBs bad escape
chaen Jun 16, 2020
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
9 changes: 6 additions & 3 deletions StorageManagementSystem/DB/StorageManagementDB.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@

use StorageManagementDB;

DROP TABLE IF EXISTS TaskReplicas;
DROP TABLE IF EXISTS StageRequests;
DROP TABLE IF EXISTS CacheReplicas;
DROP TABLE IF EXISTS Tasks;

CREATE TABLE Tasks(
TaskID INTEGER AUTO_INCREMENT,
Status VARCHAR(32) DEFAULT 'New',
Expand All @@ -23,7 +27,6 @@ CREATE TABLE Tasks(
INDEX(TaskID,Status)
)ENGINE=INNODB;

DROP TABLE IF EXISTS TaskReplicas;
CREATE TABLE TaskReplicas(
TaskID INTEGER(8) NOT NULL REFERENCES Tasks(TaskID),
ReplicaID INTEGER(8) NOT NULL REFERENCES CacheReplicas(ReplicaID),
Expand All @@ -33,7 +36,7 @@ CREATE TABLE TaskReplicas(
CREATE TRIGGER taskreplicasAfterInsert AFTER INSERT ON TaskReplicas FOR EACH ROW UPDATE CacheReplicas SET CacheReplicas.Links=CacheReplicas.Links+1 WHERE CacheReplicas.ReplicaID=NEW.ReplicaID;
CREATE TRIGGER taskreplicasAfterDelete AFTER DELETE ON TaskReplicas FOR EACH ROW UPDATE CacheReplicas SET CacheReplicas.Links=CacheReplicas.Links-1 WHERE CacheReplicas.ReplicaID=OLD.ReplicaID;

DROP TABLE IF EXISTS CacheReplicas;

CREATE TABLE CacheReplicas(
ReplicaID INTEGER AUTO_INCREMENT,
Type VARCHAR(32) NOT NULL,
Expand All @@ -52,7 +55,7 @@ CREATE TABLE CacheReplicas(
INDEX(ReplicaID,Status,SE)
)ENGINE=INNODB;

DROP TABLE IF EXISTS StageRequests;

CREATE TABLE StageRequests(
ReplicaID INTEGER(8) NOT NULL REFERENCES CacheReplicas(ReplicaID),
StageStatus VARCHAR(32) DEFAULT 'StageSubmitted',
Expand Down
6 changes: 3 additions & 3 deletions tests/Jenkins/dirac_ci.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,11 @@ fi

# Creating default structure
mkdir -p "$WORKSPACE/TestCode" # Where the test code resides
readonly TESTCODE=${_}
TESTCODE=${_}
mkdir -p "$WORKSPACE/ServerInstallDIR" # Where servers are installed
readonly SERVERINSTALLDIR=${_}
SERVERINSTALLDIR=${_}
mkdir -p "$WORKSPACE/ClientInstallDIR" # Where clients are installed
readonly CLIENTINSTALLDIR=${_}
CLIENTINSTALLDIR=${_}

# Location of the CFG file to be used (this can be replaced by the extensions)
INSTALL_CFG_FILE="${TESTCODE}/DIRAC/tests/Jenkins/install.cfg"
Expand Down
5 changes: 3 additions & 2 deletions tests/Jenkins/utilities.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -892,8 +892,9 @@ diracMVDFCDB(){
dropDBs(){
echo '==> [dropDBs]'

dbs=$(cut -d ' ' -f 2 < databases | cut -d '.' -f 1 | grep -v ^RequestDB | grep -v ^FileCatalogDB)
python "${TESTCODE}/DIRAC/tests/Jenkins/dirac-drop-db.py" "$dbs" "${DEBUG}"
# make dbs a real array to avoid future mistake with escaping
mapfile -t dbs < <(cut -d ' ' -f 2 < /tmp/databases.txt | cut -d '.' -f 1 | grep -v ^RequestDB | grep -v ^FileCatalogDB)
python "${TESTCODE}/DIRAC/tests/Jenkins/dirac-drop-db.py" "${dbs[@]}" "${DEBUG}"
}

#-------------------------------------------------------------------------------
Expand Down