diff options
| author |   selias <samelias@cisco.com> | 2017-02-09 16:31:33 +0100 |
|---|---|---|
| committer | Samuel Eliáš <samelias@cisco.com> | 2017-02-09 15:47:42 +0000 |
| commit | 4d69ab37dd0529708befeda9135f39d1ddb30bf5 (patch) | |
| tree | 6b4c366b5052903b58b403031d06cceb76e623dc | |
| parent | 043e5950c343f3395c7b9baff4f683ab0e6730aa (diff) | |
Skip checkstyle in hc2vpp-csit-verify job
Style is already verified in hc2vpp-verify.
Also fix missing dir change in prebuild script. This should download VPP
packages into ${WORKSPACE}/csit, where the csit bootstrap-hc2vpp-verify
script expects them to be.
Change-Id: I4471c711e188f920c890bb63594bb08b7810141e
Signed-off-by: selias <samelias@cisco.com>
| -rw-r--r-- | jjb/hc2vpp/csit-hc2vpp.yaml | 3 | ||||
| -rw-r--r-- | jjb/hc2vpp/include-raw-hc2vpp-csit-verify-prebuild.sh | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/jjb/hc2vpp/csit-hc2vpp.yaml b/jjb/hc2vpp/csit-hc2vpp.yaml index 2ce2c7966..1e70c3252 100644 --- a/jjb/hc2vpp/csit-hc2vpp.yaml +++ b/jjb/hc2vpp/csit-hc2vpp.yaml @@ -16,7 +16,6 @@ os: - ubuntu1404: repo-os-part: 'ubuntu.trusty.main' - skip-site: 'true' - job-template: name: 'hc2vpp-csit-integration-{stream}-{os}' @@ -141,7 +140,7 @@ maven: maven-name: 'mvn33-new' root-pom: 'pom.xml' - goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dmaven.site.skip={skip-site} site -Dmaven.site.deploy.skip={skip-site} -DskipTests' + goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -DskipTests -Dcheckstyle.skip=true' maven-opts: '-Xmx2048m -Dmaven.compile.fork=true' settings: 'hc2vpp-settings' settings-type: cfp diff --git a/jjb/hc2vpp/include-raw-hc2vpp-csit-verify-prebuild.sh b/jjb/hc2vpp/include-raw-hc2vpp-csit-verify-prebuild.sh index 3ce834498..f3c3bb0c8 100644 --- a/jjb/hc2vpp/include-raw-hc2vpp-csit-verify-prebuild.sh +++ b/jjb/hc2vpp/include-raw-hc2vpp-csit-verify-prebuild.sh @@ -11,7 +11,7 @@ if [ -f csit-test-branch ]; then CSIT_BRANCH=`./csit-test-branch` fi -# Clone csit and start tests +# Clone csit and download VPP packages git clone https://gerrit.fd.io/r/csit --branch ${CSIT_BRANCH} # If the git clone fails, complain clearly and exit @@ -20,6 +20,8 @@ if [ $? != 0 ]; then exit fi +cd csit + if [ ${STREAM} == 'master' ]; then ./csit/resources/tools/download_hc_build_pkgs.sh ${STREAM} else |