- also clean up stale TODO's
Change-Id: I7106bcf8566560c3f85767afac1405d4a7c8d25a
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
2. Edit jjb/vpp/vpp.yam (or other project yaml file) and replace '-prod-' with '-sandbox-' for all of the docker image
2. Edit jjb/vpp/vpp.yam (or other project yaml file) and replace '-prod-' with '-sandbox-' for all of the docker image
-3. `jjb-sandbox-env` # This bash function currently lives in ../vpp/extras/bash/functions.sh
- - TODO: move it to ci-management repo.
4. For each job using one of the docker images:
4. For each job using one of the docker images:
Jenkins-Nomad Label.
- sandbox-aarch64: Tag used to select the aarch64 sandbox image by the
associated Jenkins-Nomad Label.
Jenkins-Nomad Label.
- sandbox-aarch64: Tag used to select the aarch64 sandbox image by the
associated Jenkins-Nomad Label.
# Install/cache python packages
make_vpp_test "test-dep" "$branch"
if [ "$OS_ID" = "ubuntu" ] ; then
# Install/cache python packages
make_vpp_test "test-dep" "$branch"
if [ "$OS_ID" = "ubuntu" ] ; then
- # TODO: Remove make test-doc after VPP 21.06 and 21.10 are no longer supported
- # which is deprecated in master (VPP 22.02)
- make_vpp_test "doc" "$branch"
make_vpp test-wipe "$branch"
fi
# Clean up virtual environment
make_vpp test-wipe "$branch"
fi
# Clean up virtual environment
-# TODO: Investigate if sourcing /etc/os-release and using env vars from it
-# works across all OS variants. If so, clean up copy-pasta...
-# Alternatively use facter as does LF Releng scripts.
export OS_ID="$(grep '^ID=' /etc/os-release | cut -d= -f2 | sed -e 's/\"//g')"
export OS_VERSION_ID="$(grep '^VERSION_ID=' /etc/os-release | cut -d= -f2 | sed -e 's/\"//g')"
export OS_CODENAME="$(grep 'VERSION_CODENAME=' /etc/os-release | cut -d= -f2)"
export OS_ID="$(grep '^ID=' /etc/os-release | cut -d= -f2 | sed -e 's/\"//g')"
export OS_VERSION_ID="$(grep '^VERSION_ID=' /etc/os-release | cut -d= -f2 | sed -e 's/\"//g')"
export OS_CODENAME="$(grep 'VERSION_CODENAME=' /etc/os-release | cut -d= -f2)"
# to create an enumerated set of jobs jobs that match the
# definitions here.
declare -A VPP_BRANCHES
# to create an enumerated set of jobs jobs that match the
# definitions here.
declare -A VPP_BRANCHES
-VPP_BRANCHES["debian-11"]="stable/2302 stable/2306 master"
-VPP_BRANCHES["ubuntu-20.04"]="stable/2302 stable/2306 master"
-VPP_BRANCHES["ubuntu-22.04"]="stable/2302 stable/2306 master"
+VPP_BRANCHES["debian-11"]="stable/2302 stable/2306 stable/2310 master"
+VPP_BRANCHES["ubuntu-20.04"]="stable/2302 stable/2306 stable/2310 master"
+VPP_BRANCHES["ubuntu-22.04"]="stable/2302 stable/2306 stable/2310 master"
verify_image_version_date_format() {
version="$1"
verify_image_version_date_format() {
version="$1"
- # TODO: Remove regex1 when legacy nomenclature is no longer on docker hub.
- local regex1="^[0-9]{4}_[0-1][0-9]_[0-3][0-9]_[0-2][0-9][0-5][0-9][0-5][0-9]$"
- local regex2="^[0-9]{4}_[0-1][0-9]_[0-3][0-9]_[0-2][0-9][0-5][0-9][0-5][0-9]_UTC$"
- if [[ "$version" =~ $regex1 ]] || [[ "$version" =~ $regex2 ]]; then
+ local ver_regex="^[0-9]{4}_[0-1][0-9]_[0-3][0-9]_[0-2][0-9][0-5][0-9][0-5][0-9]_UTC$"
+ if [[ "$version" =~ $ver_regex ]]; then