osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/38346?usp=email ) Change subject: jobs/ttcn3-testsuites-testenv: move ggsn testuite ...................................................................... jobs/ttcn3-testsuites-testenv: move ggsn testuite Run the GGSN testsuite in all combinations (osmo-ggsn, osmo-ggsn with various kernels and kernel gtp-u, open5gs) with testenv. Depends: osmo-ttcn3-hacks I3f9db4325d5928c809cc99bc82d9cb82bf9e71eb Change-Id: I5b70944bd1fa9c90c5ad51b9026fdcd969bfc8a8 --- M jobs/ttcn3-testsuites-testenv.yml M jobs/ttcn3-testsuites.yml 2 files changed, 67 insertions(+), 105 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/46/38346/1 diff --git a/jobs/ttcn3-testsuites-testenv.yml b/jobs/ttcn3-testsuites-testenv.yml index b5180f1..77237d9 100644 --- a/jobs/ttcn3-testsuites-testenv.yml +++ b/jobs/ttcn3-testsuites-testenv.yml @@ -10,8 +10,11 @@ See <a href="https://osmocom.org/projects/cellular-infrastructure/wiki/Titan_TTCN3_Testsuites"> TTCN3 Testsuite</a> for more information.<br> <br> - Arguments: <code>{args}</code> + Arguments: <code>{args}</code><br> + <br> + Kernel: <code>{kernel}</code><br> timer: "@midnight" + kernel: "" node: ttcn3 jobs: - "{job-name}" @@ -93,6 +96,34 @@ args: -b osmocom:nightly timer: H 07 * * * + - ttcn3-ggsn-test: + testsuite: ggsn + args: -b osmocom:nightly -c 'osmo_ggsn_*' + timer: H 07 * * * + + - ttcn3-ggsn-test-kernel: + testsuite: ggsn + args: -b osmocom:nightly -c 'osmo_ggsn_v*_only' --debian-kernel + timer: H 07 * * * + + - ttcn3-ggsn-test-kernel-net-next: + testsuite: ggsn + args: -b osmocom:nightly -c 'osmo_ggsn_v*_only' --custom-kernel + kernel: net-next + timer: H 07 * * * + + - ttcn3-ggsn-test-kernel-torvalds: + testsuite: ggsn + args: -b osmocom:nightly -c 'osmo_ggsn_v*_only' --custom-kernel + kernel: torvalds + timer: H 07 * * * + + - ttcn3-ggsn-test-ogs: + testsuite: ggsn + args: -b osmocom:nightly -c open5gs + timer: H 07 * * * + email: jenkins-notifications@lists.osmocom.org acetcom@gmail.com + # --------------------------------------------- # Debian latest # --------------------------------------------- @@ -148,6 +179,28 @@ timer: H 10 * * * disabled: true # disable until > 0.1.x release + - ttcn3-ggsn-test-latest: + testsuite: ggsn + args: -b osmocom:latest -c 'osmo_ggsn_*' + timer: H 10 * * * + + - ttcn3-ggsn-test-kernel-latest: + testsuite: ggsn + args: -b osmocom:latest -c 'osmo_ggsn_*' --kernel-debian + timer: H 10 * * * + + - ttcn3-ggsn-test-kernel-latest-net-next: + testsuite: ggsn + args: -b osmocom:latest -c 'osmo_ggsn_v*_only' --kernel-custom + kernel: net-next + timer: H 10 * * * + + - ttcn3-ggsn-test-kernel-latest-torvalds: + testsuite: ggsn + args: -b osmocom:latest -c 'osmo_ggsn_v*_only' --kernel-custom + kernel: torvalds + timer: H 10 * * * + # --------------------------------------------- # Debian nightly + io_uring (OS#6357) # --------------------------------------------- @@ -199,6 +252,11 @@ args: -b osmocom:nightly:asan -c generic timer: H 12 * * * + - ttcn3-ggsn-test-asan: + testsuite: ggsn + args: -b osmocom:nightly:asan -c 'osmo_ggsn_*' + timer: H 12 * * * + - job-template: name: '{job-name}' project-type: freestyle @@ -216,10 +274,15 @@ - shell: |- DISTRO="debian:bookworm" IMAGE="registry.osmocom.org/osmocom-build/"$(echo "$DISTRO" | tr : -)"-osmo-ttcn3-testenv" + KERNEL="{kernel}" podman pull "$IMAGE" - rm -rf logs _cache + rm -rf logs _cache .linux + + if [ -n "$KERNEL" ]; then + wget -q -O .linux "https://jenkins.osmocom.org/jenkins/job/build-kernel-$KERNEL/lastSuccessfulB..." + fi set +x # Don't output the color codes we set here export TESTENV_COLOR_DEBUG="$(printf '\e[0;94m')" # light blue @@ -229,6 +292,7 @@ export TESTENV_COLOR_CRITICAL="$(printf '\e[1;91m')" # bold, red export TESTENV_SOURCE_HIGHLIGHT_COLORS="esc" export TESTENV_NO_IMAGE_UP_TO_DATE_CHECK=1 + export TESTENV_NO_KVM=1 set -x ./testenv.py run \ @@ -241,7 +305,7 @@ # Free up space from downloaded apt packages, build artifacts etc. # The osmo-ttcn3-hacks deps dir and ccache are persistent. - rm -rf _cache + rm -rf _cache .linux scm: - git: diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index 98becb5..55eb9aa 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -26,57 +26,6 @@ timer: H 04 * * * - nplab-sua-test: timer: H 04 * * * - - ttcn3-ggsn-test: - timer: H 04 * * * - - ttcn3-ggsn-test-kernel: - timer: H 04 * * * - description: | - Test osmo-ggsn master with the Debian kernel. - - ttcn3-ggsn-test-kernel-net-next: - timer: H 04 * * * - # Cache the linux source tree in the workspace of one node - wipe_workspace: false - node: ttcn3-ggsn-test-kernel-git - description: | - Test osmo-ggsn master with the Linux kernel built from master of - <a href="https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git/"> - net-next.git</a>. - - ttcn3-ggsn-test-kernel-torvalds: - timer: H 04 * * * - # Cache the linux source tree in the workspace of one node - wipe_workspace: false - node: ttcn3-ggsn-test-kernel-git - description: | - Test osmo-ggsn master with the Linux kernel built from master of - <a href="https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/"> - torvalds/linux.git</a>. - - ttcn3-ggsn-test-kernel-latest: - timer: H 04 * * * - description: | - Test osmo-ggsn latest with the Debian kernel. - - ttcn3-ggsn-test-kernel-latest-net-next: - timer: H 04 * * * - # Cache the linux source tree in the workspace of one node - wipe_workspace: false - node: ttcn3-ggsn-test-kernel-git - description: | - Test osmo-ggsn latest with the Linux kernel built from master of - <a href="https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git/"> - net-next.git</a>. - - ttcn3-ggsn-test-kernel-latest-torvalds: - timer: H 04 * * * - # Cache the linux source tree in the workspace of one node - wipe_workspace: false - node: ttcn3-ggsn-test-kernel-git - description: | - Test osmo-ggsn latest with the Linux kernel built from master of - <a href="https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/"> - torvalds/linux.git</a>. - - ttcn3-ggsn-test-ogs: - timer: H 04 * * * - description: | - Test open5gs-smfd + open5gs-upfd main. - email: jenkins-notifications@lists.osmocom.org acetcom@gmail.com - ttcn3-pcu-test: timer: H 04 * * * - ttcn3-pcu-test-sns: @@ -136,8 +85,6 @@ timer: H 07 * * * - nplab-sua-test-latest: timer: H 08 * * * - - ttcn3-ggsn-test-latest: - timer: H 08 * * * - ttcn3-msc-test-latest: timer: H 08 * * * - ttcn3-pcu-test-latest: @@ -205,8 +152,6 @@ timer: H 12 * * * - ttcn3-gbproxy-test-asan: timer: H 12 * * * - - ttcn3-ggsn-test-asan: - timer: H 12 * * * - ttcn3-hnbgw-test-asan: timer: H 12 * * * - ttcn3-msc-test-asan: @@ -244,53 +189,6 @@ # Translate job name to docker-playground dir and relevant # environment variables case "{job-name}" in - ttcn3-ggsn-test-kernel) - DIR="ttcn3-ggsn-test" - export IMAGE_SUFFIX="master" - # Run against debian's kernel - export KERNEL_TEST=1 - ;; - ttcn3-ggsn-test-kernel-net-next) - DIR="ttcn3-ggsn-test" - export IMAGE_SUFFIX="master" - export KERNEL_TEST=1 - export KERNEL_BUILD=1 - export KERNEL_URL="https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git" - export KERNEL_REMOTE_NAME="net-next" - export KERNEL_BRANCH="main" - ;; - ttcn3-ggsn-test-kernel-torvalds) - DIR="ttcn3-ggsn-test" - export IMAGE_SUFFIX="master" - export KERNEL_TEST=1 - export KERNEL_BUILD=1 - export KERNEL_URL="https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git" - export KERNEL_REMOTE_NAME="torvalds" - export KERNEL_BRANCH="master" - ;; - ttcn3-ggsn-test-kernel-latest) - DIR="ttcn3-ggsn-test" - export IMAGE_SUFFIX="latest" - export KERNEL_TEST=1 - ;; - ttcn3-ggsn-test-kernel-latest-net-next) - DIR="ttcn3-ggsn-test" - export IMAGE_SUFFIX="latest" - export KERNEL_TEST=1 - export KERNEL_BUILD=1 - export KERNEL_URL="https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git" - export KERNEL_REMOTE_NAME="net-next" - export KERNEL_BRANCH="main" - ;; - ttcn3-ggsn-test-kernel-latest-torvalds) - DIR="ttcn3-ggsn-test" - export IMAGE_SUFFIX="latest" - export KERNEL_TEST=1 - export KERNEL_BUILD=1 - export KERNEL_URL="https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git" - export KERNEL_REMOTE_NAME="torvalds" - export KERNEL_BRANCH="master" - ;; TTCN3-centos7-*-latest) DIR="$(echo "{job-name}" | sed s/^TTCN3-centos7\-/ttcn3-/ | sed s/\-latest$//)" export IMAGE_SUFFIX="latest-centos7" -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/38346?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I5b70944bd1fa9c90c5ad51b9026fdcd969bfc8a8 Gerrit-Change-Number: 38346 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith@sysmocom.de>