-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 Cisco and/or its affiliates.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
local run_make_test
local old_pwd
local test_desc
+ local grep_results
+ local result
+ local fail
+ local i
+ local line
local is_feature="false"
local retry_count=100
local tester=${GERRIT_USER:-$USER}
local jobs="auto"
if [ -z "$WS_ROOT" ] ; then
- echo "ERROR: WS_ROOT is not set!"
- return
+ if [ -d "./extras/bash" ] ; then
+ export WS_ROOT="$(pwd)"
+ else
+ echo "ERROR: WS_ROOT is not set!"
+ return
+ fi
elif [ ! -d "$WS_ROOT/src/vppinfra" ] ; then
echo "ERROR: WS_ROOT is not set to a VPP workspace!"
return
fi
}
-# bash function to set up jenkins sandbox environment
-#
-# See LF Sandbox documentation:
-# https://docs.releng.linuxfoundation.org/en/latest/jenkins-sandbox.html
-#
-# Prerequisites:
-# 1. Create jenkins sandbox token and add it to your local jenkins.ini file
-# Either specify the location of the init file in $JENKINS_INI or
-# JENKINS_INI will be initialized to either
-# ~/.config/jenkins_jobs/jenkins.ini
-# $WS_ROOT/jenkins.ini
-# 2. Clone ci-management workspace from gerrit.fd.io
-# 3. export WS_ROOT=<local ci-management workspace>
-jjb-sandbox-env()
+# bash function to set up VPP workspace with quicly source code
+set-quicly-ws ()
{
- if [ -z "$WS_ROOT" ] ; then
- echo "ERROR: WS_ROOT is not set!"
- return
- elif [ ! -d "$WS_ROOT/jjb" ] ; then
- echo "ERROR: WS_ROOT is not set to a ci-management workspace!"
- return
- fi
-
- if [ -n "$(declare -f deactivate)" ]; then
- echo "Deactivating Python Virtualenv!"
- deactivate
- fi
-
- if [ -z "$JENKINS_INI" ] ; then
- local user_jenkins_ini="/home/$USER/.config/jenkins_jobs/jenkins.ini"
- if [ -f "$user_jenkins_ini" ] ; then
- export JENKINS_INI=$user_jenkins_ini
- elif [ -f "$WS_ROOT/jenkins.ini" ] ; then
- export JENKINS_INI="$WS_ROOT/jenkins.ini"
- else
- echo "ERROR: Unable to find 'jenkins.ini'!"
- return
- fi
- echo "Exporting JENKINS_INI=$JENKINS_INI"
- elif [ ! -f "$JENKINS_INI" ] ; then
- echo "ERROR: file specified in JENKINS_INI ($JENKINS_INI) not found!"
+ local ext_quicly_version_file="/opt/vpp/external/x86_64/include/quicly/version.h"
+ if [ ! -f "$ext_quicly_version_file" ] ; then
+ echo -e "\nCannot find quicly version file: $ext_quicly_version_file"
+ echo -e "\nPlease run VPP 'make install-ext-deps' to install it."
return
fi
- if [ -n "$(declare -f deactivate)" ]; then
- echo "Deactivating Python Virtualenv!"
- deactivate
- fi
- cd $WS_ROOT
- git submodule update --init --recursive
-
- local VENV_DIR=$WS_ROOT/venv
- rm -rf $VENV_DIR \
- && python3 -m venv $VENV_DIR \
- && source $VENV_DIR/bin/activate \
- && pip3 install wheel \
- && pip3 install jenkins-job-builder==3.5.0
-
- alias jjsb='jenkins-jobs --conf $JENKINS_INI'
- function jjsb-test() {
- if [ -z "$(which jenkins-jobs 2>&1)" ] ; then
- echo "jenkins-jobs not found! Run jjb-sandbox-env to activate."
- return
- fi
- if [ -z "$1" ] ; then
- echo "Usage: $FUNCNAME <jenkins-job-name>"
- return
- fi
- which jenkins-jobs \
- && jenkins-jobs --conf $JENKINS_INI test $WS_ROOT/jjb $@
- }
- function jjsb-update() {
- if [ -z "$(which jenkins-jobs 2>&1)" ] ; then
- echo "jenkins-jobs not found! Run jjb-sandbox-env to activate."
- return
- fi
- if [ -z "$1" ] ; then
- echo "Usage: $FUNCNAME <jenkins-job-name>"
+ if [ -d "$1" ]; then
+ if [ -z "$WS_ROOT" ] ; then
+ if [ -d "./extras/bash" ] ; then
+ export WS_ROOT="$(pwd)"
+ else
+ echo "ERROR: WS_ROOT is not set!"
+ return
+ fi
+ elif [ ! -d "$WS_ROOT/extras/bash" ] ; then
+ echo "ERROR: WS_ROOT is not set to a VPP workspace!"
return
fi
- which jenkins-jobs \
- && jenkins-jobs --conf $JENKINS_INI update $WS_ROOT/jjb $@
- }
- jenkins-jobs --version
+ export WS_QUICLY="$1"
+ export QUICLY_LIBRARY="$WS_QUICLY/libquicly.a"
+ export QUICLY_INCLUDE_DIR="$WS_QUICLY/include"
+ export WS_PICOTLS="$WS_QUICLY/deps/picotls"
+ export PICOTLS_INCLUDE_DIR="$WS_PICOTLS/include"
+ export PICOTLS_CORE_LIBRARY="$WS_PICOTLS/libpicotls-core.a"
+ export PICOTLS_OPENSSL_LIBRARY="$WS_PICOTLS/libpicotls-openssl.a"
+ export VPP_EXTRA_CMAKE_ARGS="-DQUICLY_LIBRARY=$QUICLY_LIBRARY -DQUICLY_INCLUDE_DIR=$QUICLY_INCLUDE_DIR -DPICOTLS_CORE_LIBRARY=$PICOTLS_CORE_LIBRARY -DPICOTLS_OPENSSL_LIBRARY=$PICOTLS_OPENSSL_LIBRARY -DPICOTLS_INCLUDE_DIR=$PICOTLS_INCLUDE_DIR"
+ local quicly_ws_version_file="$QUICLY_INCLUDE_DIR/quicly/version.h"
+ cp -f $ext_quicly_version_file $quicly_ws_version_file
+ local expected_quicly_version="$(grep 'set(EXPECTED_QUICLY_VERSION' $WS_ROOT/src/plugins/quic/CMakeLists.txt | cut -d'"' -f2)"
+ sed -ie "s/LIBQUICLY_VERSION \".*\"/LIBQUICLY_VERSION \"$expected_quicly_version\"/" $quicly_ws_version_file
+ else
+ echo -e "\nUsage: set-quicly-ws <path-to-quicly>"
+ echo -e "\nPrerequisites:"
+ echo -e "\n1. Clone quicly repo:\n git clone https://github.com/h2o/quicly"
+ echo -e "\n2. Build quicly and picotls following instructions in:"
+ echo " .../quicly/README.md"
+ echo " .../quicly/deps/picotls/README.md"
+ echo -e "\n3. Run set-quicly-ws <path-to-quicly>"
+ echo -e "\n4. Build vpp as desired\n"
+ fi;
}