diff options
author | BOLLE Sebastien | 2018-10-08 15:54:11 +0000 |
---|---|---|
committer | BOLLE Sebastien | 2018-10-08 15:54:11 +0000 |
commit | a8f636b2586314abde7bab7bf348a91acdfde436 (patch) | |
tree | 79e5c94dd1454b6b3532468a35cd4991a52586e5 /.gitlab-ci.yml | |
parent | b5233ef4d383be988347e389f7e204e3cf6427a0 (diff) | |
download | org.eclipse.om2m-a8f636b2586314abde7bab7bf348a91acdfde436.tar.gz org.eclipse.om2m-a8f636b2586314abde7bab7bf348a91acdfde436.tar.xz org.eclipse.om2m-a8f636b2586314abde7bab7bf348a91acdfde436.zip |
Squash of Orange's commit.
This commit contains:
- sonar: perform sonar checking during build phase
- commons, all: modified custom attributes (added type & long name).
- commons: new FlexContainer classes for devices & modules, SDT V3.7.
- ipe.sdt, sample.sdt: adapted SDT data model to SDT version 3.7
- SDT: New modules & devices.
- commons: fix issue regarding CustomAttribute
- sdt.ipe: log out in case of unknown custom attributes
- datamapping.jaxb: add some unitary tests.
- app.home.monitoring: fix issue with camera url.
- sdt.api: fix Array issue.
- sdt.ipe: code cleanup
- resourcebrowser.json: handle list of dacis
- home.application.authentication.service: initial import.
- home.monitoring.app: use external identity provider.
- binding.http: handle Authorization header (basic & bearer)
- core, commons: handle Tokens with DAS.
- home.monitoring.app: retrieve end user info.
- sdt.home.monitoring: add new features.
- sdt.home.driver: update apache log4j logger
- sdt.lifx: fix issue with set colors methods.
- sdt.home.app.auth.service: update AuthenticationService api.
- commons: add DasInfo & DynAuthTokenReqInfo class
- datamapping.jaxb: add unitary test for DynAuthTokenReqInfo.
- core: return a DynAuthTokenReqInfo if DynAuth failed
- core: adapt result list with the caller access rights.
- binding.http: introduce X-M2M-Token header.
- sdt.homemonitoring.app: use servlet HttpSession to manage session.
- all: deletion of .classpath and .project files from repository
- sdt.homemonitoring.auth.service: add sessionId parameter
- all: update .gitignore file
- Manage several IdP services.
- core: avoid duplicate key violation on FlexContainer-DAC association
- sdt.home.application: use grey background color for non-granted
devices
- Code cleanup and simplification
- Fixed Bug 539351 - Wrong short names for mgmtObj attributes
- Bug fix: missing handling of objectIDs & objectPaths in MgmtObj,
listOfNeighbors in AreaNwkDeviceInfo and listOfDevices in AreaNwkInfo.
- Bug fixes: mapping labels / Annc resources.
- Allow adding new labels when updating flex containers.
- Code cleanup.
- More flexible user information.
Signed-off-by: BOLLE Sebastien <sebastien.bolle@orange.com>
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r-- | .gitlab-ci.yml | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index aaedff16..9c4bed34 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,9 @@ -image: registry.forge.orange-labs.fr/org.eclipse.om2m/om2m/com.orange.om2m.docker.builder:0.0.5 +image: registry.forge.orange-labs.fr/org.eclipse.om2m/om2m/com.orange.om2m.docker.builder:0.0.6 +variables: + MAVEN_OPTS: "-Xms4000m -Xmx6000m" + + cache: paths: - .m2 @@ -15,6 +19,7 @@ build: script: - "nohup dockerd&" - "mvn clean install -Dmaven.repo.local=./.m2/repository -B -s /root/.m2/settings.xml" + - "mvn sonar:sonar -Dsonar.host.url=http://10.192.37.63/sonar" tags: - docker-privileged - rsc @@ -24,7 +29,7 @@ deploy: stage: deploy script: - "nohup dockerd&" - - "mvn deploy -B -Dmaven.repo.local=./.m2/repository -s /root/.m2/settings.xml -DaltDeploymentRepository=inhouse.snapshot::default::http://maven2.rd.francetelecom.fr/proxy/repository/inhouse.snapshot -Drepo=${CI_COMMIT_REF_NAME} -Pdocker" + - "mvn deploy -B -Dmaven.test.skip=true -Dmaven.repo.local=./.m2/repository -s /root/.m2/settings.xml -DaltDeploymentRepository=inhouse.snapshot::default::http://maven2.rd.francetelecom.fr/proxy/repository/inhouse.snapshot -Drepo=${CI_COMMIT_REF_NAME} -Pdocker" - "rm -fr .m2" tags: - docker-privileged |