Upgrading to ME 1.16
This upgrade guide assumes you are presently running Elentra ME 1.13+. If you are running Entrada ME 1.12 or earlier please consult with the Elentra Consortium Core Team prior to upgrading and they will provide personalized assistance.
Upgrade Instructions
Part 1 - Source Code Update
From within Sourcetree on your developer workstation, open your existing local Elentra ME Branded Edition (i.e.,
uni-elentra-1x-me
) repository.If you do not currently have an
upstream
Git remote that points to your up-to-date Institutional Fork or to the Consortium Editionelentra-1x-me
repository, then ensure that you add one:Click the "Fetch" button (ensuring that "Fetch from all remotes" and "Prune tracking branches no longer present on remote(s)" options are checked) or type
git fetch upstream
.Checkout your Branded Edition staging branch (e.g.,
uni/staging
) and create a new branch based on this branch (e.g.,uni/staging-v115
) just for easy restore purposes in case it's needed. Once that branch has been created, checkout the original Branded Edition staging branch (e.g.,uni/staging
) and continue.Within the "Remotes" section in Sourcetree sidebar, expand the
upstream
remote, then right click onrelease/1.16
and click "Pull upstream/release/1.16 into uni/staging". At this point, you may be asked to resolve any merge conflicts that have been created by making modifications to your Branded Edition that conflict with changes that have been made to the Consortium Edition. Depending on your level of conflict, this could be as simple as a minor modification to thecomposer.lock
file or something much more complex. If you require assistance, please book an appointment with the Elentra Consortium Core Team and we will provide you with some guidance on moving forward. As a point of note, we always recommend that Consortium Participants follow the Contribution best practices defined in our documentation, which may help reduce the number of conflicts that you encounter.Once the conflicts have been resolved, commit the merge to your
uni/staging
branch and continue to Part 2 of the instructions.
We would recommend against pushing your changes to your origin
remote at this point. Wait until Part 2 has been completed and have finished some initial local testing.
Part 2 - Configuration and Branding Update
Using a tool like Araxis Merge, compare
www-root/core/config/settings.inc.php
with thesettings-staging.inc.php
andsettings-production.inc.php
files in the same directory. If you have alternatively named or additional settings files, use those instead. When you compare the Consortium Editionsettings.inc.php
file with your Branded Edition files, you are looking to add additional settings that have been added to the stocksettings.inc.php
file and remove any settings that have been removed from the stocksettings.inc.php
file. In most cases, your Branded Edition settings files should have the same lines (albeit potentially different settings values) as the Consortium Edition. Once you have compared your settings files, commit the changes to youruni/staging
branch.Using a tool like Araxis Merge, compare the
www-root/templates/default
directory with your own Branded Edition templates (e.g.,www-root/templates/uni
). In many cases, you will want to add missing files, update your language files, add any additions to the CSS files, add modifications to yourheader.tpl.php
files, etc. This process can take a bit of time and should be repeated for each additional template that you have created. Once you have compared your templates, commit the changes to youruni/staging
branch.
Updating a Branded API
Branded API changes should be base off of the upstream release/3.x
branch.
To update your branded Elentra API, first clone or checkout the master branch of your Branded API to your local environment using Sourcetree.
Click the "Fetch" button (ensuring that "Fetch from all remotes" and "Prune tracking branches no longer present on remote(s)" options are checked) or type
git fetch upstream
.Within the "Remotes" section in Sourcetree sidebar, expand the
upstream
remote, then right click onrelease/3.x
and click Pull upstream/release/3.x into uni/master. There may be merge conflicts that must be resolved if customizations made to your branded API.Resolve any merge conflicts and commit the changes to the
master
branch of your Branded API. Push any changes to your Branded API remote.Using Sourcetree or your project service of choice, create a new tag that follows semantic versioning. For example at the time of writting, the latest tagged release of the api is
v3.2.0
and thecomposer.json
provided with Elentra 1.16 specifies that the major version of API version must be~3.0
. Create a new tag where the current date follows the patch version:3.2.0.20190227
. More information about tagging API releases can be found here.In your Branded Edition of Elentra ME, run
composer update elentrapackages/elentra-1x-api
and commit the changes to thecomposer.lock
file.
Part 3 - Testing Locally
Now that you have upgraded your source code and updated your settings and templates. You should begin reviewing and testing the upgrade on your developer work station. Before testing can begin we need to do a few things.
Log into your local
elentra-developer
Docker container, and change to youruni-elentra-1x-me
directory:Ensure that the latest Composer dependencies installed:
Ensure that the database migrations are completed:
Providing these steps were successful, you should now be able to visit https://uni-elentra-1x-me.localhost in your web browser and being your review.
At this point, providing you're satisfied with your local testing, we would recommend that you push your changes to your origin
remote.
Part 4 - Testing on Staging
Providing that you have pushed the changes to your uni/staging
branch to your origin
remote, you can now deploy the upgrade to your staging environment from within your Docker container.
Log into your local
elentra-developer
Docker container, and change to yourdeployment
directory:Deploy changes to your staging server:
Providing the deployment was successful, you should now be able to visit https://elentra-staging.med.university.edu in your web browser to begin a thorough review of your upgraded Branded Edition implementation of Elentra ME.
For the most accurate review possible, we would recommend that you have a very recent version of your production databases installed and scrubbed on your staging database server. This is typically achieved using the scrub.sh
shell script included with the Elentra Platform.
Part 5 - Deploy to Production
Providing that you have thoroughly tested your upgraded Branded Edition implementation of Elentra ME on within your staging environment, it is safe to proceed with a production upgrade.
From within Sourcetree on your developer workstation, open your existing local Elentra ME Branded Edition (i.e.,
uni-elentra-1x-me
) repository.Checkout your
uni/production
branch.Right click on your
uni/staging
branch and click "Merge uni/staging into uni/production". This will merge all of the commits that have gone into creating the upgrade, into youruni/production
branch.Push the commits in the
uni/production
branch to yourorigin
remote.Log into your localelentra-developer
Docker container, and change to yourdeployment
directory:Deploy changes to your production server:
Providing the deployment was successful, you should now be able to visit https://elentra.med.university.edu in your web browser and enjoy the fact that you are now running the latest version of Elentra ME.
Post-Upgrade Requirements
Once you have completed the source code upgrade to Elentra ME 1.16 and things are running smoothly in production, we need to do a few additional steps.
Add New Cronjobs
There are no new cronjobs to add between Elentra ME 1.15 and 1.16.
Update .htacess Files
There are no changes to the .htaccess files between Elentra ME 1.15 and 1.16.
Last updated