From 141515ffe938eaa35b99256821a5854a40e54d68 Mon Sep 17 00:00:00 2001 From: David Suissa Date: Tue, 6 Sep 2022 18:08:35 +0200 Subject: [PATCH 1/4] #CE-62820: Added support for composer '2.x' in Drupal 9 provision template. --- templates/drupal9/ce-dev/ansible/provision.yml.j2 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/templates/drupal9/ce-dev/ansible/provision.yml.j2 b/templates/drupal9/ce-dev/ansible/provision.yml.j2 index 4307d49..6e19495 100644 --- a/templates/drupal9/ce-dev/ansible/provision.yml.j2 +++ b/templates/drupal9/ce-dev/ansible/provision.yml.j2 @@ -40,6 +40,10 @@ _env_type: dev fpm: _env_type: dev + - php_composer: + version: '' + version_branch: '--2' + keep_updated: true - xdebug: cli: true - lhci: From 4e28cc3612b364f1df0e4d0766312cd3971c1ea9 Mon Sep 17 00:00:00 2001 From: David Suissa Date: Thu, 8 Sep 2022 10:23:30 +0200 Subject: [PATCH 2/4] #CE-62820: Attempt to fix pull request test cases by providing a default value for the 'new_user' in provision. --- docker-images/controller/provision.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-images/controller/provision.yml b/docker-images/controller/provision.yml index fbfde37..f1f2c6c 100644 --- a/docker-images/controller/provision.yml +++ b/docker-images/controller/provision.yml @@ -23,6 +23,7 @@ config_repository_branch: 1.x config_repository_skip_checkout: false username: ce-dev + new_user: true # set to false if user already exists or is ephemeral, e.g. an LDAP user local_dir: /home/ce-dev/ce-provision groups: [] galaxy_custom_requirements_file: "" From 4faa0f368e8c059c7d1f76063db793f947150fcf Mon Sep 17 00:00:00 2001 From: David Suissa Date: Thu, 8 Sep 2022 10:39:35 +0200 Subject: [PATCH 3/4] #CE-62820: Attempt to fix pull request test cases by providing a default value for the 'key_name' in provision. --- docker-images/controller/provision.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-images/controller/provision.yml b/docker-images/controller/provision.yml index f1f2c6c..6185dca 100644 --- a/docker-images/controller/provision.yml +++ b/docker-images/controller/provision.yml @@ -24,6 +24,7 @@ config_repository_skip_checkout: false username: ce-dev new_user: true # set to false if user already exists or is ephemeral, e.g. an LDAP user + key_name: id_rsa.pub local_dir: /home/ce-dev/ce-provision groups: [] galaxy_custom_requirements_file: "" From 48e9a78568fd2f7baf0cfc34f7c256e0ed69978c Mon Sep 17 00:00:00 2001 From: David Suissa Date: Thu, 8 Sep 2022 10:42:54 +0200 Subject: [PATCH 4/4] #CE-62820: Attempt to fix pull request test cases by providing a default values for 'ce_deploy' in provision. --- docker-images/controller/provision.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docker-images/controller/provision.yml b/docker-images/controller/provision.yml index 6185dca..e26cd51 100644 --- a/docker-images/controller/provision.yml +++ b/docker-images/controller/provision.yml @@ -13,6 +13,8 @@ own_repository_branch: 1.x config_repository_branch: 1.x username: ce-dev + new_user: true + key_name: id_rsa.pub local_dir: /home/ce-dev/ce-deploy groups: [] - ce_provision: @@ -23,7 +25,7 @@ config_repository_branch: 1.x config_repository_skip_checkout: false username: ce-dev - new_user: true # set to false if user already exists or is ephemeral, e.g. an LDAP user + new_user: true key_name: id_rsa.pub local_dir: /home/ce-dev/ce-provision groups: []