Ds rss022 170 20180613 #436
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1) Added new plugin 2) Changed InitialiseDatabase so that it now uses TSM and Oracle as the Archive stores 3) Updated the common project pom to include the Oracle jars (these need to be added manually)
1) Refactored OracleObjectStorageClassic plugin so that stub methods are completed and debugging has been added. This is sort of working at the moment though not all objects are being stored (but some are!) Just committing while I work on other stuff.
1) This commit is just a general tidy up where I moved strings in consts etc. I still need to add the checksum verfication of the upload. This 200mb file issue I was seeing previously turned out to be a permissions thing.
…h to Oracle for the cloud 1) Added the two jars not available via mvn to a resources dir (I didn't add to a lib dir for erm reasons) 2) Updated the .travis.yml file to add the jars in resources to the local mvn repo. If this goes well I might remove the jars from the repo and store on a machine for downloading by travis somehow. (I'm not sure if I'll be able to sort out auth for this though)
…st switch to Oracle for the cloud 1) Updated the .travis.yml file to add the jars in resources to the local mvn repo (moved this from script to the before install section).
…st switch to Oracle for the cloud 1) Updated the .travis.yml file to add the jars in resources to the local mvn repo (moved this from script to the before install section).
…st switch to Oracle for the cloud 1) Added some debug prints to help work out why this is still failing. It gets much further now but still fails, it looks like we clean out the mvn repo at least once after we add them so the debug is to help me id where they need re added.
…st switch to Oracle for the cloud 1) Added some debug prints to help work out why this is still failing. It gets much further now but still fails, it looks like we clean out the mvn repo at least once after we add them so the debug is to help me id where they need re added.
…st switch to Oracle for the cloud 1) My previous attempts have got the initial build and tests to complete, I know believe the various build for each separate docker container need the same changes. I've added lines to the broker, webapp and worker Dockerfiles to hopefully add the Oracle jars to the each instances mvn repo. I'm not sure if this is going to work or if I need to make a Dockerfile for common (or both). I'm committing now so that I can see if this works on Travis
…st switch to Oracle for the cloud 1) My previous attempts have got the initial build and tests to complete, I know believe the various build for each separate docker container need the same changes. I've added lines to the broker, webapp and worker Dockerfiles to hopefully add the Oracle jars to the each instances mvn repo. I'm not sure if this is going to work or if I need to make a Dockerfile for common (or both). I'm committing now so that I can see if this works on Travis
…st switch to Oracle for the cloud 1) My previous attempts have got the initial build and tests to complete, I know believe the various build for each separate docker container need the same changes. I've added lines to the broker, webapp and worker Dockerfiles to hopefully add the Oracle jars to the each instances mvn repo. I'm not sure if this is going to work or if I need to make a Dockerfile for common (or both). I'm committing now so that I can see if this works on Travis
…st switch to Oracle for the cloud 1) My previous attempts have got the initial build and tests to complete, I know believe the various build for each separate docker container need the same changes. I've added lines to the broker, webapp and worker Dockerfiles to hopefully add the Oracle jars to the each instances mvn repo. I'm not sure if this is going to work or if I need to make a Dockerfile for common (or both). I'm committing now so that I can see if this works on Travis
…st switch to Oracle for the cloud 1) My previous attempts have got the initial build and tests to complete, I know believe the various build for each separate docker container need the same changes. I've added lines to the broker, webapp and worker Dockerfiles to hopefully add the Oracle jars to the each instances mvn repo. I'm not sure if this is going to work or if I need to make a Dockerfile for common (or both). I'm committing now so that I can see if this works on Travis
…(Till we get the Oracle account) 1) Updated InitialiseDatabase.java so that TSM and S3 are the default ArchiveStores, Oracle will be committed to master but is unlikely to be used till the account is sorted.
removed the "got here" messages in the travis script
WilliamPetit
approved these changes
Jun 27, 2018
.travis.yml
Outdated
| - docker-compose rm -f | ||
| - docker-compose pull | ||
|
|
||
| script: | ||
| # docker needs jar file to start | ||
| - echo "Got here 1" |
There was a problem hiding this comment.
I'm not sure why you've put "got here" messages, Travis display the command being run before running them:
$ docker-compose build
so I don't think that's helpful?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.