From de41e5b536a225c4cd6f8f0ac90363af5c9a3814 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Mon, 8 Aug 2016 17:52:04 -0400 Subject: [PATCH] jjb: use tox to run lttng-analyses build Signed-off-by: Michael Jeanson --- jobs/lttng-analyses.yaml | 13 ++++++++++++- scripts/lttng-analyses/build.sh | 31 +++++++++++++++++++++++-------- 2 files changed, 35 insertions(+), 9 deletions(-) diff --git a/jobs/lttng-analyses.yaml b/jobs/lttng-analyses.yaml index 2bb45ed..dc86039 100644 --- a/jobs/lttng-analyses.yaml +++ b/jobs/lttng-analyses.yaml @@ -12,6 +12,11 @@ - timestamps - ansicolor: colormap: xterm + - credentials-binding: + - username-password-separated: + credential-id: lttng-analyses_codecov_token + username: CODECOV_PROJECT_NAME + password: CODECOV_TOKEN scm: - git: @@ -21,6 +26,7 @@ branches: - origin/{version} basedir: src/lttng-analyses + skip-tag: true triggers: - pollscm: @@ -60,10 +66,15 @@ - shell: !include-raw-escape: scripts/lttng-analyses/build.sh -# publishers: + publishers: # - archive: # artifacts: 'build/**' # allow-empty: false + - ircbot: + strategy: new-failure-and-fixed + matrix-notifier: only-parent + channels: + - name: '#lttng' - job-template: diff --git a/scripts/lttng-analyses/build.sh b/scripts/lttng-analyses/build.sh index f5b412e..4462456 100755 --- a/scripts/lttng-analyses/build.sh +++ b/scripts/lttng-analyses/build.sh @@ -15,6 +15,9 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . +# Has to be set in the environment +#CODECOV_TOKEN="" + SRCDIR="src/lttng-analyses" PYTHON3="python3" @@ -29,19 +32,31 @@ export PATH="$PATH:$BABELTRACE_DIR/bin" PYENV_HOME=$WORKSPACE/.pyenv/ # Delete previously built virtualenv -if [ -d $PYENV_HOME ]; then - rm -rf $PYENV_HOME +if [ -d "$PYENV_HOME" ]; then + rm -rf "$PYENV_HOME" fi # Create virtualenv and install necessary packages -virtualenv --system-site-packages -p $PYTHON3 $PYENV_HOME +virtualenv --system-site-packages -p $PYTHON3 "$PYENV_HOME" set +u -. $PYENV_HOME/bin/activate +. "$PYENV_HOME/bin/activate" set -u -cd "$SRCDIR" +pip install --quiet codecov +pip install --quiet tox + +# Hack for path too long in venv wrapper shebang +TMPDIR=$(mktemp -d) +cd "$TMPDIR" +ln -s "$WORKSPACE/$SRCDIR" src +cd src + +# Run base test suites and long regression test suite +for suite in py3 noutf8 pep8 longregression; do + export TOXENV="$suite" + tox + codecov -e TOXENV +done -$PYTHON3 setup.py build -$PYTHON3 setup.py test -$PYTHON3 setup.py install +unset TOXENV -- 2.34.1