Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump commons-collections from 3.2.1 to 3.2.2 in /samples/java-web/template/testman #115

Open
wants to merge 913 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
913 commits
Select commit Hold shift + click to select a range
0a69101
docker traces xp
assadOW2 Aug 22, 2019
5bc3ddf
new traces
assadOW2 Aug 26, 2019
c3019ad
output update
assadOW2 Aug 30, 2019
751d70e
tomcat version config test
assadOW2 Sep 2, 2019
7f17b4d
jdk implementation config
assadOW2 Sep 3, 2019
6475f7f
Re-run AE traces experiments with different profiler frequencies
mboussaa Sep 6, 2019
5beedff
Merge pull request #72 from STAMP-project/update-activeeon-results
brice-morin Sep 6, 2019
4aa2f6e
strace exp
assadOW2 Sep 9, 2019
603ae2d
strace demo.sh
assadOW2 Sep 9, 2019
6645d52
Add test plots
enriquegit Sep 9, 2019
86997a1
Modified position for .jtl file. Updated documentation accordingly
danzone Sep 11, 2019
d635b6e
Fixed typo
danzone Sep 11, 2019
8b4180a
Flamegraph exp
assadOW2 Sep 17, 2019
520760d
new changes on Dockerfiles. Apache image from base httpd and Postgres…
Sep 18, 2019
2476bca
Merge pull request #73 from fermenreq/master
Sep 18, 2019
5014200
Fix #74: Update the constraints that define how to stack components.
fchauvel Sep 23, 2019
9522bb1
Release v0.6.1
fchauvel Sep 23, 2019
dc7a30f
update on tellu
brice-morin Sep 24, 2019
dd33d1f
Merge branch 'master' of github.com:STAMP-project/camp
brice-morin Sep 24, 2019
9941973
Add ISSRE 2019 in the publication list
fchauvel Sep 25, 2019
161f424
Fix #75 Add missing constraint to rule out invalid stacks
fchauvel Sep 25, 2019
2f8b6f6
Release v0.6.2
fchauvel Sep 25, 2019
095c202
docker-compose works as apache proxy
Sep 25, 2019
7a4da97
Merge pull request #76 from fermenreq/master
Sep 25, 2019
791d666
update on ow2 traces
brice-morin Sep 25, 2019
754a28e
Merge branch 'master' of github.com:STAMP-project/camp
brice-morin Sep 25, 2019
c74b2de
Description of the new version of the CityGo case
fchauvel Sep 26, 2019
e5ef976
Merge branch 'master' of github.com:STAMP-project/camp
fchauvel Sep 26, 2019
d0faee6
dockerfiles path changed according camp.yml template
Sep 30, 2019
62ed9ac
Fix #78 about multi-stages Docker build
fchauvel Sep 30, 2019
03c0858
Introduce stack component recombination
fchauvel Sep 30, 2019
8af097a
Fix #79 about build_images.sh script
fchauvel Sep 30, 2019
61021b4
Make XWiki example consistent with the fix for Issue #78
fchauvel Sep 30, 2019
de519e5
Merge branch 'master' of github.com:STAMP-project/camp
fchauvel Sep 30, 2019
bb86759
Extend the "no output" timeout when running test
fchauvel Sep 30, 2019
b99abba
Release v0.6.3
fchauvel Sep 30, 2019
f676e47
Split the Atos case-study into performance and functional tests
fchauvel Sep 30, 2019
2460e36
Adjusting the Performance scenario as per Issue #81
fchauvel Oct 2, 2019
327afcf
Update citygo.md
brice-morin Oct 2, 2019
79ae93a
Updated Dockerfile for Citygo Django App
Oct 2, 2019
269668e
Fix Dockerfiles for the CityGo Performance scenario
fchauvel Oct 3, 2019
06d91d8
Merge branch 'master' of github.com:STAMP-project/camp
fchauvel Oct 3, 2019
b24e977
Add missing 'python-pip' package
fchauvel Oct 4, 2019
3b89744
It install pip package
Oct 4, 2019
959c366
Merge branch 'master' of https://github.com/STAMP-project/camp
Oct 4, 2019
0c6fc82
Install setup.py python module
Oct 4, 2019
5160dc8
Sketch of the "functional tests" scenario
fchauvel Oct 4, 2019
0c7ec03
Merge branch 'master' of github.com:STAMP-project/camp
fchauvel Oct 4, 2019
bf80e1b
Fix Dockerfiles for running CAMP
Oct 4, 2019
c6f4114
Merge branch 'master' of https://github.com/STAMP-project/camp
Oct 4, 2019
2970d30
Included requirements.txt file according Dockerfile descriptors
Oct 4, 2019
5c97f34
Update Dockerfile
Oct 4, 2019
e3b150b
Update ports for running within SUPERSEDE VM
Oct 5, 2019
0fcce1e
Update ports for VM machine
Oct 5, 2019
060eec3
Uptade ports
Oct 5, 2019
98aa936
Update Dockerfile
Oct 7, 2019
61f0008
Update Dockerfile
Oct 7, 2019
af9acd3
Update Dockerfile
Oct 7, 2019
c7456ef
Update Dockerfile
Oct 7, 2019
c978983
functional test
Oct 7, 2019
2ef0fa7
Merge branch 'master' of https://github.com/STAMP-project/camp
Oct 7, 2019
7d56bec
Update Dockerfile
Oct 7, 2019
2d9d538
Adding test for performance test scenario
Oct 7, 2019
4109d70
Relocated test according both scenarios (perfomance)
Oct 7, 2019
85b758a
update test calling
Oct 7, 2019
1388bea
Add the browser service
fchauvel Oct 7, 2019
5885dfc
Merge branch 'master' of github.com:STAMP-project/camp
fchauvel Oct 7, 2019
58818d1
update Dockerfile according test name
Oct 8, 2019
bd831f9
Merge branch 'master' of https://github.com/STAMP-project/camp
Oct 8, 2019
a81215b
Update dockerfiles from browser component
Oct 8, 2019
d591643
Update camp.yml
Oct 8, 2019
697d52a
Update camp.yml
Oct 8, 2019
65477f4
Update Dockerfiles images for running tests performance
Oct 8, 2019
1d15e57
It works with Blazemetter plugin for Performance tests
Oct 8, 2019
753b78c
Add CAMP plugin for Jenkins
Oct 8, 2019
0874849
fix dependencies
Oct 8, 2019
bbda639
Fix dockerfile dependency
Oct 8, 2019
04f95b4
Fix dockerfiles
Oct 8, 2019
7c18eac
Fix image dockerfile
Oct 8, 2019
c45e39f
Update path Dockerfile
Oct 8, 2019
03a4952
Update demo_site_1.conf
Oct 8, 2019
3eb08a9
Update Dockerfile
Oct 8, 2019
5ce565d
Update Dockerfile
Oct 8, 2019
ea20053
Update Dockerfile
Oct 8, 2019
b3d150e
Update Dockerfile
Oct 9, 2019
611bfee
Update Dockerfile
Oct 9, 2019
3c5fbeb
It works locally hope
Oct 9, 2019
0467269
hope it works
Oct 9, 2019
9854890
Update Dockerfile
Oct 9, 2019
f328cdc
Update Dockerfile
Oct 9, 2019
fe83aca
Update the OW2/Lutece case-study
fchauvel Oct 10, 2019
c5b74c1
Merge branch 'master' of github.com:STAMP-project/camp
fchauvel Oct 10, 2019
d88a0b9
updated template for postgres component
Oct 11, 2019
9961820
update ports --> 82
Oct 11, 2019
dba1c90
change port to -->8003
Oct 11, 2019
0370a1a
change port to -->82
Oct 11, 2019
980b7cf
Merge branch 'master' of https://github.com/STAMP-project/camp
Oct 11, 2019
6cd1d5b
update port to works in ARTIST
Oct 11, 2019
948a387
build process postgresql --> image instead dockerfile
Oct 11, 2019
1d9e151
Update the camp.yml as Postgress is now based on a Docker image
fchauvel Oct 11, 2019
26a338b
Remove obsolete README in the sample directory
fchauvel Oct 14, 2019
795e66c
Update docker-compose.yml
Oct 14, 2019
e74426f
Bump version of Apache Tomcat 9 to v9.0.27
fchauvel Oct 14, 2019
93ee436
Update Dockerfile
Oct 14, 2019
7c53ced
Bump version of Tomcat 8 to v8.5.47
fchauvel Oct 14, 2019
66d07c5
Use the 'archive.apache.org' repository that contains all versions
fchauvel Oct 14, 2019
9742bde
Update Dockerfile
Oct 15, 2019
4ff4996
Adding root as user to change permissions
Oct 15, 2019
8d028ab
update host --> localhost
Oct 15, 2019
a656be1
Update ports and Tests to --> 80 in all configurations related in Apa…
Oct 16, 2019
63c4083
Remove networks, update version docker-compose yaml , update host on …
Oct 17, 2019
5b875ce
Add variations of Tomcat versions 7, 8 and 9
fchauvel Oct 17, 2019
4f3836a
Merge branch 'master' of github.com:STAMP-project/camp
fchauvel Oct 17, 2019
4595f00
Update citygo.jmx
Oct 21, 2019
5d71f6f
Sharing apache logs to browser component
Oct 21, 2019
78c108a
Fix bzt
Oct 22, 2019
22c1bde
change path volumes
Oct 22, 2019
d5a7767
Update template tree for use case scenario 2
Oct 23, 2019
ada0f9c
Move Jenkinsfile according scenarios folder
Oct 23, 2019
55d5c58
Updated according templates
Oct 24, 2019
10db85a
Update Jenkinsfile
Oct 24, 2019
4ff3ae2
Update citygo.jmx
Oct 28, 2019
0428628
Update Jenkinsfile
Oct 29, 2019
4da42b3
Update Jenkinsfile
Oct 29, 2019
d628290
Fix #82 Remove Docker images when a configuration is tested
fchauvel Oct 29, 2019
628348f
Merge branch 'master' of github.com:STAMP-project/camp
fchauvel Oct 29, 2019
c74c9ec
Bump nokogiri from 1.8.5 to 1.10.4 in /docs
dependabot[bot] Oct 29, 2019
f6d42a5
Bump rubyzip from 1.2.2 to 2.0.0 in /docs
dependabot[bot] Oct 29, 2019
fae10ef
Release v0.6.4
fchauvel Oct 29, 2019
92225ac
Update Jenkinsfile
Oct 29, 2019
66993de
Update Jenkinsfile
Oct 29, 2019
45bfc05
'master' of github.com:STAMP-project/camp
fchauvel Oct 30, 2019
9f16d2d
Merge branch 'dependabot/bundler/docs/rubyzip-2.0.0'
fchauvel Oct 30, 2019
6861039
Merge branch 'master' of github.com:STAMP-project/camp
fchauvel Oct 30, 2019
56420c5
Merge branch 'master' into dependabot/bundler/docs/nokogiri-1.10.4
fchauvel Oct 30, 2019
0fd283a
Merge branch 'dependabot/bundler/docs/nokogiri-1.10.4'
fchauvel Oct 30, 2019
88cfe11
Update Jenkinsfile
Oct 30, 2019
dca60bd
Add '-i' option to specify which configurations should be executed
fchauvel Oct 30, 2019
2bbc8f5
Merge branch 'master' of github.com:STAMP-project/camp
fchauvel Oct 30, 2019
24ecacf
Release v0.7.0
fchauvel Oct 30, 2019
fa0c71a
Update Jenkinsfile
Oct 30, 2019
d29b128
Update camp.yml
Oct 30, 2019
1c797c7
Delete the Apache component
fchauvel Oct 30, 2019
384e215
Improving front page as per #66
fchauvel Oct 30, 2019
0638cf3
Update camp.yml
Oct 30, 2019
7d6c6da
updated camp.yml according performance & functional tests
Oct 30, 2019
d1fa9bd
Update requirements.txt
Oct 30, 2019
ef072a1
Update Dockerfile
Oct 30, 2019
66f7707
Do not fail when deleting a Docker image that does not exist
fchauvel Oct 31, 2019
dc32e2d
Merge branch 'master' of github.com:STAMP-project/camp
fchauvel Oct 31, 2019
51735d9
Fix broken test
fchauvel Oct 31, 2019
b298e76
Update docker-compose.yml
Oct 31, 2019
02b4162
Update docker-compose.yml
Oct 31, 2019
3c6407b
Update nginx.tmpl
Oct 31, 2019
bf7ae21
Update docker-compose.yml
Oct 31, 2019
421090d
Update camp.yml
Oct 31, 2019
e851fde
Fix flaky ordering of build command in the build_images.sh
fchauvel Oct 31, 2019
164fe08
Merge branch 'master' of github.com:STAMP-project/camp
fchauvel Oct 31, 2019
8146dee
Update docker-compose.yml
Oct 31, 2019
22440a2
Update citygo.jmx
A203336 Oct 31, 2019
c342057
Update citygo.jmx
A203336 Oct 31, 2019
53e2b30
Update citygo.jmx
A203336 Nov 1, 2019
812856e
Run acceptance test in parallel.
fchauvel Nov 1, 2019
9e570ac
Fix the persistence of coverage report
fchauvel Nov 1, 2019
1770dc2
Remove the "awesome" example
fchauvel Nov 1, 2019
745db63
Fix typos in Circle CI configuration
fchauvel Nov 1, 2019
d75ac4b
Fix aggregation of coverage reports
fchauvel Nov 1, 2019
f12509a
Fix typo
fchauvel Nov 1, 2019
089b59c
Fix machine kind for coverage reporting
fchauvel Nov 1, 2019
2de2a08
Fix typo
fchauvel Nov 1, 2019
6d7077d
Fix Version of Python
fchauvel Nov 1, 2019
f6c2453
Fix permissions
fchauvel Nov 1, 2019
e593a3c
Merge branch 'master' of github.com/fchauvel/camp
fchauvel Nov 1, 2019
32d160e
Reactivate acceptance tests for errors cases
fchauvel Nov 4, 2019
8dfeeca
Merge branch 'fchauvel-master'
fchauvel Nov 4, 2019
00ddb22
Update citygo.jmx
A203336 Nov 4, 2019
0788bd9
Update citygo.jmx
A203336 Nov 4, 2019
7782651
Update citygo.jmx
A203336 Nov 4, 2019
91c9406
Update docker-compose.yml
Nov 6, 2019
b75ca66
Update Dockerfile
Nov 6, 2019
4bc1ed1
Update camp.yml
Nov 6, 2019
33a1a56
Update Jenkinsfile
Nov 6, 2019
52e3bc5
Update python version --> python3
Nov 6, 2019
15ea0b2
Update Dockerfile
Nov 6, 2019
1eb3632
Upgrade Z3 to version 4.8.6
fchauvel Nov 6, 2019
8e9e1f0
Merge branch 'fchauvel-master'
fchauvel Nov 6, 2019
6ee94ee
Release v0.7.1
fchauvel Nov 6, 2019
035eefc
Merge branch 'master' of github.com:STAMP-project/camp
fchauvel Nov 6, 2019
5c52d82
Update requirements.txt
Nov 6, 2019
b1d0e52
K05 experimentations
assadOW2 Nov 6, 2019
a8ef6dd
Add Jetty as an alternative to Tomcat
fchauvel Nov 7, 2019
9b79f46
Update docker-compose.yml
Nov 7, 2019
a1ca9ff
Merge branch 'master' of 'github.com/STAMP-project/camp'
fchauvel Nov 7, 2019
6b3fbf6
Move 'samples/stamp' to 'https://github.com/STAMP-project/camp-sample…
fchauvel Nov 7, 2019
725abbc
Fix #98 Enable refering to resource of another component
fchauvel Nov 7, 2019
8391bd1
Remove obselete test cases
fchauvel Nov 7, 2019
8ce7b69
Release v0.7.2
fchauvel Nov 7, 2019
cd299eb
Add variations around Postgres, Mongo and the Requests Library
fchauvel Nov 8, 2019
176a7c0
Update Jenkinsfile
Nov 11, 2019
09bc13d
Update Jenkinsfile
Nov 12, 2019
a1a758b
Update camp.yml
Nov 13, 2019
074d62b
Update camp.yml
Nov 13, 2019
27fd692
Add support for liveness checks before to trigger the tests
fchauvel Nov 13, 2019
869d2da
Merge branch 'master' of github.com:STAMP-project/camp
fchauvel Nov 13, 2019
0ad7d62
Fix minor coding issues from Codacy
fchauvel Nov 13, 2019
191086a
Expose the liveness retry count and delay on the command line
fchauvel Nov 13, 2019
3551148
Document the liveness test settings
fchauvel Nov 13, 2019
795abed
Raise proper exception if the service is not ready
fchauvel Nov 13, 2019
0bbfda4
Update camp.yml
Nov 13, 2019
0593b9f
Release v0.8.0
fchauvel Nov 13, 2019
022fa87
Merge branch 'master' of github.com:STAMP-project/camp
fchauvel Nov 13, 2019
3feda67
Update camp.yml
Nov 14, 2019
ea688f4
Update camp.yml
Nov 14, 2019
d0f257e
Update camp.yml
Nov 14, 2019
0a4372d
Update camp.yml
Nov 14, 2019
f8b46c2
Update camp.yml
Nov 15, 2019
6d52887
Fetch docker logs before to shutdown the services (#99)
fchauvel Nov 15, 2019
2595a9d
Merge branch 'master' of github.com:STAMP-project/camp
fchauvel Nov 15, 2019
b3cfb31
Fix coding issues from Codacy
fchauvel Nov 18, 2019
277376d
Fix more minor coding issues from Codacy
fchauvel Nov 18, 2019
7e226f9
Update reportfiles
Nov 18, 2019
f8939fa
Expose the Docker logs destination on the command line (Issue #99)
fchauvel Nov 18, 2019
c2bcd80
Merge branch 'master' of github.com:STAMP-project/camp
fchauvel Nov 18, 2019
b05d768
Update Dockerfile
Nov 18, 2019
e84e8b5
Update Dockerfile
Nov 18, 2019
f1b0c6e
Fix even more minor coding issues from Codacy
fchauvel Nov 18, 2019
0dd824a
Merge branch 'master' of github.com:STAMP-project/camp
fchauvel Nov 18, 2019
bb4a0ef
Final fix of minor coding issues from Codacy
fchauvel Nov 18, 2019
3da5668
Release v0.9.0
fchauvel Nov 19, 2019
e409c42
Update the closing date of the beta testing campaign
fchauvel Nov 19, 2019
87de8cb
Refer to the user mailing list
fchauvel Nov 19, 2019
f85f098
Move the reference to the mailing list
fchauvel Nov 19, 2019
1104a85
Fix minor issue from Codacy
fchauvel Nov 19, 2019
93dbc09
Update docker-compose.yml
Nov 20, 2019
2ac7ca9
Update Dockerfile
Nov 20, 2019
af0a5c7
Update tests.py
Nov 21, 2019
0c54578
Update docker-compose.yml
Nov 21, 2019
627763a
Update tests.py
Nov 21, 2019
1524ff1
Update tests.py
Nov 21, 2019
4f6aaef
Update tests.py
Nov 21, 2019
ea1536b
Update tests.py
Nov 21, 2019
00a6500
Update tests.py
Nov 22, 2019
192f59c
Update Jenkinsfile
Nov 22, 2019
6843c4e
Update Jenkinsfile
Nov 22, 2019
263d487
Add link to the video demo
fchauvel Nov 30, 2019
87ca508
Merge branch 'master' of github.com:STAMP-project/camp
fchauvel Nov 30, 2019
7981e1b
Fix 100 Wrong link to the documentation
fchauvel Feb 4, 2020
e581366
Docs: Point to case-study moved in the `camp-samples` repository
Feb 4, 2020
cd6600e
Configure: Downgrade coverage to version 4.5.4
Feb 5, 2020
16da771
Bump commons-collections in /samples/java-web/template/testman
dependabot[bot] Jun 15, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fetch docker logs before to shutdown the services (#99)
fchauvel committed Nov 15, 2019

Verified

This commit was signed with the committer’s verified signature. The key has expired.
fchauvel Franck Chauvel
commit 6d52887ca77c89b15000ace6dd8b15294f400ed6
18 changes: 17 additions & 1 deletion camp/execute/engine.py
Original file line number Diff line number Diff line change
@@ -189,6 +189,10 @@ def collecting_reports_for(self, configuration):
pass


def collecting_logs_for(self, configuration):
pass


def on_reading_report(self, report):
pass

@@ -233,6 +237,9 @@ def execute(self, configurations):
test_results.append(results)

finally:
self._listener.collecting_logs_for(each_path)
self._collect_logs_for(each_path)

self._listener.stopping_services_for(each_path)
self._stop_services(each_path)

@@ -252,7 +259,6 @@ def _start_services(self, path):
_START_SERVICES = "docker-compose up -d"



def _run_tests(self, path):

if self._component.test_settings.include_liveness_test:
@@ -350,6 +356,16 @@ def _parse_test_reports(self, path):



def _collect_logs_for(self, path):
self._shell.execute(self.FETCH_LOG_FILE, path, allow_failure=True)


FETCH_LOG_FILE = ("sh -c 'docker-compose logs "
"--no-color "
"--timestamps "
" > docker_run.log'")


def _stop_services(self, path):
self._shell.execute(self._STOP_SERVICES, path)

6 changes: 5 additions & 1 deletion camp/ui.py
Original file line number Diff line number Diff line change
@@ -92,8 +92,12 @@ def collecting_reports_for(self, path):
self._print(" 4. Collecting reports ...")


def collecting_logs_for(self, path):
self._print(" 5. Collecting logs ...")


def stopping_services_for(self, path):
self._print(" 5. Stopping Services ...")
self._print(" 6. Stopping Services ...")


def on_shell_command(self, command, working_directory):
9 changes: 9 additions & 0 deletions tests/unit/execute/test_engine.py
Original file line number Diff line number Diff line change
@@ -234,6 +234,7 @@ def test_notify_listener(self):
expected_calls.append(call.starting_services_for(each))
expected_calls.append(call.running_tests_for(each))
expected_calls.append(call.collecting_reports_for(each))
expected_calls.append(call.collecting_logs_for(each))
expected_calls.append(call.stopping_services_for(each))

self._listener.assert_has_calls(expected_calls)
@@ -281,6 +282,14 @@ def test_fetch_test_reports(self):
self._verify(each_path, docker_cp)


def test_collect_logfiles_for_each_service(self):
self._call_execute()

for each_path, _ in self._configurations:
docker_logs = Engine.FETCH_LOG_FILE
self._verify(each_path, docker_logs)


def test_stop_services_for_all_configurations(self):
self._call_execute()