Move edxapp vars to app #89
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jmaupetit
force-pushed
the
move-edxapp-vars-to-app
branch
3 times, most recently
from
323005b
to
08d241c
Compare
sampaccoud
reviewed
Jul 27, 2018
apps/edxapp/templates/lms/svc.yml.j2
Outdated
| @@ -2,17 +2,19 @@ apiVersion: v1 | |||
| kind: Service | |||
| metadata: | |||
| labels: | |||
| app: edxapp-lms | |||
| version: "{{ edxapp_tag }}" | |||
| app: lms | |||
There was a problem hiding this comment.
Wow, well spotted!
bin/dev
Outdated
| @@ -2,88 +2,42 @@ | |||
| # | |||
| # Arnold's dev script | |||
| # | |||
| # We use KVM as the default hypervisor, if you want to use VirtualBox instead, | |||
| # please set the USE_KVM environment variable to 0, e.g.: | |||
| # Berore running this script, please make sure that your system met the | |||
bin/dev
Outdated
| # "insecure-registries" : ["172.30.0.0/16"] | ||
| # } | ||
| # | ||
| # 2. To run ES, you will to ensure that your kernel's vm.max_map_count |
There was a problem hiding this comment.
you will NEED to ensure
| function _login() { | ||
| _set_minishift_path | ||
| oc login "https://$(minishift ip):8443" --username=developer --password=developer | ||
| oc cluster up --server-loglevel=5 --public-hostname="${OPENSHIFT_DOMAIN}" |
There was a problem hiding this comment.
that's a bit more than login!?
There was a problem hiding this comment.
This function is no longer called login. Forget about this crappy diff.
group_vars/all/main.yml
Outdated
| cms_port: 8081 | ||
| lms_port: 8071 | ||
| # cms_port: 8081 | ||
| # lms_port: 8071 |
group_vars/all/main.yml
Outdated
| # mongodb_image: "centos/mongodb-32-centos7" | ||
| # mongodb_tag: "3.2" | ||
| # mysql_image: "centos/mysql-57-centos7" | ||
| # mysql_tag: "5.7" |
group_vars/all/main.yml
Outdated
| # port: "27017" | ||
| # mysql: | ||
| # host: "mysql" | ||
| # port: "3306" |
Move edxapp specific variables to the edxapp defaults and use them in edxapp templates. edxapp templates have been cleanup for cross applications consistency (labels, etc.).
We are now able to run jobs in a particular order depending on their template file name: jobs are sorted by their filename for an application (all services), e.g.: 1. apps/edxapp/templates/cms/job_01_collectstatic.yml.j2 2. apps/edxapp/templates/lms/job_02_collectstatic.yml.j2 3. ... And jobs are now executed sequentially, e.g. a new job cannot be submitted if the previous one in the list did not complete.
The CI VM needs to be able to run a dockerized ES instance so that Richie's "regenerate index" job can run properly.
edxapp(cms) deployment is now also tested in the CI \o/
To prevent jobs failure due to service unavailability, we've added a wait loop that ensures that all services have been created first.
The bin/dev script now uses the "oc cluster" command to start a local openshift cluster instead of minishift. This lowers down the requirements and configuration time to start working with Arnold (and it drastically improves the cluster performances). The minishift start script has been kept and moved to bin/minishift for those who would still prefer this legacy solution. Fix #81
Running edxapp migrations is way too long (more than 20 minutes). Hence we decided to speed up edxapp deployment by adding a new job that loads a sql dump of the database schema before running migrations.
jmaupetit
force-pushed
the
move-edxapp-vars-to-app
branch
from
14fef83
to
9a7f28d
Compare
|
We still have a timeout from CircleCI's test-bootstrap job. We decided to merge this as-is and address this timeout issue in a new PR: the idea is to split the test-bootstrap job in a per-app job, to hopefully prevent job failure due to a timeout issue. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Purpose
This is the second step of our application driven migration, now targeting the
edxappapplicationProposal
edxappvariables fromgroup_vars/all/main.ymltoapps/edxapp/vars/all/main.ymland use them in templatesedxapp's deployment in the CIadd support for multiple hosts per-serviceedit: postponed to another PR (see Add support for multiple host per-service #90)add lms host definition and test itedit: postponed to another PR (see Add support for multiple host per-service #90)