Merge pull request #252 from pulp/regenerate-travis

Update the travis config with the plugin_template.

Author: asmacdo

.travis.yml

@@ -21,6 +21,7 @@ env:
 
 matrix:
   exclude:
+
     - python: '3.6'
       env: DB=postgres TEST=docs
   fast_finish: true
@@ -75,3 +76,4 @@ jobs:
 
 notifications: None
 
+

.travis/before_install.sh

@@ -15,7 +15,7 @@ export POST_BEFORE_INSTALL=$TRAVIS_BUILD_DIR/.travis/post_before_install.sh
 COMMIT_MSG=$(git log --format=%B --no-merges -1)
 export COMMIT_MSG
 
-if [ -x $PRE_BEFORE_INSTALL ]; then
+if [ -f $PRE_BEFORE_INSTALL ]; then
     $PRE_BEFORE_INSTALL
 fi
 
@@ -81,6 +81,6 @@ cp pulp_python/.travis/postgres.yml ansible-pulp/postgres.yml
 
 cd pulp_python
 
-if [ -x $POST_BEFORE_INSTALL ]; then
+if [ -f $POST_BEFORE_INSTALL ]; then
     $POST_BEFORE_INSTALL
 fi

.travis/before_script.sh

@@ -7,7 +7,7 @@
 #
 # For more info visit https://github.com/pulp/plugin_template
 
-set -v
+set -euv
 
 export PRE_BEFORE_SCRIPT=$TRAVIS_BUILD_DIR/.travis/pre_before_script.sh
 export POST_BEFORE_SCRIPT=$TRAVIS_BUILD_DIR/.travis/post_before_script.sh

.travis/check_commit.sh

@@ -7,6 +7,8 @@
 #
 # For more info visit https://github.com/pulp/plugin_template
 
+set -euv
+
 # skip this check for everything but PRs
 if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then
   exit 0
@@ -18,7 +20,7 @@ elif [ "$TRAVIS_COMMIT" != "" ]; then
   RANGE=$TRAVIS_COMMIT
 fi
 
-# Travis sends the ranges with 3 dots. Git only wants one.
+# Travis sends the ranges with 3 dots. Git only wants two.
 if [[ "$RANGE" == *...* ]]; then
   RANGE=`echo $TRAVIS_COMMIT_RANGE | sed 's/\.\.\./../'`
 else

.travis/install.sh

@@ -7,7 +7,7 @@
 #
 # For more info visit https://github.com/pulp/plugin_template
 
-set -v
+set -euv
 
 if [ "$TEST" = 'docs' ]; then
   pip3 install -r doc_requirements.txt
@@ -20,5 +20,4 @@ cd ../ansible-pulp
 ansible-galaxy install -r requirements.yml
 
 ansible-playbook --connection=local --inventory 127.0.0.1, playbook.yml --extra-vars \
-  "pulp_python_interpreter=$VIRTUAL_ENV/bin/python, pulp_install_dir=$VIRTUAL_ENV \
-  pulp_db_type=$DB"
+  "pulp_python_interpreter=$VIRTUAL_ENV/bin/python, pulp_install_dir=$VIRTUAL_ENV"

.travis/playbook.yml

@@ -9,7 +9,7 @@
 - hosts: all
   pre_tasks:
     - name: Load DB variables
-      include_vars: '{{ pulp_db_type }}.yml'
+      include_vars: 'postgres.yml'
   vars:
     pulp_default_admin_password: admin
     pulp_source_dir: '{{ ansible_env.TRAVIS_BUILD_DIR | dirname }}/pulpcore/'
@@ -20,6 +20,7 @@
         source_dir: "$TRAVIS_BUILD_DIR"
     ansible_python_interpreter: '/opt/pyenv/shims/python3'
     pulp_user: 'travis'
+    pulp_group: 'travis'
     developer_user: 'travis'
     pulp_install_db: false
     pulp_preq_packages: []
@@ -28,7 +29,6 @@
       secret_key: 'secret'
       databases:
         default:
-          ENGINE: "{{ pulp_db_backend }}"
           USER: 'travis'
           PASSWORD: ''
   environment:

.travis/publish_client_gem.sh

@@ -7,6 +7,8 @@
 #
 # For more info visit https://github.com/pulp/plugin_template
 
+set -euv
+
 echo "---
 :rubygems_api_key: $RUBYGEMS_API_KEY" > ~/.gem/credentials
 sudo chmod 600 ~/.gem/credentials

.travis/publish_client_pypi.sh

@@ -7,6 +7,8 @@
 #
 # For more info visit https://github.com/pulp/plugin_template
 
+set -euv
+
 pip install twine
 
 django-admin runserver 24817 >> ~/django_runserver.log 2>&1 &

.travis/publish_plugin_pypi.sh

@@ -7,6 +7,8 @@
 #
 # For more info visit https://github.com/pulp/plugin_template
 
+set -euv
+
 pip install twine
 
 python setup.py sdist bdist_wheel --python-tag py3

.travis/script.sh

@@ -12,6 +12,7 @@ set -mveuo pipefail
 
 export POST_SCRIPT=$TRAVIS_BUILD_DIR/.travis/post_script.sh
 export POST_DOCS_TEST=$TRAVIS_BUILD_DIR/.travis/post_docs_test.sh
+export FUNC_TEST_SCRIPT=$TRAVIS_BUILD_DIR/.travis/func_test_script.sh
 
 # Needed for both starting the service and building the docs.
 # Gets set in .travis/settings.yml, but doesn't seem to inherited by
@@ -41,7 +42,7 @@ if [ "$TEST" = 'docs' ]; then
   make html
   cd ..
 
-  if [ -x $POST_DOCS_TEST ]; then
+  if [ -f $POST_DOCS_TEST ]; then
       $POST_DOCS_TEST
   fi
   exit
@@ -66,6 +67,30 @@ if [ "$TEST" = 'bindings' ]; then
   pip install ./pulp_python-client
 
   python $TRAVIS_BUILD_DIR/.travis/test_bindings.py
+
+  if [ ! -f $TRAVIS_BUILD_DIR/.travis/test_bindings.rb ]
+  then
+    exit
+  fi
+
+  rm -rf ./pulpcore-client
+
+  ./generate.sh pulpcore ruby
+  cd pulpcore-client
+  gem build pulpcore_client
+  gem install --both ./pulpcore_client-0.gem
+  cd ..
+
+  rm -rf ./pulp_python-client
+
+  ./generate.sh pulp_python ruby
+
+  cd pulp_python-client
+  gem build pulp_python_client
+  gem install --both ./pulp_python_client-0.gem
+  cd ..
+
+  ruby $TRAVIS_BUILD_DIR/.travis/test_bindings.rb
   exit
 fi
 
@@ -75,10 +100,14 @@ coverage run $(which django-admin) test ./pulp_python/tests/unit/
 # Run functional tests, and upload coverage report to codecov.
 show_logs_and_return_non_zero() {
     readonly local rc="$?"
-    cat ~/django_runserver.log
-    cat ~/content_app.log
-    cat ~/resource_manager.log
-    cat ~/reserved_worker-1.log
+
+    for logfile in "~/django_runserver.log" "~/content_app.log" "~/resource_manager.log" "~/reserved_worker-1.log"
+    do
+      echo -en "travis_fold:start:$logfile"'\\r'
+      cat $logfile
+      echo -en "travis_fold:end:$logfile"'\\r'
+    done
+
     return "${rc}"
 }
 
@@ -94,11 +123,13 @@ coverage run $(which django-admin) runserver 24817 --noreload >> ~/django_runser
 wait_for_pulp 20
 
 # Run functional tests
-pytest -v -r sx --color=yes --pyargs pulpcore.tests.functional || show_logs_and_return_non_zero
-pytest -v -r sx --color=yes --pyargs pulp_python.tests.functional || show_logs_and_return_non_zero
-
+if [ -f $FUNC_TEST_SCRIPT ]; then
+    $FUNC_TEST_SCRIPT
+else
+    pytest -v -r sx --color=yes --pyargs pulp_python.tests.functional || show_logs_and_return_non_zero
+fi
 
 
-if [ -x $POST_SCRIPT ]; then
+if [ -f $POST_SCRIPT ]; then
     $POST_SCRIPT
 fi