Skip to content

Commit

Permalink
scenario cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
fmirus committed Oct 10, 2024
1 parent 92f7368 commit 4879ede
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import osc.helpers
scenario test_docker_copy:
timeout(25s)
do parallel:
docker_run(image: 'ubuntu', command: 'sleep 20', detach: true, container_name: 'sleeping_beauty', remove: true, volumes: ['/srv/nfs4/:/data'])
docker_run(image: 'ubuntu', command: 'sleep 20', detach: true, container_name: 'sleeping_beauty', remove: true)
serial:
docker_exec(container: 'sleeping_beauty', command: 'mkdir -p /tmp/test_dir/')
docker_exec(container: 'sleeping_beauty', command: 'touch /tmp/test_dir/test.txt')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ import osc.helpers
scenario test_docker_exec:
timeout(15s)
do parallel:
docker_run(image: 'ubuntu', command: 'sleep 10', detach: true, container_name: 'sleeping_beauty', remove: true, volumes: ['/srv/nfs4/:/data'])
docker_run(image: 'ubuntu', command: 'sleep 10', detach: true, container_name: 'sleeping_beauty', remove: true)
serial:
docker_exec(container: 'sleeping_beauty', command: 'echo hello world')
docker_exec(container: 'sleeping_beauty', command: 'ls /data')
emit end
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import osc.helpers
scenario test_docker_put:
timeout(25s)
do parallel:
docker_run(image: 'ubuntu', command: 'sleep 20', detach: true, container_name: 'sleeping_beauty', remove: true, volumes: ['/srv/nfs4/:/data'])
docker_run(image: 'ubuntu', command: 'sleep 20', detach: true, container_name: 'sleeping_beauty', remove: true)
serial:
docker_put(container: 'sleeping_beauty', source_path: '/tmp/test_dir/', target_path: '/tmp/')
docker_exec(container: 'sleeping_beauty', command: 'ls /tmp/ | grep test_dir')
Expand Down
4 changes: 2 additions & 2 deletions libs/scenario_execution_docker/scenarios/test_docker_run.osc
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ import osc.helpers
scenario test_docker_run:
timeout(15s)
do serial:
docker_run(image: 'ubuntu', command: 'sleep 5', detach: true, remove: true, container_name: 'sleeping_beauty', volumes: ['/srv/nfs4/:/data'])
docker_run(image: 'ubuntu', command: 'echo hello world', volumes: ['/srv/nfs4/:/data'])
docker_run(image: 'ubuntu', command: 'sleep 5', detach: true, remove: true, container_name: 'sleeping_beauty')
docker_run(image: 'ubuntu', command: 'echo hello world')
emit end

0 comments on commit 4879ede

Please sign in to comment.