Commit 3653f0f2 by Brian Beggs

Set scripts to pipe failures

parent 761e3ac5
#!/usr/bin/env bash
set -e
set -o pipefail
set -x
# NOTE (CCB): We do NOT call provision-ida because it expects a virtualenv.
# The new images for Credentials do not use virtualenv.
......
# Provisioning script for the discovery service
set -e
set -o pipefail
set -x
./provision-ida.sh discovery 18381
docker-compose exec discovery bash -c 'source /edx/app/discovery/discovery_env && python /edx/app/discovery/discovery/manage.py create_or_update_partner --site-id 1 --site-domain localhost:18381 --code edx --name edX --courses-api-url "http://edx.devstack.lms:18000/api/courses/v1/" --ecommerce-api-url "http://edx.devstack.ecommerce:18130/api/v2/" --organizations-api-url "http://edx.devstack.lms:18000/api/organizations/v0/" --oidc-url-root "http://edx.devstack.lms:18000/oauth2" --oidc-key discovery-key --oidc-secret discovery-secret'
......
# Load database dumps for the largest databases to save time
set -e
set -o pipefail
set -x
./load-db.sh ecommerce
./provision-ida.sh ecommerce 18130
......
......@@ -6,3 +6,5 @@ port=$2
echo -e "${GREEN}Creating service user and OAuth client for ${name}...${NC}"
docker exec -t edx.devstack.lms bash -c 'source /edx/app/edxapp/edxapp_env && python /edx/app/edxapp/edx-platform/manage.py lms --settings=devstack_docker manage_user $1_worker $1_worker@example.com --staff --superuser' -- "$name"
docker exec -t edx.devstack.lms bash -c 'source /edx/app/edxapp/edxapp_env && python /edx/app/edxapp/edx-platform/manage.py lms --settings=devstack_docker create_oauth2_client "http://localhost:$2" "http://localhost:$2/complete/edx-oidc/" confidential --client_name $1 --client_id "$1-key" --client_secret "$1-secret" --trusted --logout_uri "http://localhost:$2/logout/" --username $1_worker' -- "$name" "$port"
exit 0
\ No newline at end of file
......@@ -67,9 +67,10 @@ def run_command(command):
while p.poll() is None:
output = p.stdout.readline() + p.stderr.readline()
print(output)
# time.sleep()
time.sleep(1)
print(p.stdout.read())
print(p.stderr.read())
print(p.poll)
if p.poll() != 0:
sys.exit(p.poll())
......
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