update shadow and install tshark

This commit is contained in:
trinity-1686a 2022-11-30 18:38:42 +01:00
parent f122b4b1ee
commit 1b7e29b33d
1 changed files with 5 additions and 1 deletions

View File

@ -199,7 +199,7 @@ integration-shadow:
variables: variables:
JOB_SHADOW_REPO: "https://github.com/shadow/shadow.git" JOB_SHADOW_REPO: "https://github.com/shadow/shadow.git"
JOB_SHADOW_BRANCH: "main" JOB_SHADOW_BRANCH: "main"
JOB_SHADOW_COMMIT: "v2.2.0" JOB_SHADOW_COMMIT: "v2.3.0"
JOB_TGEN_REPO: "https://github.com/shadow/tgen.git" JOB_TGEN_REPO: "https://github.com/shadow/tgen.git"
JOB_TGEN_BRANCH: "main" JOB_TGEN_BRANCH: "main"
@ -215,6 +215,7 @@ integration-shadow:
image: debian:11-slim image: debian:11-slim
script: script:
- ./maint/preserve -u - ./maint/preserve -u
- echo -e "\e[0Ksection_start:`date +%s`:shadow_install_deps[collapsed=true]\r\e[0KInstalling shadow and tgen"
# We're going to install binaries to $HOME/.local/bin # We're going to install binaries to $HOME/.local/bin
- 'export PATH=$HOME/.local/bin:$PATH' - 'export PATH=$HOME/.local/bin:$PATH'
@ -268,6 +269,9 @@ integration-shadow:
# Ensure newly installed executables can be found # Ensure newly installed executables can be found
- hash -r - hash -r
- DEBIAN_FRONTEND=noninteractive apt-get install -y tshark
- echo -e "\e[0Ksection_end:`date +%s`:shadow_install_deps\r\e[0K"
# Run tests # Run tests
- pushd tests/shadow - pushd tests/shadow
- ./run.sh - ./run.sh