From 7e5510a267055c35bdbdba52a768bf72b53f38e1 Mon Sep 17 00:00:00 2001 From: "James O. D. Hunt" Date: Thu, 1 Mar 2018 14:14:48 +0000 Subject: [PATCH] CI: Call the static checks script Ensure Jenkins jobs call the static checks before running setup and the tests. Fixes #102. Signed-off-by: James O. D. Hunt --- .ci/jenkins_job_build.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.ci/jenkins_job_build.sh b/.ci/jenkins_job_build.sh index eeae90cf..749ef6d8 100755 --- a/.ci/jenkins_job_build.sh +++ b/.ci/jenkins_job_build.sh @@ -62,9 +62,22 @@ else git fetch origin && git checkout master && git reset --hard origin/master fi +# Run the static analysis tools +.ci/static-checks.sh + # Setup Kata Containers Environment .ci/setup.sh +if [ -n "$pr_number" ] +then + # Now that checkcommits has run, move the PR commits into the master + # branch before running the tests. Having the commits in "master" is + # required to ensure coveralls works. + git checkout master + git reset --hard "$pr_branch" + git branch -D "$pr_branch" +fi + # Run integration tests .ci/run.sh