Skip to content

Commit

Permalink
Update submodules: etm using new jenkins image 1.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@EduJGURJC
EduJGURJC committed Dec 19, 2019
1 parent a746a0f commit 7bf68dc
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion eim
Submodule eim updated 32 files
+1 −1 Jenkinsfile
+24 −0 Kubernetes/eim-sut-deployment.yaml
+19 −0 Kubernetes/eim-sut-service.yaml
+3 −0 README.md
+49 −4 api.yaml
+1 −0 docker-compose-test.yml
+1,380 −1,169 e2e-test/src/test/java/io/elastest/eim/test/base/EimBaseTest.java
+292 −293 e2e-test/src/test/java/io/elastest/eim/test/base/EimPluginBaseTest.java
+11 −4 e2e-test/src/test/java/io/elastest/eim/test/e2e/ControllabilityMonitoring.java
+173 −0 e2e-test/src/test/java/io/elastest/eim/test/e2e/ControllabilityNonExecBeat.java
+14 −15 e2e-test/src/test/java/io/elastest/eim/test/e2e/EimApiRestTest.java
+1 −1 e2e-test/src/test/java/io/elastest/eim/test/e2e/EimTJobE2eTest.java
+304 −0 e2e-test/src/test/java/io/elastest/eim/test/e2e/MonitoringTestEK.java
+133 −0 e2e-test/src/test/java/io/elastest/eim/test/e2e/PacketLossInstrumentalize.java
+4 −0 eim/Dockerfile
+14 −40 eim/ansible/beats/playbook-delete-beats-template.yml
+21 −0 eim/ansible/beats/playbook-restore-default-iptables-rule-template.yml
+11 −0 eim/ansible/beats/playbook-ssh-rule-iptables.yml
+3 −3 eim/ansible/beats/setup-files/metricbeat.yml
+18 −0 eim/eim-rest-api/src/gen/java/io/swagger/model/AgentFull.java
+7 −0 eim/eim-rest-api/src/main/java/io/elastest/eim/config/Dictionary.java
+4 −0 eim/eim-rest-api/src/main/java/io/elastest/eim/database/AgentRepository.java
+64 −8 eim/eim-rest-api/src/main/java/io/elastest/eim/database/mysql/EimDbAgentManager.java
+1 −0 eim/eim-rest-api/src/main/java/io/elastest/eim/database/mysql/EimDbCreator.java
+63 −3 eim/eim-rest-api/src/main/java/io/elastest/eim/templates/BeatsTemplateManager.java
+33 −12 eim/eim-rest-api/src/main/java/io/elastest/eim/templates/BeatsTemplateManagerControl.java
+80 −6 eim/eim-rest-api/src/main/java/io/elastest/eim/utils/TemplateUtils.java
+128 −55 eim/eim-rest-api/src/main/java/io/swagger/api/impl/AgentApiServiceImpl.java
+4 −1 eim/eim-rest-api/src/main/webapp/WEB-INF/bootstrap.properties
+1 −0 eim/scripts/install_monitoring_beats_dockerized
+1 −0 eim/scripts/install_monitoring_beats_not_dockerized
+3 −0 eim/scripts/uncheck_beat.sh
2 changes: 1 addition & 1 deletion etm
Submodule etm updated 50 files
+1 −0 .gitignore
+1 −1 docker/docker-compose-jenkins.yml
+1 −1 docker/elastest-torm/run.sh
+2 −2 docker/services/jenkins/Dockerfile
+1 −1 docker/services/jenkins/plugins.txt
+2 −2 docker/services/logstash/logstash.conf
+48 −0 docs/K8s execute config for eclipse.launch
+45 −0 docs/Mini execute config for eclipse.launch
+57 −123 docs/index.md
+1 −1 e2e-test/src/test/java/io/elastest/etm/test/e2e/plugin/EJEtinEtTest.java
+1 −1 elastest-torm-gui/package-lock.json
+1 −1 elastest-torm-gui/package.json
+1 −1 elastest-torm-gui/pom.xml
+2 −2 elastest-torm-gui/src/app/elastest-etm/test-case/test-case.component.html
+4 −0 elastest-torm-gui/src/app/elastest-etm/test-case/test-case.component.ts
+1 −0 ...orm-gui/src/app/elastest-etm/tjob-exec/finished-tjob-exec-manager/finished-tjob-exec-manager.component.html
+5 −1 elastest-torm-gui/src/app/elastest-etm/tjob-exec/live-tjob-exec-manager/live-tjob-exec-manager.component.html
+4 −1 elastest-torm-gui/src/app/elastest-etm/tjob/tjob-manager/tjob-manager.component.html
+2 −0 elastest-torm-gui/src/app/elastest-log-comparator/elastest-log-comparator.component.ts
+27 −5 elastest-torm-gui/src/app/shared/parameters-view/parameters-view.component.html
+3 −0 elastest-torm-gui/src/app/shared/shared.module.ts
+1 −1 elastest-torm/pom.xml
+1 −1 elastest-torm/src/main/java/io/elastest/etm/ElasTestTormApp.java
+55 −100 elastest-torm/src/main/java/io/elastest/etm/api/TjobApiController.java
+6 −2 elastest-torm/src/main/java/io/elastest/etm/api/TracesApiController.java
+884 −912 elastest-torm/src/main/java/io/elastest/etm/config/EtSampleDataLoader.java
+1 −1 elastest-torm/src/main/java/io/elastest/etm/model/SutSpecification.java
+110 −172 elastest-torm/src/main/java/io/elastest/etm/platform/service/K8ServiceImpl.java
+9 −14 elastest-torm/src/main/java/io/elastest/etm/service/AbstractMonitoringService.java
+42 −0 elastest-torm/src/main/java/io/elastest/etm/service/AsyncMonitoringService.java
+19 −4 elastest-torm/src/main/java/io/elastest/etm/service/DatabaseSessionManager.java
+118 −189 elastest-torm/src/main/java/io/elastest/etm/service/EtPluginsService.java
+13 −27 elastest-torm/src/main/java/io/elastest/etm/service/EtmTestResultService.java
+4 −1 elastest-torm/src/main/java/io/elastest/etm/service/ExternalService.java
+1,047 −1,180 elastest-torm/src/main/java/io/elastest/etm/service/TJobExecOrchestratorService.java
+6 −5 elastest-torm/src/main/java/io/elastest/etm/service/TJobService.java
+1 −1 elastest-torm/src/main/java/io/elastest/etm/service/TracesService.java
+11 −2 elastest-torm/src/main/java/io/elastest/etm/service/client/EsmServiceClientImpl.java
+1 −1 elastest-torm/src/main/resources/esm_services/ess-elastestservice-k8s.json
+1 −1 elastest-torm/src/main/resources/esm_services/eus-elastestservice.json
+1 −1 elastest-torm/src/main/resources/test_engines/ece-k8s.yml
+2 −2 elastest-torm/src/main/resources/test_engines/ere-k8s.yml
+1 −1 elastest-torm/src/main/resources/test_engines/eretrial-k8s.yml
+2 −2 elastest-torm/src/main/resources/test_engines/jenkins-k8s.yml
+1 −1 elastest-torm/src/main/resources/test_engines/jenkins.yml
+2 −1 elastest-torm/src/main/resources/test_engines/qa-k8s.yml
+5 −6 elastest-torm/src/test/java/io/elastest/etm/test/tjob/TJobServiceTest.java
+148 −223 epm-client/src/main/java/io/elastest/epm/client/service/DockerService.java
+214 −358 epm-client/src/main/java/io/elastest/epm/client/service/K8sService.java
+1 −1 pom.xml
2 changes: 1 addition & 1 deletion eus
Submodule eus updated 17 files
+5 −6 .travis.yml
+1 −0 docker/services/Readme
+1 −0 docker/services/elastest-webrtc-qoe-meter/Dockerfile
+32 −25 docs/dev-docs.md
+21 −20 eus/src/main/java/io/elastest/eus/api/EusApi.java
+11 −8 eus/src/main/java/io/elastest/eus/api/EusController.java
+7 −5 eus/src/main/java/io/elastest/eus/config/EusContextProperties.java
+420 −478 eus/src/main/java/io/elastest/eus/platform/manager/AWSClient.java
+157 −173 eus/src/main/java/io/elastest/eus/platform/manager/BrowserAWSManager.java
+239 −190 eus/src/main/java/io/elastest/eus/platform/manager/BrowserDockerManager.java
+71 −98 eus/src/main/java/io/elastest/eus/platform/manager/BrowserK8sManager.java
+58 −106 eus/src/main/java/io/elastest/eus/platform/manager/PlatformManager.java
+126 −19 eus/src/main/java/io/elastest/eus/service/EusFilesService.java
+259 −200 eus/src/main/java/io/elastest/eus/service/QoEService.java
+359 −486 eus/src/main/java/io/elastest/eus/service/WebDriverService.java
+15 −1 eus/src/main/java/io/elastest/eus/services/model/WebRTCQoEMeter.java
+5 −3 eus/src/main/resources/application-required.properties

0 comments on commit 7bf68dc

Please sign in to comment.