Commit cb09e639 by Ben Patterson

jenkins_worker on packer: run test_build_server role before saving AMI.

Also disables lettuce verification on test_build_server role.
parent adc8a70c
...@@ -20,14 +20,14 @@ cd edx-platform-clone ...@@ -20,14 +20,14 @@ cd edx-platform-clone
# tests because TEST_SUITE isn't defined. # tests because TEST_SUITE isn't defined.
source scripts/all-tests.sh source scripts/all-tests.sh
# Now we can run a subset of the tests via paver. # Now we can run a subset of the tests via paver.
# Run some of the common/lib unit tests # Run some of the common/lib unit tests
paver test_lib -t common/lib/xmodule/xmodule/tests/test_stringify.py paver test_lib -t common/lib/xmodule/xmodule/tests/test_stringify.py
# Generate some coverage reports # Generate some coverage reports
paver coverage paver coverage
# Run some of the djangoapp unit tests # Run some of the djangoapp unit tests
paver test_system -t lms/djangoapps/courseware/tests/tests.py paver test_system -t lms/djangoapps/courseware/tests/tests.py
paver test_system -t cms/djangoapps/course_creators/tests/test_views.py paver test_system -t cms/djangoapps/course_creators/tests/test_views.py
...@@ -38,8 +38,8 @@ paver test_js_run -s xmodule ...@@ -38,8 +38,8 @@ paver test_js_run -s xmodule
paver test_bokchoy -t test_lms.py:RegistrationTest paver test_bokchoy -t test_lms.py:RegistrationTest
# Run some of the lettuce acceptance tests # Run some of the lettuce acceptance tests
paver test_acceptance -s lms --extra_args="lms/djangoapps/courseware/features/problems.feature" # paver test_acceptance -s lms --extra_args="lms/djangoapps/courseware/features/problems.feature"
paver test_acceptance -s cms --extra_args="cms/djangoapps/contentstore/features/html-editor.feature" # paver test_acceptance -s cms --extra_args="cms/djangoapps/contentstore/features/html-editor.feature"
# Generate quality reports # Generate quality reports
paver run_quality paver run_quality
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"aws_secret_key": "{{env `AWS_SECRET_ACCESS_KEY`}}", "aws_secret_key": "{{env `AWS_SECRET_ACCESS_KEY`}}",
"github_oauth_token": "{{env `GITHUB_TOKEN`}}", "github_oauth_token": "{{env `GITHUB_TOKEN`}}",
"playbook_remote_dir": "/tmp/packer-edx-playbooks", "playbook_remote_dir": "/tmp/packer-edx-playbooks",
"ami": "{{env `JENKINS_WORKER_AMI`}}", "ami": "{{env `JENKINS_WORKER_AMI`}}"
}, },
"builders": [{ "builders": [{
"type": "amazon-ebs", "type": "amazon-ebs",
...@@ -27,18 +27,19 @@ ...@@ -27,18 +27,19 @@
"type": "file", "type": "file",
"source": "../../../configuration/requirements.txt", "source": "../../../configuration/requirements.txt",
"destination": "{{user `playbook_remote_dir`}}/requirements.txt" "destination": "{{user `playbook_remote_dir`}}/requirements.txt"
}, }, {
{
"type": "shell", "type": "shell",
"inline": ["cd {{user `playbook_remote_dir`}}", "inline": ["cd {{user `playbook_remote_dir`}}",
"virtualenv packer-venv", "virtualenv packer-venv",
". packer-venv/bin/activate", ". packer-venv/bin/activate",
"pip install -q -r requirements.txt", "pip install -q -r requirements.txt",
"echo '[jenkins_worker]' >> inventory.ini", "echo '[jenkins_worker]' > inventory.ini",
"echo 'localhost' >> inventory.ini", "echo 'localhost' >> inventory.ini",
"ansible-playbook edx-east/jenkins_worker.yml -i inventory.ini -c local -e 'github_oauth_token={{user `github_oauth_token` }}' -vvvv"] "ansible-playbook edx-east/jenkins_worker.yml -i inventory.ini -c local -e 'github_oauth_token={{user `github_oauth_token` }}' -vvvv"]
}, { }, {
"type": "shell", "type": "shell",
"inline": ["echo placeholderfortests"] "inline": ["cd {{user `playbook_remote_dir`}}",
". packer-venv/bin/activate",
"ansible-playbook run_role.yml -i inventory.ini -c local -e role=test_build_server -vvvv"]
}] }]
} }
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