From 2f07183d7ab820c7930e7cfbcb8c32438cf65bec Mon Sep 17 00:00:00 2001
From: Claudiu Cristea <clau.cristea@gmail.com>
Date: Wed, 13 Dec 2023 13:17:26 +0200
Subject: [PATCH] ISAICP-8347: Fix Solr config tooling.
---
.env.dist | 2 +-
resources/runner/solr.yml | 2 --
src/TaskRunner/ConfigProviders/JoinupConfigProvider.php | 9 ---------
web/modules/custom/joinup_core/joinup_core.module | 2 +-
4 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/.env.dist b/.env.dist
index c498673b0c..87bbbb826a 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 f62c11ee78..3904f096b4 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 a0695a38fa..9db9562468 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 caad94ce74..316caca14d 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 {
--
GitLab