Skip to content

Commit

Permalink
Making sure the job clusters that are loaded into the mantis control …
Browse files Browse the repository at this point in the history
…plane are consistent with the artifacts in mantis-agent (#619)

Co-authored-by: Sundaram Ananthanarayanan <[email protected]>
  • Loading branch information
sundargates and sundargates authored Jan 19, 2024
1 parent b907c68 commit 4655f3a
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 11 deletions.
3 changes: 3 additions & 0 deletions mantis-control-plane/mantis-control-plane-server/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ def installDir = file("${buildDir}/install")
def controlPlaneState = file("${project.resources}/docker")
def ci = System.getenv('GITHUB_ACTIONS')
def imageRepository = ci ? 'netflixoss' : 'localhost:5001/netflixoss'
def version = project.version

docker {
dockerSyncBuildContext {
Expand All @@ -86,6 +87,8 @@ docker {
instruction 'COPY mantis-control-plane-server/lib/* lib/'
instruction 'COPY resources/* conf/'
instruction 'COPY docker/job-clusters/* job-clusters/'
// todo: remove this once we have a better way to handle uploading job clusters to the control plane
instruction "RUN for file in job-clusters/*; do sed -i -e \"s/{{version}}/$version/g\" \$file; done"
instruction 'COPY docker/scripts/* bin/'

entryPoint './bin/start.sh'
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
jobNameInfo,{"name":"SharedMrePublishEventSource","jars":[{"url":"http://mantis-source-job-publish-2.0.114-SNAPSHOT.zip","uploadedAt":1571159578388,"version":"2.1.0-SNAPSHOT 2024-01-01 10:12:44","schedulingInfo":{"stages":{"1":{"numberOfInstances":1,"machineDefinition":{"cpuCores":1.0,"memoryMB":256.0,"networkMbps":12.0,"diskMB":10.0,"numPorts":1},"hardConstraints":[],"softConstraints":[],"scalingPolicy":null,"scalable":false}}}}],"sla":{"min":1,"max":1,"cronSpec":null,"cronPolicy":null},"parameters":[],"owner":{"name":"Mr. Mantis","teamName":"Mantis","description":"Works in conjunction with mantis-publish client to source on-demand filtered data from external apps","contactEmail":"[email protected]","repo":"https://github.com/Netflix/mantis-source-jobs/tree/master/publish-source-job"},"lastJobCount":0,"disabled":false,"isReadyForJobMaster":false,"migrationConfig":{"strategy":"PERCENTAGE","configString":"{\"percentToMove\":25,\"intervalMs\":60000}"},"labels":[{"name":"_mantis.user","value":"Mr. Mantis"},{"name":"_mantis.ownerEmail","value":"[email protected]"},{"name":"_mantis.artifact","value":"mantis-source-job-publish-1.3.0-SNAPSHOT"},{"name":"_mantis.artifact.version","value":"SNAPSHOT"},{"name":"_mantis.jobType","value":""},{"name":"_mantis.criticality","value":""},{"name":"_mantis.resourceCluster","value":"DEFAULT_CLUSTER"}],"cronActive":false}
jobNameInfo,{"name":"SharedMrePublishEventSource","jars":[{"url":"http://mantis-source-job-publish-{{version}}.zip","uploadedAt":1571159578388,"version":"2.1.0-SNAPSHOT 2024-01-01 10:12:44","schedulingInfo":{"stages":{"1":{"numberOfInstances":1,"machineDefinition":{"cpuCores":1.0,"memoryMB":256.0,"networkMbps":12.0,"diskMB":10.0,"numPorts":1},"hardConstraints":[],"softConstraints":[],"scalingPolicy":null,"scalable":false}}}}],"sla":{"min":1,"max":1,"cronSpec":null,"cronPolicy":null},"parameters":[],"owner":{"name":"Mr. Mantis","teamName":"Mantis","description":"Works in conjunction with mantis-publish client to source on-demand filtered data from external apps","contactEmail":"[email protected]","repo":"https://github.com/Netflix/mantis-source-jobs/tree/master/publish-source-job"},"lastJobCount":0,"disabled":false,"isReadyForJobMaster":false,"migrationConfig":{"strategy":"PERCENTAGE","configString":"{\"percentToMove\":25,\"intervalMs\":60000}"},"labels":[{"name":"_mantis.user","value":"Mr. Mantis"},{"name":"_mantis.ownerEmail","value":"[email protected]"},{"name":"_mantis.artifact","value":"mantis-source-job-publish"},{"name":"_mantis.artifact.version","value":"{{version}}"},{"name":"_mantis.jobType","value":""},{"name":"_mantis.criticality","value":""},{"name":"_mantis.resourceCluster","value":"DEFAULT_CLUSTER"}],"cronActive":false}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
jobNameInfo,{"name":"SineFunction","jars":[{"url":"http://mantis-examples-sine-function-2.0.114-SNAPSHOT.zip","uploadedAt":1571159980278,"version":"0.1.0-SNAPSHOT 2019-10-15 10:19:20","schedulingInfo":{"stages":{"1":{"numberOfInstances":1,"machineDefinition":{"cpuCores":1.0,"memoryMB":256.0,"networkMbps":12.0,"diskMB":10.0,"numPorts":1},"hardConstraints":[],"softConstraints":[],"scalingPolicy":null,"scalable":false}}}}],"sla":{"min":0,"max":0,"cronSpec":null,"cronPolicy":null},"parameters":[{"name":"useRandom","value":"true"}],"owner":{"name":"Mr. Mantis","teamName":"Mantis","description":"A simple job that generates x and y coordinates of a sine wave","contactEmail":"[email protected]","repo":"https://github.com/Netflix/mantis-examples/tree/master/sine-function"},"lastJobCount":0,"disabled":false,"isReadyForJobMaster":false,"migrationConfig":{"strategy":"PERCENTAGE","configString":"{\"percentToMove\":25,\"intervalMs\":60000}"},"labels":[{"name":"_mantis.user","value":"Mr. Mantis"},{"name":"_mantis.ownerEmail","value":"[email protected]"},{"name":"_mantis.artifact","value":"mantis-examples-sine-function-0.1.0-SNAPSHOT"},{"name":"_mantis.artifact.version","value":"SNAPSHOT"},{"name":"_mantis.jobType","value":""},{"name":"_mantis.criticality","value":""},{"name":"_mantis.resourceCluster","value":"DEFAULT_CLUSTER"}],"cronActive":false}
jobNameInfo,{"name":"SineFunction","jars":[{"url":"http://mantis-examples-sine-function-{{version}}.zip","uploadedAt":1571159980278,"version":"0.1.0-SNAPSHOT 2019-10-15 10:19:20","schedulingInfo":{"stages":{"1":{"numberOfInstances":1,"machineDefinition":{"cpuCores":1.0,"memoryMB":256.0,"networkMbps":12.0,"diskMB":10.0,"numPorts":1},"hardConstraints":[],"softConstraints":[],"scalingPolicy":null,"scalable":false}}}}],"sla":{"min":0,"max":0,"cronSpec":null,"cronPolicy":null},"parameters":[{"name":"useRandom","value":"true"}],"owner":{"name":"Mr. Mantis","teamName":"Mantis","description":"A simple job that generates x and y coordinates of a sine wave","contactEmail":"[email protected]","repo":"https://github.com/Netflix/mantis-examples/tree/master/sine-function"},"lastJobCount":0,"disabled":false,"isReadyForJobMaster":false,"migrationConfig":{"strategy":"PERCENTAGE","configString":"{\"percentToMove\":25,\"intervalMs\":60000}"},"labels":[{"name":"_mantis.user","value":"Mr. Mantis"},{"name":"_mantis.ownerEmail","value":"[email protected]"},{"name":"_mantis.artifact","value":"mantis-examples-sine-function-0.1.0-SNAPSHOT"},{"name":"_mantis.artifact.version","value":"SNAPSHOT"},{"name":"_mantis.jobType","value":""},{"name":"_mantis.criticality","value":""},{"name":"_mantis.resourceCluster","value":"DEFAULT_CLUSTER"}],"cronActive":false}
9 changes: 0 additions & 9 deletions mantis-server/mantis-server-worker/buildDockerImage.sh

This file was deleted.

0 comments on commit 4655f3a

Please sign in to comment.