Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CI: Remove support for Jenkins and fix python code coverage (WIP) #345

Merged
merged 1 commit into from
Oct 2, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/ci_scripts/conf_scripts/chromium-local-prepare.sh
Original file line number Diff line number Diff line change
@@ -1 +1 @@
cat ${WORKSPACE}/src/ci_scripts/templates/chromium-local-conf.template >> ${WC_INSTANCE_NAME}/settings.py
cat ${TRAVIS_BUILD_DIR}/src/ci_scripts/templates/chromium-local-conf.template >> settings.py
4 changes: 2 additions & 2 deletions src/ci_scripts/conf_scripts/elasticsearch-prepare.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
pip install elasticsearch==2.4.1

# Remove default haystack settings
sed '34,39d' ${WC_INSTANCE_NAME}/settings.py
sed '34,39d' settings.py

# Add ElasticSearch Haystack settings
cat ${WORKSPACE}/src/ci_scripts/templates/elasticsearch-conf.template >> ${WC_INSTANCE_NAME}/settings.py
cat ${TRAVIS_BUILD_DIR}/src/ci_scripts/templates/elasticsearch-conf.template >> settings.py
2 changes: 1 addition & 1 deletion src/ci_scripts/conf_scripts/firefox-local-prepare.sh
Original file line number Diff line number Diff line change
@@ -1 +1 @@
cat ${WORKSPACE}/src/ci_scripts/templates/firefox-local-conf.template >> ${WC_INSTANCE_NAME}/settings.py
cat ${TRAVIS_BUILD_DIR}/src/ci_scripts/templates/firefox-local-conf.template >> settings.py
2 changes: 1 addition & 1 deletion src/ci_scripts/conf_scripts/firefox-prepare.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
export BROWSER_TYPE="FIREFOX"

cat ${WORKSPACE}/src/ci_scripts/templates/selenium-remote-conf.template >> ${WC_INSTANCE_NAME}/settings.py
cat ${TRAVIS_BUILD_DIR}/src/ci_scripts/templates/selenium-remote-conf.template >> settings.py
2 changes: 1 addition & 1 deletion src/ci_scripts/conf_scripts/fiware-prepare.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
pip install social-auth-app-django

cat ${WORKSPACE}/src/ci_scripts/templates/fiware-conf.template >> ${WC_INSTANCE_NAME}/settings.py
cat ${TRAVIS_BUILD_DIR}/src/ci_scripts/templates/fiware-conf.template >> settings.py
2 changes: 1 addition & 1 deletion src/ci_scripts/conf_scripts/postgres-prepare.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ pip install psycopg2

createdb -U postgres -h ${DB_HOST:-localhost} -p ${DB_PORT:-5432} -O ${DB_USER:-postgres} ${DB_NAME:-wirecloud}

cat ${WORKSPACE}/src/ci_scripts/templates/postgres-conf.template >> ${WC_INSTANCE_NAME}/settings.py
cat ${TRAVIS_BUILD_DIR}/src/ci_scripts/templates/postgres-conf.template >> settings.py
6 changes: 3 additions & 3 deletions src/ci_scripts/conf_scripts/solr-prepare.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
pip install pysolr

# Remove default haystack settings
sed '34,39d' ${WC_INSTANCE_NAME}/settings.py
sed '34,39d' settings.py

# Add ElasticSearch Haystack settings
cat ${WORKSPACE}/src/ci_scripts/templates/solr-conf.template >> ${WC_INSTANCE_NAME}/settings.py
cat ${TRAVIS_BUILD_DIR}/src/ci_scripts/templates/solr-conf.template >> settings.py

# Upload Solr schema
apt-get install -y sshpass
sshpass -p 'wirecloud' ssh solr@${SOLR_SERVER} "rm -f /opt/solr/server/solr/tester/conf/schema.xml /opt/solr/server/solr/tester/conf/managed-schema"
sshpass -p 'wirecloud' scp -r ${WORKSPACE}/src/ci_scripts/templates/solr-schema.template solr@${SOLR_SERVER}:/opt/solr/server/solr/tester/conf/schema.xml
sshpass -p 'wirecloud' scp -r ${TRAVIS_BUILD_DIR}/src/ci_scripts/templates/solr-schema.template solr@${SOLR_SERVER}:/opt/solr/server/solr/tester/conf/schema.xml

# Reload the Solr core
curl "http://${SOLR_SERVER}:8983/solr/admin/cores?action=RELOAD&core=tester"
2 changes: 1 addition & 1 deletion src/ci_scripts/conf_scripts/sqlite3-prepare.sh
Original file line number Diff line number Diff line change
@@ -1 +1 @@
cat ${WORKSPACE}/src/ci_scripts/templates/sqlite3-conf.template >> ${WC_INSTANCE_NAME}/settings.py
cat ${TRAVIS_BUILD_DIR}/src/ci_scripts/templates/sqlite3-conf.template >> settings.py
76 changes: 0 additions & 76 deletions src/ci_scripts/test.sh

This file was deleted.

14 changes: 5 additions & 9 deletions src/ci_scripts/travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@

set -e

cd $TRAVIS_BUILD_DIR/src

if [ "${TEST_SUITE}" == "js_unittests" ]; then
cd $TRAVIS_BUILD_DIR/src
grunt ci
exit
elif [ "${TEST_SUITE}" == "selenium" ]; then
Expand All @@ -13,7 +14,6 @@ else
fi


export WC_INSTANCE_NAME=test_instance
[ -n "${IP_ADDR}" ] || IP_ADDR="localhost"

WORKSPACE=${TRAVIS_BUILD_DIR}
Expand All @@ -31,18 +31,14 @@ do
done

# Build and install WireCloud
cd src; ./setup.py bdist_wheel &> /dev/null; cd ..
./setup.py bdist_wheel &> /dev/null
pip install ${TRAVIS_BUILD_DIR}/src/dist/wirecloud*.whl

# Install the required testing tools
pip install django-nose mock radon

# Create a WireCloud instance
wirecloud-admin startproject ${WC_INSTANCE_NAME}
cd ${WC_INSTANCE_NAME}

# And configure it
cat ${TRAVIS_BUILD_DIR}/src/ci_scripts/base_settings.py >> ${WC_INSTANCE_NAME}/settings.py
# Configure WireCloud
cat ${TRAVIS_BUILD_DIR}/src/ci_scripts/base_settings.py >> settings.py
for conf in $FLAGS
do
file="${TRAVIS_BUILD_DIR}/src/ci_scripts/conf_scripts/${conf}-prepare.sh"
Expand Down
4 changes: 3 additions & 1 deletion src/ci_scripts/travis_after_success.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
set -e

if [ "${TEST_SUITE}" != "js_unittests" ]; then
cd src
cd ${TRAVIS_BUILD_DIR}/src
coveralls
fi