diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/csit/csit-perf.yaml | 13 | ||||
| -rw-r--r-- | jjb/hicn/hicn.yaml | 2 | ||||
| -rwxr-xr-x | jjb/scripts/post_build_deploy_archives.sh | 4 | ||||
| -rwxr-xr-x | jjb/scripts/post_build_executor_info.sh | 13 | ||||
| -rwxr-xr-x | jjb/scripts/setup_executor_env.sh | 12 |
5 files changed, 41 insertions, 3 deletions
diff --git a/jjb/csit/csit-perf.yaml b/jjb/csit/csit-perf.yaml index cdad425b5..e2f91637d 100644 --- a/jjb/csit/csit-perf.yaml +++ b/jjb/csit/csit-perf.yaml @@ -82,6 +82,9 @@ - 1n-aws: os: 'ubuntu2204' executor-arch: 'x86_64' + - 2n-icx: + os: 'ubuntu2204' + executor-arch: 'x86_64' - 'csit-vpp-perf-verify-{stream}-{node-arch}': node-arch: - 2n-icx: @@ -188,6 +191,10 @@ os: 'ubuntu2204' executor-arch: 'x86_64' periodicity: '0 0 * * 6' + - 2n-icx: + os: 'ubuntu2204' + executor-arch: 'x86_64' + periodicity: '0 0 * * 6' - 'csit-vpp-perf-ndrpdr-weekly-master-{node-arch}': node-arch: - 2n-icx: @@ -281,6 +288,9 @@ - 1n-aws: os: 'ubuntu2204' executor-arch: 'x86_64' + - 2n-icx: + os: 'ubuntu2204' + executor-arch: 'x86_64' - 'csit-vpp-perf-report-coverage-{stream_report}-{node-arch}': node-arch: - 2n-icx: @@ -362,6 +372,9 @@ - 1n-aws: os: 'ubuntu2204' executor-arch: 'x86_64' + - 2n-icx: + os: 'ubuntu2204' + executor-arch: 'x86_64' project: 'csit' branch: 'master' diff --git a/jjb/hicn/hicn.yaml b/jjb/hicn/hicn.yaml index 135ee6a05..ab41a8a34 100644 --- a/jjb/hicn/hicn.yaml +++ b/jjb/hicn/hicn.yaml @@ -318,7 +318,7 @@ name: "hicn-verify-functest-{stream}-{os}-{executor-arch}" project-type: freestyle - node: "centos7-docker-4c-4g" + node: "ubuntu2004-docker-4c-4g" concurrent: true properties: diff --git a/jjb/scripts/post_build_deploy_archives.sh b/jjb/scripts/post_build_deploy_archives.sh index 02a56f130..a332f21e5 100755 --- a/jjb/scripts/post_build_deploy_archives.sh +++ b/jjb/scripts/post_build_deploy_archives.sh @@ -19,6 +19,10 @@ set +e # Do not affect the build result if some part of archiving fails. WS_ARCHIVES_DIR="$WORKSPACE/archives" BUILD_ENV_LOG="$WS_ARCHIVES_DIR/_build-enviroment-variables.log" +if curl --output robot-plugin.zip "$BUILD_URL/robot/report/*zip*/robot-plugin.zip"; then + unzip -d ./archives robot-plugin.zip +fi + # Generate gdb-command script to output vpp stack traceback from core files. gdb_cmdfile="/tmp/gdb-commands" cat >$gdb_cmdfile <<'__END__' diff --git a/jjb/scripts/post_build_executor_info.sh b/jjb/scripts/post_build_executor_info.sh index f98666676..d81b613ed 100755 --- a/jjb/scripts/post_build_executor_info.sh +++ b/jjb/scripts/post_build_executor_info.sh @@ -21,13 +21,24 @@ long_line="********************************************************************* OS_ID=$(grep '^ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g') OS_VERSION_ID=$(grep '^VERSION_ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g') OS_ARCH=$(uname -m) + +# Requires all nomad client machines to run the following command +# and mount /scratch/nomad into the docker container: +# sudo mkdir -p /scratch/nomad && echo "$(hostname)-$(uname -m)" | sudo tee /scratch/nomad/nomad-client +nomad_client_file="/scratch/nomad/nomad-client" +if [ -f "$nomad_client_file" ] ; then + NOMAD_CLIENT="$(cat $nomad_client_file)" +else + NOMAD_CLIENT="Unknown" +fi + echo "$long_line" echo "Executor Runtime Attributes:" echo "OS: $OS_ID-$OS_VERSION_ID" echo " $(uname -a)" echo "Number CPUs: $(nproc)" echo "Arch: $OS_ARCH" -echo "Nomad Hostname: $(grep search /etc/resolv.conf | cut -d' ' -f2 | head -1)" +echo "Nomad Client Hostname: $NOMAD_CLIENT" echo "Container ID: $(hostname)" echo "$long_line" echo -e "lscpu:\n$(lscpu)" diff --git a/jjb/scripts/setup_executor_env.sh b/jjb/scripts/setup_executor_env.sh index 4d3cb6ecf..727824909 100755 --- a/jjb/scripts/setup_executor_env.sh +++ b/jjb/scripts/setup_executor_env.sh @@ -25,12 +25,22 @@ file_delimiter="----- %< -----" long_line="************************************************************************" downloads_cache="/root/Downloads" +# Requires all nomad client machines to run the following command +# and mount /scratch/nomad into the docker container: +# sudo mkdir -p /scratch/nomad && echo "$(hostname)-$(uname -m)" | sudo tee /scratch/nomad/nomad-client +nomad_client_file="/scratch/nomad/nomad-client" +if [ -f "$nomad_client_file" ] ; then + NOMAD_CLIENT="$(cat $nomad_client_file)" +else + NOMAD_CLIENT="Unknown" +fi + # Node info echo "$long_line" echo "Executor Runtime Attributes:" echo "OS: $OS_ID-$OS_VERSION_ID" echo "Arch: $OS_ARCH" -echo "Nomad Hostname: $(grep search /etc/resolv.conf | cut -d' ' -f2 | head -1)" +echo "Nomad Client Hostname: $NOMAD_CLIENT" echo "Container ID: $(hostname)" echo "$long_line" |