diff options
Diffstat (limited to 'jjb')
-rw-r--r-- | jjb/hc2vpp/hc2vpp.yaml | 5 | ||||
-rw-r--r-- | jjb/hc2vpp/include-raw-hc2vpp-integration-prebuild.sh | 76 | ||||
-rw-r--r-- | jjb/hc2vpp/include-raw-hc2vpp-pkg-push.sh | 24 |
3 files changed, 104 insertions, 1 deletions
diff --git a/jjb/hc2vpp/hc2vpp.yaml b/jjb/hc2vpp/hc2vpp.yaml index 708ff1221..c74ce089d 100644 --- a/jjb/hc2vpp/hc2vpp.yaml +++ b/jjb/hc2vpp/hc2vpp.yaml @@ -232,6 +232,8 @@ project: '{project}' - os-parameter: os: '{os}' + - stream-parameter: + stream: '{stream}' - maven-project-parameter: maven: 'mvn33-new' - maven-exec: @@ -261,7 +263,8 @@ prebuilders: - shell: | if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /usr/lib/jvm/java-1.8.0-openjdk-amd64||echo 'ignoring failure';fi - + - shell: + !include-raw-escape: include-raw-hc2vpp-integration-prebuild.sh maven: maven-name: 'mvn33-new' root-pom: 'pom.xml' diff --git a/jjb/hc2vpp/include-raw-hc2vpp-integration-prebuild.sh b/jjb/hc2vpp/include-raw-hc2vpp-integration-prebuild.sh new file mode 100644 index 000000000..ee6b82ea6 --- /dev/null +++ b/jjb/hc2vpp/include-raw-hc2vpp-integration-prebuild.sh @@ -0,0 +1,76 @@ +#!/bin/bash + +set -ex + +# Download the latest VPP java API package +URL="https://nexus.fd.io/service/local/artifact/maven/content" +VERSION="RELEASE" +GROUP="io.fd.vpp" +ARTIFACTS="vpp-api-java" + +if [ "${OS}" == "ubuntu1404" ]; then + OS_PART="ubuntu.trusty.main" + PACKAGE="deb deb.md5" + CLASS="deb" +elif [ "${OS}" == "ubuntu1604" ]; then + OS_PART="ubuntu.xenial.main" + PACKAGE="deb deb.md5" + CLASS="deb" +elif [ "${OS}" == "centos7" ]; then + OS_PART="centos7" + PACKAGE="rpm rpm.md5" + CLASS="" +fi + +if [ "${STREAM}" == "master" ]; then + STREAM_PART="master" +else + STREAM_PART="stable.${STREAM}" +fi + +REPO="fd.io.${STREAM_PART}.${OS_PART}" + +for ART in ${ARTIFACTS}; do + for PAC in ${PACKAGE}; do + curl "${URL}?r=${REPO}&g=${GROUP}&a=${ART}&p=${PAC}&v=${VERSION}&c=${CLASS}" -O -J || exit + done +done + +# verify downloaded package +if [ "${OS}" == "centos7" ]; then + FILES=*.rpm +else + FILES=*.deb +fi + +for FILE in ${FILES}; do + echo " "${FILE} >> ${FILE}.md5 +done +for MD5FILE in *.md5; do + md5sum -c ${MD5FILE} || exit + rm ${MD5FILE} +done + +# install vpp-api-java, this extracts jvpp .jar files into usr/share/java +if [ "${OS}" == "centos7" ]; then + sudo rpm --nodeps --install vpp-api-java* +else + sudo dpkg --ignore-depends=vpp --install vpp-api-java* +fi +rm vpp-api-java* + +# install jvpp jars into maven repo, so that maven picks them up when building hc2vpp +current_dir=`pwd` +cd /usr/share/java + +for item in jvpp*.jar; do + # Example filename: jvpp-registry-17.01-20161206.125556-1.jar + # ArtifactId = jvpp-registry + # Version = 17.01 + basefile=$(basename -s .jar "$item") + artifactId=$(echo "$basefile" | cut -d '-' -f 1-2) + version=$(echo "$basefile" | cut -d '-' -f 3) + mvn install:install-file -Dfile=${item} -DgroupId=io.fd.vpp -DartifactId=${artifactId} -Dversion=${version} -Dpackaging=jar -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r +done + +cd ${current_dir} diff --git a/jjb/hc2vpp/include-raw-hc2vpp-pkg-push.sh b/jjb/hc2vpp/include-raw-hc2vpp-pkg-push.sh index db10e19dc..d4c2be38f 100644 --- a/jjb/hc2vpp/include-raw-hc2vpp-pkg-push.sh +++ b/jjb/hc2vpp/include-raw-hc2vpp-pkg-push.sh @@ -1,4 +1,25 @@ #!/bin/bash +set -x + +# determine VPP Java API version used in maven build +if [ "${OS}" == "centos7" ]; then + VERSION=`yum list installed vpp-api-java | grep vpp-api-java | awk '{ printf $2; }'` + # write a file that will echo VPP dependencies + echo -n 'echo' > vpp_dependencies + echo " \"vpp = ${VERSION}, vpp-plugins = ${VERSION}\"" >> vpp_dependencies + chmod +x vpp_dependencies + # overwrite default dependencies file + mv vpp_dependencies packaging/rpm/ +else + VERSION=`apt list --installed | grep vpp-api-java | awk '{ printf $2; }'` + # write a file that will echo VPP dependencies + echo -n 'echo' > vpp_dependencies + echo " \"vpp (= ${VERSION}), vpp-plugins (= ${VERSION})\"" >> vpp_dependencies + chmod +x vpp_dependencies + # overwrite default dependencies file + mv vpp_dependencies packaging/deb/common/ +fi + if [ "${OS}" == "centos7" ]; then # Build the rpms @@ -8,6 +29,7 @@ if [ "${OS}" == "centos7" ]; then RPMS=$(find . -type f -iname '*.rpm') SRPMS=$(find . -type f -iname '*.srpm') SRCRPMS=$(find . -type f -name '*.src.rpm') + # publish hc2vpp packages for i in $RPMS $SRPMS $SRCRPMS do push_rpm "$i" @@ -19,6 +41,7 @@ elif [ "${OS}" == "ubuntu1404" ]; then # Find the files DEBS=$(find . -type f -iname '*.deb') + # publish hc2vpp packages for i in $DEBS do push_deb "$i" @@ -30,6 +53,7 @@ elif [ "${OS}" == "ubuntu1604" ]; then # Find the files DEBS=$(find . -type f -iname '*.deb') + # publish hc2vpp packages for i in $DEBS do push_deb "$i" |