CI: Call the static checks script

Ensure Jenkins jobs call the static checks before running setup and the tests. Fixes kata-containers#102. Signed-off-by: James O. D. Hunt <[email protected]>
GabyCT · Mar 1, 2018 · 7e5510a · 7e5510a
1 parent 0467d48
commit 7e5510a
Showing 1 changed file with 13 additions and 0 deletions.
diff --git 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