Commit f101adcf by John Jarvis

Merge pull request #1527 from edx/jarv/migration-check-for-sandbox-clone

Jarv/migration check for sandbox clone
parents f2e7721e aff10ef1
...@@ -4,9 +4,10 @@ ...@@ -4,9 +4,10 @@
gather_facts: False gather_facts: False
vars: vars:
db_dry_run: "--db-dry-run" db_dry_run: "--db-dry-run"
syncdb: false
tasks: tasks:
# Syncdb with migrate when the migrate user is overridden in extra vars # Syncdb with migrate when the migrate user is overridden in extra vars
- name: syncdb and migrate - name: migrate
shell: > shell: >
chdir={{ edxapp_code_dir }} chdir={{ edxapp_code_dir }}
python manage.py {{ item }} migrate --noinput {{ db_dry_run }} --settings=aws_migrate python manage.py {{ item }} migrate --noinput {{ db_dry_run }} --settings=aws_migrate
...@@ -16,3 +17,14 @@ ...@@ -16,3 +17,14 @@
with_items: with_items:
- lms - lms
- cms - cms
- name: syncdb
shell: >
chdir={{ edxapp_code_dir }}
python manage.py {{ item }} syncdb --noinput --settings=aws_migrate
environment:
DB_MIGRATION_USER: "{{ COMMON_MYSQL_MIGRATE_USER }}"
DB_MIGRATION_PASS: "{{ COMMON_MYSQL_MIGRATE_PASS }}"
when: syncdb
with_items:
- lms
- cms
#!/usr/bin/env bash #!/usr/bin/env bash
set -x set -x
if [[ if [[ -z $WORKSPACE ]]; then
-z $WORKSPACE ||
-z $environment ||
-z $deployment
]]; then
echo "Environment incorrect for this wrapper script" echo "Environment incorrect for this wrapper script"
env env
exit 1 exit 1
...@@ -13,7 +9,7 @@ fi ...@@ -13,7 +9,7 @@ fi
env env
cd $WORKSPACE/edx-platform cd "$WORKSPACE/edx-platform"
# install requirements # install requirements
# These requirements will be installed into the shinginpanda # These requirements will be installed into the shinginpanda
...@@ -27,23 +23,43 @@ pip install --exists-action w -r requirements/edx/repo.txt ...@@ -27,23 +23,43 @@ pip install --exists-action w -r requirements/edx/repo.txt
pip install --exists-action w -r requirements/edx/github.txt pip install --exists-action w -r requirements/edx/github.txt
pip install --exists-action w -r requirements/edx/local.txt pip install --exists-action w -r requirements/edx/local.txt
cd $WORKSPACE/configuration/playbooks/edx-east if [[ $openid_workaround == "true" ]]; then
sed -i -e 's/claimed_id = models.TextField(max_length=2047, unique=True/claimed_id = models.TextField(max_length=2047/' "$VIRTUAL_ENV/lib/python2.7/site-packages/django_openid_auth/models.py"
fi
cd "$WORKSPACE/configuration/playbooks/edx-east"
if [[ -f ${WORKSPACE}/configuration-secure/ansible/vars/${deployment}.yml ]]; then if [[ -f ${WORKSPACE}/configuration-secure/ansible/vars/${deployment}.yml ]]; then
extra_var_args+=" -e@${WORKSPACE}/configuration-secure/ansible/vars/${deployment}.yml" extra_var_args+=" -e@${WORKSPACE}/configuration-secure/ansible/vars/${deployment}.yml"
fi fi
if [[ -z $syncdb ]]; then
syncdb="false"
fi
if [[ $db_dry_run == "false" ]]; then if [[ $db_dry_run == "false" ]]; then
# Set this to an empty string if db_dry_run is # Set this to an empty string if db_dry_run is
# not set. By default the db_dry_run var is # not set. By default the db_dry_run var is
# set to --db-dry-run # set to --db-dry-run
extra_var_args+=" -e db_dry_run=''" extra_var_args+=" -e db_dry_run=''"
else
# always skip syncdb unless dry run is unchecked
syncdb="false"
fi
if [[ -f ${WORKSPACE}/configuration-secure/ansible/vars/${environment}-${deployment}.yml ]]; then
extra_var_args+=" -e@${WORKSPACE}/configuration-secure/ansible/vars/${environment}-${deployment}.yml"
fi fi
extra_var_args+=" -e@${WORKSPACE}/configuration-secure/ansible/vars/${environment}-${deployment}.yml" for extra_var in $extra_vars; do
extra_var_args+=" -e@${WORKSPACE}/configuration-secure/ansible/vars/$extra_var"
done
extra_var_args+=" -e edxapp_app_dir=${WORKSPACE}" extra_var_args+=" -e edxapp_app_dir=${WORKSPACE}"
extra_var_args+=" -e edxapp_code_dir=${WORKSPACE}/edx-platform" extra_var_args+=" -e edxapp_code_dir=${WORKSPACE}/edx-platform"
extra_var_args+=" -e edxapp_user=jenkins" extra_var_args+=" -e edxapp_user=jenkins"
extra_var_args+=" -e syncdb=$syncdb"
# Generate the json configuration files # Generate the json configuration files
ansible-playbook -c local $extra_var_args --tags edxapp_cfg -i localhost, -s -U jenkins edxapp.yml ansible-playbook -c local $extra_var_args --tags edxapp_cfg -i localhost, -s -U jenkins edxapp.yml
......
...@@ -62,7 +62,7 @@ fi ...@@ -62,7 +62,7 @@ fi
$noop cd "/var/tmp/$repo_basename" $noop cd "/var/tmp/$repo_basename"
if [[ -z $noop ]]; then if [[ -z $noop ]]; then
for branch in $(git branch -a | grep "$filter" | sort -r | tr -d ' '); do for branch in $(git branch -a | sort -r | tr -d ' ' | grep -P "$filter" ); do
echo "origin/${branch}" echo "origin/${branch}"
done done
else else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment