Commit f484775d authored by Andrea Valassi's avatar Andrea Valassi
Browse files

Streamline future maintenance.

Simplify tag and release procedure by assuming that all past and future
releases >= 2.9.0 are schema compatible with one another (CORALCOOL-2834).


git-svn-id: file:///git/lcgcool.svndb/cool/trunk@19812 4525493e-7705-40b1-a816-d608a930855b
parent 37ce0aeb
......@@ -142,21 +142,9 @@ class ReferenceDbMgr:
self.svcVersion22x = True
self.svcVersion28x = True
self.svcVersion29x = False
elif ( self.svcVersion == "2.9.0" or \
self.svcVersion == "2.9.1" or \
self.svcVersion == "2.9.2" or \
self.svcVersion == "2.9.3" or \
self.svcVersion == "2.9.4" or \
self.svcVersion == "2.9.5" or \
self.svcVersion == "2.9.6" or \
self.svcVersion == "2.9.7" or \
self.svcVersion == "3.0.0" or \
self.svcVersion == "3.0.1" or \
self.svcVersion == "3.0.2" or \
self.svcVersion == "3.0.3" or \
self.svcVersion == "3.0.4" or \
self.svcVersion == "3.1.0" or \
self.svcVersion == "3.1.1" ):
else:
# Simplify tag and release procedure (CORALCOOL-2834)
# Assume by default that svcVersion >= 2.9.x for all new versions
self.svcVersion2xx = True
self.svcVersion22x = True
self.svcVersion28x = True
......
......@@ -272,23 +272,20 @@ RelationalDatabase::areReleaseAndSchemaCompatible
else if ( db_rel_version < VersionInfo::release )
{
if (
#if defined(COOL300)
// This release (3.1.1) can read 3.1.x
( db_rel_version >= "3.1.0" && db_rel_version <= "3.1.1" ) ||
// This release (3.1.1) can read 3.0.x
( db_rel_version >= "3.0.0" && db_rel_version <= "3.0.4" ) ||
#endif
// This release (2.9.7) can read 2.9.x
( db_rel_version >= "2.9.0" && db_rel_version <= "2.9.7" ) ||
// This release (2.9.7) can read 2.8.x
// This release (2.9.7) can read 2.7.0
// This release (2.9.7) can read 2.6.0
// This release (2.9.7) can read 2.5.0
// This release (2.9.7) can read 2.4.0
// This release (2.9.7) can read 2.3.x (including the unreleased 2.3.1)
// This release (2.9.7) can read 2.2.x
// This release (2.9.7) can read 2.1.x
// This release (2.9.7) can read 2.0.0
// Simplify tag/release process for releases >= 2.9.0 (CORALCOOL-2834)
// **************************************************************
// *** This release (>= 2.9.0) can read any release >= 2.9.0! ***
// **************************************************************
( db_rel_version >= "2.9.0" ) ||
// This release (>= 2.9.0) can read 2.8.x
// This release (>= 2.9.0) can read 2.7.0
// This release (>= 2.9.0) can read 2.6.0
// This release (>= 2.9.0) can read 2.5.0
// This release (>= 2.9.0) can read 2.4.0
// This release (>= 2.9.0) can read 2.3.x (including unreleased 2.3.1)
// This release (>= 2.9.0) can read 2.2.x
// This release (>= 2.9.0) can read 2.1.x
// This release (>= 2.9.0) can read 2.0.0
( db_rel_version >= "2.8.0" && db_rel_version <= "2.8.20" ) ||
( db_rel_version == "2.7.0" ) ||
( db_rel_version == "2.6.0" ) ||
......
......@@ -1241,6 +1241,9 @@ public:
openable.push_back( "3.0.4" );
openable.push_back( "3.1.0" );
openable.push_back( "3.1.1" );
// THIS NO LONGER NEEDS TO BE UPDATED FROM NOW ON (CORALCOOL-2834)
openable.push_back( "3.9.0" ); // hypothetical future release
openable.push_back( "4.0.0" ); // hypothetical future release
#endif
// Check for failure - too old even for schema evolution
std::vector<std::string> ::iterator rel;
......
......@@ -131,21 +131,7 @@ elif ( svcVersion == "2.8.16" ): svcVersion280 = True
elif ( svcVersion == "2.8.17" ): svcVersion280 = True
elif ( svcVersion == "2.8.18" ): svcVersion280 = True
elif ( svcVersion == "2.8.19" ): svcVersion280 = True
elif ( svcVersion == "2.9.0" ): svcVersion290 = True
elif ( svcVersion == "2.9.1" ): svcVersion290 = True
elif ( svcVersion == "2.9.2" ): svcVersion290 = True
elif ( svcVersion == "2.9.3" ): svcVersion290 = True
elif ( svcVersion == "2.9.4" ): svcVersion290 = True
elif ( svcVersion == "2.9.5" ): svcVersion290 = True
elif ( svcVersion == "2.9.6" ): svcVersion290 = True
elif ( svcVersion == "2.9.7" ): svcVersion290 = True
elif ( svcVersion == "3.0.0" ): svcVersion290 = True
elif ( svcVersion == "3.0.1" ): svcVersion290 = True
elif ( svcVersion == "3.0.2" ): svcVersion290 = True
elif ( svcVersion == "3.0.3" ): svcVersion290 = True
elif ( svcVersion == "3.0.4" ): svcVersion290 = True
elif ( svcVersion == "3.1.0" ): svcVersion290 = True
elif ( svcVersion == "3.1.1" ): svcVersion290 = True
else: svcVersion290 = True # Simplify tag and release procedure (CORALCOOL-2834)
if ( vectorPayload and not svcVersion290 ):
print 'ERROR! Vector payload performance test not supported for service version:', svcVersion
sys.exit(-1)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment