Merge "Remove unavailable packages"

diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml
index 34c6cab..ee6a65f 100644 (file)
--- a/jjb/csit/csit.yaml
+++ b/jjb/csit/csit.yaml
@@ -268,6 +268,36 @@
           always: true
           failure: false
 
+      - email-ext:
+          # yamllint disable-line rule:line-length
+          recipients: 'tifrank@cisco.com, csit-report+int+616+181919729795594561@lists.fd.io'
+          reply-to: ''
+          content-type: 'text'
+          subject: 'Regressions as of  $BUILD_TIMESTAMP'
+          # yamllint disable-line rule:line-length
+          body: |
+                Following regressions occured in the last trending job runs, listed per testbed type.
+
+                ${{FILE,path="build-root/docs/deploy-site/src/site/resources/trending/_static/vpp/trending-regressions.txt"}}
+
+          always: true
+          failure: false
+
+      - email-ext:
+          # yamllint disable-line rule:line-length
+          recipients: 'tifrank@cisco.com, csit-report+int+616+181919729795594561@lists.fd.io'
+          reply-to: ''
+          content-type: 'text'
+          subject: 'Progressions as of  $BUILD_TIMESTAMP'
+          # yamllint disable-line rule:line-length
+          body: |
+                Following progressions occured in the last trending job runs, listed per testbed type.
+
+                ${{FILE,path="build-root/docs/deploy-site/src/site/resources/trending/_static/vpp/trending-progressions.txt"}}
+
+          always: true
+          failure: false
+
       - fdio-infra-shiplogs:
           maven-version: 'mvn33-new'
 

diff --git a/jjb/csit/include-raw-csit-cpta.sh b/jjb/csit/include-raw-csit-cpta.sh
index 8225745..acb8df0 100644 (file)
--- a/jjb/csit/include-raw-csit-cpta.sh
+++ b/jjb/csit/include-raw-csit-cpta.sh
@@ -6,18 +6,21 @@ set -xe -o pipefail
 [ "${PROJECT_PATH}" ] || PROJECT_PATH="io/fd/csit"
 [ "${DOC_DIR}" ] || DOC_DIR="resources/tools/presentation"
 [ "${BUILD_DIR}" ] || BUILD_DIR="${DOC_DIR}/_build"
-[ "${SECONDARY_BUILD_DIR}" ] || SECONDARY_BUILD_DIR="${DOC_DIR}_new/_build"
 [ "${SITE_DIR}" ] || SITE_DIR="build-root/docs/deploy-site"
 [ "${RESOURCES_DIR}" ] || RESOURCES_DIR="${SITE_DIR}/src/site/resources/trending"
 [ "${STATIC_VPP_DIR}" ] || STATIC_VPP_DIR="${RESOURCES_DIR}/_static/vpp"
 [ "${MVN}" ] || MVN="/opt/apache/maven/bin/mvn"
 [ "${FAILED_TESTS}" ] || FAILED_TESTS="${STATIC_VPP_DIR}/trending-failed-tests.txt"
+[ "${REGRESSIONS}" ] || REGRESSIONS="${STATIC_VPP_DIR}/trending-regressions.txt"
+[ "${PROGRESSIONS}" ] || PROGRESSIONS="${STATIC_VPP_DIR}/trending-progressions.txt"
 
 # Create a text file with email body in case the build fails:
 cd "${WORKSPACE}"
 mkdir -p "${STATIC_VPP_DIR}"
 EMAIL_BODY="ERROR: The build number ${BUILD_NUMBER} of the job ${JOB_NAME} failed. For more information see: ${BUILD_URL}"
 echo "${EMAIL_BODY}" > "${FAILED_TESTS}"
+echo "${EMAIL_BODY}" > "${REGRESSIONS}"
+echo "${EMAIL_BODY}" > "${PROGRESSIONS}"
 
 cd "${DOC_DIR}"
 chmod +x ./run_cpta.sh

diff --git a/jjb/vpp/include-raw-vpp-arm-build-no-test.sh b/jjb/vpp/include-raw-vpp-arm-build-no-test.sh
index 8557dc1..94cc824 100644 (file)
--- a/jjb/vpp/include-raw-vpp-arm-build-no-test.sh
+++ b/jjb/vpp/include-raw-vpp-arm-build-no-test.sh
@@ -39,9 +39,9 @@ echo "CC=${CC}"
 
 make UNATTENDED=yes install-dep
 make UNATTENDED=yes dpdk-install-dev
-make UNATTENDED=yes -C build-root TAG=vpp wipe-all install-packages
-make UNATTENDED=yes -C build-root TAG=vpp sample-plugin-install
-make UNATTENDED=yes -C build-root TAG=vpp libmemif-install
+make UNATTENDED=yes -C build-root PLATFORM=vpp TAG=vpp wipe-all install-packages
+make UNATTENDED=yes -C build-root PLATFORM=vpp TAG=vpp sample-plugin-install
+make UNATTENDED=yes -C build-root PLATFORM=vpp TAG=vpp libmemif-install
 make UNATTENDED=yes pkg-deb
 
 if [ "x${VPP_REPO}" == "x1" ]; then

diff --git a/jjb/vpp/include-raw-vpp-clang-build.sh b/jjb/vpp/include-raw-vpp-clang-build.sh
index f1c1422..b1bed41 100644 (file)
--- a/jjb/vpp/include-raw-vpp-clang-build.sh
+++ b/jjb/vpp/include-raw-vpp-clang-build.sh
@@ -30,9 +30,9 @@ sha1sum $0
 
 make UNATTENDED=yes install-dep
 make UNATTENDED=yes install-ext-deps
-make UNATTENDED=yes -C build-root TAG=vpp_clang CC=clang CXX=clang install-packages
-make UNATTENDED=yes -C build-root TAG=vpp_clang CC=clang CXX=clang sample-plugin-install
-make UNATTENDED=yes -C build-root TAG=vpp_clang CC=clang CXX=clang libmemif-install
+make UNATTENDED=yes -C build-root PLATFORM=vpp TAG=vpp_clang CC=clang CXX=clang install-packages
+make UNATTENDED=yes -C build-root PLATFORM=vpp TAG=vpp_clang CC=clang CXX=clang sample-plugin-install
+make UNATTENDED=yes -C build-root PLATFORM=vpp TAG=vpp_clang CC=clang CXX=clang libmemif-install
 
 
 echo "*******************************************************************"