Skip to content

Commit

Permalink
Merge pull request #80 from CartoDB/test-travis-1
Browse files Browse the repository at this point in the history
update urls for hive install in travis
  • Loading branch information
Rafa de la Torre authored Sep 19, 2018
2 parents 0adfaf9 + 97f8ba5 commit b95a0a3
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions test/scripts/ci/install_hive.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ ssh-keygen -t dsa -P '' -f ~/.ssh/id_dsa
cat ~/.ssh/id_dsa.pub >> ~/.ssh/authorized_keys
chmod 0600 ~/.ssh/authorized_keys
sudo apt-get -y install openjdk-7-jre
wget --quiet --directory-prefix=/opt http://apache.rediris.es/hadoop/core/hadoop-${HADOOP_VERSION}/hadoop-${HADOOP_VERSION}.tar.gz
wget --quiet --directory-prefix=/opt http://apache.rediris.es/hive/hive-${HIVE_VERSION}/apache-hive-${HIVE_VERSION}-bin.tar.gz
wget --quiet --directory-prefix=/opt http://archive.apache.org/dist/hadoop/common/hadoop-${HADOOP_VERSION}/hadoop-${HADOOP_VERSION}.tar.gz
wget --quiet --directory-prefix=/opt http://archive.apache.org/dist/hive/hive-${HIVE_VERSION}/apache-hive-${HIVE_VERSION}-bin.tar.gz
tar -xzf /opt/hadoop-${HADOOP_VERSION}.tar.gz -C /opt
tar -xzf /opt/apache-hive-${HIVE_VERSION}-bin.tar.gz -C /opt
sed -i -- 's/export JAVA_HOME=${JAVA_HOME}/export JAVA_HOME=\/usr\/lib\/jvm\/java-7-openjdk-amd64/g' ${HADOOP_HOME}/etc/hadoop/hadoop-env.sh
Expand Down
10 changes: 5 additions & 5 deletions test/scripts/ci/install_postgres.sh
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
#!/bin/bash

# echo commands
set -x
set -x

# exit on error
set -e
set -e

# Add the PDGD repository
apt-key adv --keyserver keys.gnupg.net --recv-keys 7FCC7D46ACCC4CF8
sudo apt-key adv --keyserver keys.gnupg.net --recv-keys ACCC4CF8
add-apt-repository "deb http://apt.postgresql.org/pub/repos/apt/ trusty-pgdg main"
apt-get update

# Remove those all PgSQL versions except the one we're testing
PGSQL_VERSIONS=(9.2 9.3 9.4 9.5 9.6 10 11)
/etc/init.d/postgresql stop # stop travis default instance
Expand All @@ -21,7 +21,7 @@ for V in "${PGSQL_VERSIONS[@]}"; do
done
apt-get -y autoremove

# Install PostgreSQL
# Install PostgreSQL
apt-get -y install postgresql-${PGSQL_VERSION} postgresql-server-dev-${PGSQL_VERSION}

# Configure it to accept local connections from postgres
Expand Down

0 comments on commit b95a0a3

Please sign in to comment.