Commit b5e912fa by Joseph Mulloy

Remove 12.04/precise from utils/scripts OPS-1849

parent fec3e778
...@@ -47,7 +47,6 @@ VIRTUAL_ENV="/tmp/bootstrap" ...@@ -47,7 +47,6 @@ VIRTUAL_ENV="/tmp/bootstrap"
PYTHON_BIN="${VIRTUAL_ENV}/bin" PYTHON_BIN="${VIRTUAL_ENV}/bin"
ANSIBLE_DIR="/tmp/ansible" ANSIBLE_DIR="/tmp/ansible"
CONFIGURATION_DIR="/tmp/configuration" CONFIGURATION_DIR="/tmp/configuration"
EDX_PPA="deb http://ppa.edx.org precise main"
EDX_PPA_KEY_SERVER="keyserver.ubuntu.com" EDX_PPA_KEY_SERVER="keyserver.ubuntu.com"
EDX_PPA_KEY_ID="B41E5E3969464050" EDX_PPA_KEY_ID="B41E5E3969464050"
...@@ -70,10 +69,7 @@ if [[ $(id -u) -ne 0 ]] ;then ...@@ -70,10 +69,7 @@ if [[ $(id -u) -ne 0 ]] ;then
exit 1; exit 1;
fi fi
if grep -q 'Precise Pangolin' /etc/os-release if grep -q 'Trusty Tahr' /etc/os-release
then
SHORT_DIST="precise"
elif grep -q 'Trusty Tahr' /etc/os-release
then then
SHORT_DIST="trusty" SHORT_DIST="trusty"
elif grep -q 'Xenial Xerus' /etc/os-release elif grep -q 'Xenial Xerus' /etc/os-release
...@@ -82,7 +78,7 @@ then ...@@ -82,7 +78,7 @@ then
else else
cat << EOF cat << EOF
This script is only known to work on Ubuntu Precise, Trusty and Xenial, This script is only known to work on Ubuntu Trusty and Xenial,
exiting. If you are interested in helping make installation possible exiting. If you are interested in helping make installation possible
on other platforms, let us know. on other platforms, let us know.
......
#!/bin/bash #!/bin/bash
## ##
## Installs the pre-requisites for running edX on a single Ubuntu 12.04 ## Installs the pre-requisites for running edX on a single Ubuntu 16.04
## instance. This script is provided as a convenience and any of these ## instance. This script is provided as a convenience and any of these
## steps could be executed manually. ## steps could be executed manually.
## ##
......
...@@ -17,7 +17,6 @@ weights: ...@@ -17,7 +17,6 @@ weights:
- nginx: 1 - nginx: 1
- xqueue: 2 - xqueue: 2
- trusty-common: 5 - trusty-common: 5
- precise-common: 4
- xenial-common: 6 - xenial-common: 6
- ecommerce: 6 - ecommerce: 6
- rabbitmq: 2 - rabbitmq: 2
......
...@@ -146,7 +146,7 @@ def parse_args(): ...@@ -146,7 +146,7 @@ def parse_args():
group = parser.add_mutually_exclusive_group() group = parser.add_mutually_exclusive_group()
group.add_argument('-b', '--base-ami', required=False, group.add_argument('-b', '--base-ami', required=False,
help="ami to use as a base ami", help="ami to use as a base ami",
default="ami-0568456c") default="ami-cd0f5cb6")
group.add_argument('--blessed', action='store_true', group.add_argument('--blessed', action='store_true',
help="Look up blessed ami for env-dep-play.", help="Look up blessed ami for env-dep-play.",
default=False) default=False)
...@@ -330,7 +330,6 @@ fi ...@@ -330,7 +330,6 @@ fi
VIRTUAL_ENV_VERSION="15.0.2" VIRTUAL_ENV_VERSION="15.0.2"
PIP_VERSION="8.1.2" PIP_VERSION="8.1.2"
SETUPTOOLS_VERSION="24.0.3" SETUPTOOLS_VERSION="24.0.3"
EDX_PPA="deb http://ppa.edx.org precise main"
EDX_PPA_KEY_SERVER="keyserver.ubuntu.com" EDX_PPA_KEY_SERVER="keyserver.ubuntu.com"
EDX_PPA_KEY_ID="B41E5E3969464050" EDX_PPA_KEY_ID="B41E5E3969464050"
...@@ -353,10 +352,7 @@ if [[ $(id -u) -ne 0 ]] ;then ...@@ -353,10 +352,7 @@ if [[ $(id -u) -ne 0 ]] ;then
exit 1; exit 1;
fi fi
if grep -q 'Precise Pangolin' /etc/os-release if grep -q 'Trusty Tahr' /etc/os-release
then
SHORT_DIST="precise"
elif grep -q 'Trusty Tahr' /etc/os-release
then then
SHORT_DIST="trusty" SHORT_DIST="trusty"
elif grep -q 'Xenial Xerus' /etc/os-release elif grep -q 'Xenial Xerus' /etc/os-release
...@@ -365,7 +361,7 @@ then ...@@ -365,7 +361,7 @@ then
else else
cat << EOF cat << EOF
This script is only known to work on Ubuntu Precise, Trusty and Xenial, This script is only known to work on Ubuntu Trusty and Xenial,
exiting. If you are interested in helping make installation possible exiting. If you are interested in helping make installation possible
on other platforms, let us know. on other platforms, let us know.
...@@ -391,7 +387,7 @@ apt-get install -y software-properties-common python-software-properties ...@@ -391,7 +387,7 @@ apt-get install -y software-properties-common python-software-properties
add-apt-repository -y ppa:git-core/ppa add-apt-repository -y ppa:git-core/ppa
# For older distributions we need to install a PPA for Python 2.7.10 # For older distributions we need to install a PPA for Python 2.7.10
if [[ "precise" = "$SHORT_DIST" || "trusty" = "$SHORT_DIST" ]]; then if [[ "trusty" = "$SHORT_DIST" ]]; then
# Add python PPA # Add python PPA
apt-key adv --keyserver "$EDX_PPA_KEY_SERVER" --recv-keys "$EDX_PPA_KEY_ID" apt-key adv --keyserver "$EDX_PPA_KEY_SERVER" --recv-keys "$EDX_PPA_KEY_ID"
...@@ -427,12 +423,9 @@ pip install virtualenv=="$VIRTUAL_ENV_VERSION" ...@@ -427,12 +423,9 @@ pip install virtualenv=="$VIRTUAL_ENV_VERSION"
# python3 is required for certain other things # python3 is required for certain other things
# (currently xqwatcher so it can run python2 and 3 grader code, # (currently xqwatcher so it can run python2 and 3 grader code,
# but potentially more in the future). It's not available on Ubuntu 12.04, # but potentially more in the future).
# but in those cases we don't need it anyways. /usr/bin/apt-get update
if [[ -n "$(apt-cache search --names-only '^python3-pip$')" ]]; then /usr/bin/apt-get install -y python3-pip python3-dev
/usr/bin/apt-get update
/usr/bin/apt-get install -y python3-pip python3-dev
fi
# this is missing on 14.04 (base package on 12.04) # this is missing on 14.04 (base package on 12.04)
# we need to do this on any build, since the above apt-get # we need to do this on any build, since the above apt-get
......
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