#15: Add tests and documentation for setting Solr version.

lando · Dec 5, 2022 · f10568c · f10568c
1 parent 8692029
commit f10568c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/docs/config.md b/docs/config.md
@@ -26,9 +26,9 @@ If you do not already have a [Landofile](https://docs.lando.dev/config/lando.htm
 
 Note that if the above config options are not enough, all Lando recipes can be further [extended and overriden](https://docs.lando.dev/config/recipes.html#extending-and-overriding-recipes).
 
-## Choosing a php version
+## Choosing PHP/database/Solr versions
 
-Lando will look for a [`pantheon.yml`](https://pantheon.io/docs/pantheon-yml/) (and/or `pantheon.upstream.yml`) in your app's root directory and use whatever `php_version` you've specified there.
+Lando will look for a [`pantheon.yml`](https://pantheon.io/docs/pantheon-yml/) (and/or `pantheon.upstream.yml`) in your app's root directory and use the values you've set for `php_version`, `database`, and `search` you've specified there.
 
 This means that **you can not configure the php version directly in your Landofile for this recipe.**
 
@@ -38,7 +38,11 @@ If you change this version, make sure you [`lando rebuild`](https://docs.lando.d
 
 ```yaml
 api_version: 1
-php_version: 7.1
+php_version: 8.1
+database:
+  version: 10.6
+search:
+  version: 8
 ```
 
 ## Choosing a nested webroot

diff --git a/examples/drupal9/README.md b/examples/drupal9/README.md
@@ -70,7 +70,7 @@ lando ssh -c "env" | grep FRAMEWORK | grep drupal8
 lando ssh -c "env" | grep FILEMOUNT | grep "sites/default/files"
 lando ssh -c "env" | grep PANTHEON_ENVIRONMENT | grep lando
 lando ssh -c "env" | grep PANTHEON_INDEX_HOST | grep index
-lando ssh -c "env" | grep PANTHEON_INDEX_PORT | grep 449
+lando ssh -c "env" | grep PANTHEON_INDEX_PORT | grep 8983
 lando ssh -c "env" | grep PANTHEON_SITE | grep 3a225571-2a52-4ae9-84e7-ef54037ac66c
 lando ssh -c "env" | grep PANTHEON_SITE_NAME | grep landobot-drupal9
 lando ssh -c "env" | grep php_version | grep "8"
@@ -87,6 +87,10 @@ lando php -v | grep "PHP 8.1"
 cd drupal9
 lando ssh -s database -c "mysql -V" | grep 10.6. 
 
+# Should use the solr version in pantheon.yml
+cd drupal9
+lando ssh -c "curl http://index:8983/solr/admin/info/system" | grep "\"solr-spec-version\":\"8.11.2\""
+
 # Should use a varnish http_resp_hdr_len setting of 25k
 cd drupal9
 lando varnishadm param.show http_resp_hdr_len | grep 'Value is: 25k'