Skip to content
Snippets Groups Projects

Update Distro to 10.2

    • Closed Issue created by Carina Antunes @crdeoliv

    Upgrade our distribution to latest 10.2.0. Make a pre-validation of the release and after coordinate with the Web team for them to validate the release

    We need to release before June 17 Coordinate with Vasvi to create an OTG and a release for 3 June; release in two batches

    Edited

    Designs

      Child items ...

      2. Activity

      • Carina Antunes added To do label

        added To do label

      • Carina Antunes changed the description

        changed the description

      • Carina Antunes assigned to @cpetala

        assigned to @cpetala

      • Christina Petala
        Christina Petala @cpetala ·
        Owner

        The proposed approach for this task is as follows and will be based on the following steps:

        1. Clone gitlab repository https://gitlab.cern.ch/drupal/paas/cern-drupal-distribution

        2. Create a new branch named "update_distro_10.2" based on the branch "filefieldpatch" (https://gitlab.cern.ch/drupal/paas/cern-drupal-distribution/-/tree/filefieldpatch?ref_type=heads).

        3. There are 2 ways to go to perform the distro upgrade (modification of the rellevant files of the new "update_distro_10.2" branch):

        Current versions:

        composer --version
Composer version 2.3.5 2022-04-13 16:43:00

"drupal/core-composer-scaffold": "10.1.8"
"drupal/core-project-message": "10.1.8"
"drupal/core-recommended": "10.1.8"_

        • The manual way which would be to check the differences of the files between the 2 distros (composer.json etc) and update them by hand.

        • Update automatically the composer.json (and/or other files) by running commands based on the documentation here: https://www.drupal.org/docs/updating-drupal/updating-drupal-core-via-composer and by executing the following from within a docker instance (--dry-run option first):

        # composer update "drupal/core-*" drush/drush --with-all-dependencies 
# composer require drupal/core-recommended:10.2.0 --update-with-dependencies 
# composer require drupal/core-composer-scaffold:10.2.0 --update-with-all-dependencies 
# composer require drupal/core-project-message:10.2.0 --update-with-all-dependencies
        1. Check/ resolve possible issues that my arise from the above process if we follow option 2 (automatic update of the composer.json file).
        2. Commit/push the new brach to the repo and get the image version that will be created/built automatically.
        3. Use the image to my test sites in drupal-stg (edit the drupalsite resource accordingly) and check if the sites are functional / check login functionality / check the drupal version from the UI (site_url/admin/reports/status).
        4. If the above is succesfull create a merge request.
        5. Apply a clusterwide operation to update the image to all the sites of drupal-stg by running the following:

        ‘oc patch drupalsite $1 -n $0 --type=json -p="[{“op”: “remove”,“path”: “/spec/version/name” “path”: “/spec/version/releaseSpec”}]" --dry-run=server’

        ( We would have to get a list of all namespaces/sites of drupal-stg cluster and pass it as a parameter to the above.) 9. Apply a clusterwide command to execute the following to all containers of all websites in drupal-stg cluster:

        # drush updatedb
# drush cache:rebuild
        1. Test thoroughly in coordination with the Web team all the bundled functionality.
        2. Make the release in 2 phases by following the proccess described here:

        https://okd-internal.docs.cern.ch/cluster-flavours/drupal/workflows/update-cern-drupal-distribution/

        @vasvi Please provide your input and evaluation on the steps described above.

        FYI @crdeoliv @fborgesa

      • Christina Petala added In progress label

        added In progress label

      • Christina Petala removed To do label

        removed To do label

      • Christina Petala
        Christina Petala @cpetala ·
        Owner

        The upgrade was performed by following the steps described below:

        1. Clone gitlab repository https://gitlab.cern.ch/drupal/paas/cern-drupal-distribution and create a new branch named "update_distro_10.2" based on the branch "filefieldpatch":

        git clone https://gitlab.cern.ch/drupal/paas/cern-drupal-distribution.git
cd cern-drupal-distribution/
git checkout filefieldpatch
git checkout -b update_distro_10.2

        2. The following composer commands were executed through a docker instance to perform the upgrade:

        # composer update --no-install   **(created a .lock file)**
# composer require 'drush/drush:^12.4.3' --with-all-dependencies **(upgraded drush by itself)**
        /project # ./vendor/bin/drush --version
Drush Commandline Tool 12.5.2.0
        # composer require drupal/core-recommended:10.2.0 --update-with-dependencies 
# composer show drupal/core-recommended
name     : drupal/core-recommended
descrip. : Core and its dependencies with known-compatible minor versions. Require this project INSTEAD OF drupal/core.
keywords :
versions : * 10.2.0
type     : metapackage
license  : GNU General Public License v2.0 or later (GPL-2.0-or-later) (OSI approved) https://spdx.org/licenses/GPL-2.0-or-later.html#licenseText
homepage :
source   : [git] https://github.com/drupal/core-recommended.git 13b68ef925c75455fd6cb6766d5879790727d83f
dist     : [zip] https://api.github.com/repos/drupal/core-recommended/zipball/13b68ef925c75455fd6cb6766d5879790727d83f 13b68ef925c75455fd6cb6766d5879790727d83f
path     : /project
names    : drupal/core-recommended
.....
conflicts
webflo/drupal-core-strict *
        # composer require drupal/core-composer-scaffold:10.2.0 --update-with-all-dependencies
# composer show drupal/core-composer-scaffold
name     : drupal/core-composer-scaffold
descrip. : A flexible Composer project scaffold builder.
keywords : drupal
versions : * 10.2.0
type     : composer-plugin
license  : GNU General Public License v2.0 or later (GPL-2.0-or-later) (OSI approved) https://spdx.org/licenses/GPL-2.0-or-later.html#licenseText
homepage : https://www.drupal.org/project/drupal
source   : [git] https://github.com/drupal/core-composer-scaffold.git 97bd91856535a354e9b1b815f0957893e26b6622
dist     : [zip] https://api.github.com/repos/drupal/core-composer-scaffold/zipball/97bd91856535a354e9b1b815f0957893e26b6622 97bd91856535a354e9b1b815f0957893e26b6622
path     : /project/vendor/drupal/core-composer-scaffold
names    : drupal/core-composer-scaffold
        # composer require drupal/core-project-message:10.2.0 --update-with-all-dependencies
# composer show drupal/core-project-message
name     : drupal/core-project-message
descrip. : Adds a message after Composer installation.
keywords : drupal
versions : * 10.2.0
type     : composer-plugin
license  : GNU General Public License v2.0 or later (GPL-2.0-or-later) (OSI approved) https://spdx.org/licenses/GPL-2.0-or-later.html#licenseText
homepage : https://www.drupal.org/project/drupal
source   : [git] https://github.com/drupal/core-project-message.git d1da83722735cb0f7ccabf9fef7b5607b442c3a8
dist     : [zip] https://api.github.com/repos/drupal/core-project-message/zipball/d1da83722735cb0f7ccabf9fef7b5607b442c3a8 d1da83722735cb0f7ccabf9fef7b5607b442c3a8
path     : /project/vendor/drupal/core-project-message
names    : drupal/core-project-message

        3. Commit/push the new brach to the repo and get the image version that will be created/built automatically.

        git add composer.json (commited only the composer.json)
git commit -m "first attempt for distro update to 10.2"
git push --set-upstream origin update_distro_10.2

        Image pushed to gitlab-registry.cern.ch/drupal/paas/cern-drupal-distribution/site-builder:update_distro_10.2-02d705b6

        **4. **Use the image to my test site in drupal-stg:

        oc-sso login drupal-stg
oc project test-cp

vim mysite.yml

version:
    name: update_distro_10.2
    releaseSpec: 02d705b6


kubectl apply -f mysite.yaml

watch 'kubectl get pods -o yaml'

kubectl get po mysite-5985679d7c-pjs4r  -o yaml | less

   image: gitlab-registry.cern.ch/drupal/paas/cern-drupal-distribution/site-builder:update_distro_10.2-02d705b6

        Execute drush commands to clear cache:

         kubectl exec -it mysite-7474794476-sqbcb -c php-fpm -- sh

 # drush updatedb
 # drush cache:rebuild

        My test site https://mysite.web.cern.ch/admin/reports/status is upgraded to version 10.2.0 as displayed in the screenshot below:

        image

        fyi @crdeoliv @fborgesa @vasvi

      • Carina Antunes
        Carina Antunes @crdeoliv ·
        Author Owner

        Could you bump to the latest https://www.drupal.org/project/drupal/releases/10.2.6 and create the merge request?

        Branch name should be called dev10.2-0. See for context on the naming convention we adopted https://gitlab.cern.ch/drupal/paas/cern-drupal-distribution#versioning-convention

      • Christina Petala mentioned in merge request !254 (merged)

        mentioned in merge request !254 (merged)

      • Christina Petala
        Christina Petala @cpetala ·
        Owner

        The upgrade to the latest drupal 10.2.6 was completed successfully and the relative merge request was created and linked to this issue.

        The image dev10.2-0-817dae92 was tested in my test site: https://mysite.web.cern.ch/

        image

        @crdeoliv @vasvi @fborgesa

      • Carina Antunes added #35 (closed) as child task

        added #35 (closed) as child task

      • Carina Antunes added #36 (closed) as child task

        added #36 (closed) as child task

      • Carina Antunes added #37 (closed) as child task

        added #37 (closed) as child task

      • Christina Petala mentioned in commit 1ce10d22

        mentioned in commit 1ce10d22

      • Vasvi Sharma mentioned in commit 101d1c96

        mentioned in commit 101d1c96

      • Vasvi Sharma
        Vasvi Sharma @vasvi ·
        Owner

        All non-critical drupalsites were upgraded to 10.2 on June 12th - no downtime was seen

        • Carina Antunes
          Carina Antunes @crdeoliv ·
          Author Owner
          Resolved by Christina Petala

          Projects not running latest 10.2.x

          $ oc get projects -l okd.cern.ch/user-project="true",drupal.cern.ch/infrastructure-project!=true -A -o json --no-headers | jq -r '.items[] | .metadata.name' | xargs -I{} oc get drupalsite -n {} -l drupal.webservices.cern.ch/isPrimary=true  -o json --no-headers --ignore-not-found | jq -r ".items[] | select(.spec.version.name | startswith(\"v10.2\") | not) | [.metadata.namespace, .metadata.name, .spec.version.name] | @tsv"

[D9] admin-eguide	admin-eguide-jyde-j24	v9.5-2
aladdin2	aladdin2	v10.1-1
alice-collaboration	test-alice-collaboration-d95	v10.1-1
alice-figure	alice-figure	v10.1-1
[D9] atlas-voting	atlas-voting-backup-admca	v9.4-1
cern-fitness-club	cern-fitness-club	v10.1-1
chis	trial-upgrade-d10	v10.1-1
[dev] easy-start-site-carina	easy-start-site-carina	ckeditor4-lts
[dev] fborgesa-drupal	fborgesa-test-instance	ckeditor4-lts
hsl	hsl	v10.1-1
jam-sonora	jam-sonora	v10.1-1
jam-unison	jam-unison	v10.1-1
knowledgetransfer	kt-d10	v10.1-1
mechanical-safety-3	mechanical-safety-3	v10.1-1
na-cons	na-cons	v10.1-1
na-cons-project	nacons-project	v10.1-1
nacons	nacons	v10.1-1
pawel	pawel	v10.1-1
pensionfund	pensiond10	v10.1-1
[D9] sg-cms-1	sg-cms-1	v9.5-2
[D9] sg-cms-2	sg-cms-2	v9.5-2
[D9] sg-cms-3	sg-cms-3	v9.5-2
test-carina-delete	test-carina-delete	v10.1-1
test-dancing-club	test-dancing-club	v10.1-1

          S2I failed websites:

          $ oc get projects -l okd.cern.ch/user-project="true",drupal.cern.ch/infrastructure-project!=true -A -o json --no-headers | jq -r '.items[] | .metadata.name' | xargs -I{} oc get drupalsite -n {} -l drupal.webservices.cern.ch/isPrimary=true  -o json --no-headers --ignore-not-found | jq -r ".items[] | select( [.status.conditions[] | .status == \"True\" and .type == \"CodeUpdateFailed\"] | any ) | [.metadata.namespace, .metadata.name, .spec.version.name] | @tsv" 

atlas-secretariat	atlas-secretariat-test-2	v10.2-0
disaster-recovery	disaster-recovery-d10	v10.2-0
runningclub	runningclub	v10.2-0
sy-epc-fpc	sy-epc-fpc	v10.2-0
          Edited by Carina Antunes
      • Carina Antunes added In review label and removed In progress label

        added In review label and removed In progress label

      • Carina Antunes added In progress label and removed In review label

        added In progress label and removed In review label

      • Loading
      • Loading
      • Loading
      • Loading
      • Loading
      • Loading
      • Loading
      • Loading
      • Loading
      • Loading
      Please register or sign in to reply