Merge branch 'master-qgsjet' into 'master'

QGSJets_i: remove this package from release

See merge request atlas/athena!48310

Projects/AthGeneration/package_filters.txt

@@ -2,8 +2,6 @@
 # Package filtering rules for the AthGeneration project build.
 #
 
-# Temporarily disable Rivet_i until we have LCG_97_ATLAS_2
-
 + AsgExternal/Asg_Test
 + AtlasTest/TestTools
 + Calorimeter/CaloConditions
@@ -156,6 +154,7 @@
 - Generators/MCTester_i
 - Generators/ProtosLHEF_i
 - Generators/TrackRecordGenerator
+- Generators/QGSJet_i
 + Generators/.*
 + InnerDetector/InDetExample/InDetRecExample
 #+ InnerDetector/InDetRecTools/InDetTrackSelectionTool

Projects/Athena/package_filters.txt

-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 #
 # Package filtering rules for the Athena project build.
 #
@@ -25,6 +25,7 @@
 
 # Disable MCTester until we are sure we can remove it completely
 - Generators/MCTester_i
+- Generators/QGSJet_i
 
 # Some analysis packages that are not part of Athena
 - Control/AthLinksSA