Skip to content
Snippets Groups Projects
Commit 2f07183d authored by Claudiu Cristea's avatar Claudiu Cristea
Browse files

ISAICP-8347: Fix Solr config tooling.

parent a7f1e50e
1 merge request!139Release/v1.100.0
...@@ -92,7 +92,7 @@ DRUPAL_MAIL_SPOOL_DIR=/tmp/spool ...@@ -92,7 +92,7 @@ DRUPAL_MAIL_SPOOL_DIR=/tmp/spool
# search_api_solr_schema_joinup_modifications'. # search_api_solr_schema_joinup_modifications'.
# See scripts/check_status_report.sh, .opts.yml # See scripts/check_status_report.sh, .opts.yml
# Default production ignores. # 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 # Specific testing pipeline ignores. Note, that all these ignored requirements
# will be investigated in ISAICP-7232. # will be investigated in ISAICP-7232.
# See https://citnet.tech.ec.europa.eu/CITnet/jira/browse/ISAICP-7232 # See https://citnet.tech.ec.europa.eu/CITnet/jira/browse/ISAICP-7232
......
...@@ -80,8 +80,6 @@ commands: ...@@ -80,8 +80,6 @@ commands:
- search-api-solr:get-server-config - search-api-solr:get-server-config
- joinup - joinup
- ${solr.config_tmp}.zip - ${solr.config_tmp}.zip
# See \Joinup\TaskRunner\ConfigProviders\JoinupConfigProvider::provide().
- ${solr.version.major}
- task: exec - task: exec
command: unzip -q ${solr.config_tmp}.zip command: unzip -q ${solr.config_tmp}.zip
options: options:
......
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
namespace Joinup\TaskRunner\ConfigProviders; namespace Joinup\TaskRunner\ConfigProviders;
use Drupal\Component\Serialization\Yaml;
use DrupalFinder\DrupalFinder; use DrupalFinder\DrupalFinder;
use OpenEuropa\TaskRunner\Contract\ConfigProviderInterface; use OpenEuropa\TaskRunner\Contract\ConfigProviderInterface;
use OpenEuropa\TaskRunner\Traits\ConfigFromFilesTrait; use OpenEuropa\TaskRunner\Traits\ConfigFromFilesTrait;
...@@ -45,14 +44,6 @@ public static function provide(Config $config): void { ...@@ -45,14 +44,6 @@ public static function provide(Config $config): void {
$config->set("env.{$name}", $value); $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/. // Import configurations from ./resources/runner/.
static::importFromFiles($config, glob('resources/runner/*.yml')); static::importFromFiles($config, glob('resources/runner/*.yml'));
} }
......
...@@ -60,7 +60,7 @@ function joinup_core_theme(array $existing, string $type, string $theme, string ...@@ -60,7 +60,7 @@ function joinup_core_theme(array $existing, string $type, string $theme, string
* Implements hook_requirements_alter(). * Implements hook_requirements_alter().
*/ */
function joinup_core_requirements_alter(array &$requirements): void { 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)); $ignored = array_map('trim', explode(',', $ignored));
$requirements = array_filter($requirements, function (string $requirement) use ($ignored): bool { $requirements = array_filter($requirements, function (string $requirement) use ($ignored): bool {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment