diff --git a/.env.dist b/.env.dist index c498673b0c475cd4dcf20985d4b570e326b62642..87bbbb826a1a3c42bf0b758d839c7287db6decc2 100644 --- a/.env.dist +++ b/.env.dist @@ -92,7 +92,7 @@ DRUPAL_MAIL_SPOOL_DIR=/tmp/spool # search_api_solr_schema_joinup_modifications'. # See scripts/check_status_report.sh, .opts.yml # Default production ignores. -DRUPAL_STATUS_REPORT_IGNORE="update status,joinup_core_root_user_blocked,search_api_solr_schema_joinup_modifications,search_api_pending_tasks,webform_libraries" +DRUPAL_STATUS_REPORT_IGNORE="update status,joinup_core_root_user_blocked,webform_libraries" # Specific testing pipeline ignores. Note, that all these ignored requirements # will be investigated in ISAICP-7232. # See https://citnet.tech.ec.europa.eu/CITnet/jira/browse/ISAICP-7232 diff --git a/resources/runner/solr.yml b/resources/runner/solr.yml index f62c11ee78849dc95a52cb2820ca74d585b3a211..3904f096b4f02608ea29111baeea43976fd86622 100644 --- a/resources/runner/solr.yml +++ b/resources/runner/solr.yml @@ -80,8 +80,6 @@ commands: - search-api-solr:get-server-config - joinup - ${solr.config_tmp}.zip - # See \Joinup\TaskRunner\ConfigProviders\JoinupConfigProvider::provide(). - - ${solr.version.major} - task: exec command: unzip -q ${solr.config_tmp}.zip options: diff --git a/src/TaskRunner/ConfigProviders/JoinupConfigProvider.php b/src/TaskRunner/ConfigProviders/JoinupConfigProvider.php index a0695a38fa6231f94c2ab3cc51ea9865c429a475..9db9562468f8a7419478ce94aa47bcafe89bde8e 100644 --- a/src/TaskRunner/ConfigProviders/JoinupConfigProvider.php +++ b/src/TaskRunner/ConfigProviders/JoinupConfigProvider.php @@ -4,7 +4,6 @@ namespace Joinup\TaskRunner\ConfigProviders; -use Drupal\Component\Serialization\Yaml; use DrupalFinder\DrupalFinder; use OpenEuropa\TaskRunner\Contract\ConfigProviderInterface; use OpenEuropa\TaskRunner\Traits\ConfigFromFilesTrait; @@ -45,14 +44,6 @@ public static function provide(Config $config): void { $config->set("env.{$name}", $value); } - // Set the Solr version by reading the .opts.yml file. - $opts = Yaml::decode(file_get_contents("{$joinup_dir}/.opts.yml")); - $solr_major_version = $opts['solr_version'] ?? NULL; - if (!$solr_major_version) { - throw new \Exception("The 'solr_version' option is missing from .opts.yml file."); - } - $config->set('solr.version.major', intval($solr_major_version)); - // Import configurations from ./resources/runner/. static::importFromFiles($config, glob('resources/runner/*.yml')); } diff --git a/web/modules/custom/joinup_core/joinup_core.module b/web/modules/custom/joinup_core/joinup_core.module index caad94ce740fdfffdcbf7a2499112b349e597467..316caca14d4b5171f343f2a799e7e90e4044f67f 100644 --- a/web/modules/custom/joinup_core/joinup_core.module +++ b/web/modules/custom/joinup_core/joinup_core.module @@ -60,7 +60,7 @@ function joinup_core_theme(array $existing, string $type, string $theme, string * Implements hook_requirements_alter(). */ function joinup_core_requirements_alter(array &$requirements): void { - $ignored = getenv('DRUPAL_STATUS_REPORT_IGNORE') ?: 'update status,joinup_core_root_user_blocked,search_api_solr_schema_joinup_modifications,deprecated_modules,deprecated_themes,metatag_maintenance_mode,search_api_pending_tasks,webform_libraries'; + $ignored = getenv('DRUPAL_STATUS_REPORT_IGNORE') ?: 'update status,joinup_core_root_user_blocked,webform_libraries'; $ignored = array_map('trim', explode(',', $ignored)); $requirements = array_filter($requirements, function (string $requirement) use ($ignored): bool {