Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
James Wood authored and James Wood committed May 7, 2024
2 parents 71dac06 + 0cbda38 commit f5c3c6c
Show file tree
Hide file tree
Showing 16 changed files with 34 additions and 34 deletions.
36 changes: 18 additions & 18 deletions ci/ci.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,26 +36,26 @@ function worker_conf_data() {
INSTALL_TYPE=${1}

if [[ "${INSTALL_TYPE}" == "worker1" ]]; then
sed -i 's/__WORKER_TYPE__/run_all/' ${ROOT}/ci_worker.conf
sed -i 's/__CWS_WEB_PORT__/37080/' ${ROOT}/ci_worker.conf
sed -i 's/__CWS_SSL_PORT__/37443/' ${ROOT}/ci_worker.conf
sed -i 's/__CWS_AJP_PORT__/37009/' ${ROOT}/ci_worker.conf
sed -i 's/__CWS_SHUTDOWN_PORT__/37005/' ${ROOT}/ci_worker.conf
sed -i 's/__CWS_JMX_PORT__/31098/' ${ROOT}/ci_worker.conf
sed -i '' -e 's/__WORKER_TYPE__/run_all/' ${ROOT}/ci_worker.conf
sed -i '' -e 's/__CWS_WEB_PORT__/37080/' ${ROOT}/ci_worker.conf
sed -i '' -e 's/__CWS_SSL_PORT__/37443/' ${ROOT}/ci_worker.conf
sed -i '' -e 's/__CWS_AJP_PORT__/37009/' ${ROOT}/ci_worker.conf
sed -i '' -e 's/__CWS_SHUTDOWN_PORT__/37005/' ${ROOT}/ci_worker.conf
sed -i '' -e 's/__CWS_JMX_PORT__/31098/' ${ROOT}/ci_worker.conf
elif [[ "${INSTALL_TYPE}" == "worker2" ]]; then
sed -i 's/__WORKER_TYPE__/run_models_only/' ${ROOT}/ci_worker.conf
sed -i 's/__CWS_WEB_PORT__/36080/' ${ROOT}/ci_worker.conf
sed -i 's/__CWS_SSL_PORT__/36443/' ${ROOT}/ci_worker.conf
sed -i 's/__CWS_AJP_PORT__/36009/' ${ROOT}/ci_worker.conf
sed -i 's/__CWS_SHUTDOWN_PORT__/36005/' ${ROOT}/ci_worker.conf
sed -i 's/__CWS_JMX_PORT__/31097/' ${ROOT}/ci_worker.conf
sed -i '' -e 's/__WORKER_TYPE__/run_models_only/' ${ROOT}/ci_worker.conf
sed -i '' -e 's/__CWS_WEB_PORT__/36080/' ${ROOT}/ci_worker.conf
sed -i '' -e 's/__CWS_SSL_PORT__/36443/' ${ROOT}/ci_worker.conf
sed -i '' -e 's/__CWS_AJP_PORT__/36009/' ${ROOT}/ci_worker.conf
sed -i '' -e 's/__CWS_SHUTDOWN_PORT__/36005/' ${ROOT}/ci_worker.conf
sed -i '' -e 's/__CWS_JMX_PORT__/31097/' ${ROOT}/ci_worker.conf
elif [[ "${INSTALL_TYPE}" == "worker3" ]]; then
sed -i 's/__WORKER_TYPE__/run_external_tasks_only/' ${ROOT}/ci_worker.conf
sed -i 's/__CWS_WEB_PORT__/33080/' ${ROOT}/ci_worker.conf
sed -i 's/__CWS_SSL_PORT__/33443/' ${ROOT}/ci_worker.conf
sed -i 's/__CWS_AJP_PORT__/33009/' ${ROOT}/ci_worker.conf
sed -i 's/__CWS_SHUTDOWN_PORT__/33005/' ${ROOT}/ci_worker.conf
sed -i 's/__CWS_JMX_PORT__/31096/' ${ROOT}/ci_worker.conf
sed -i '' -e 's/__WORKER_TYPE__/run_external_tasks_only/' ${ROOT}/ci_worker.conf
sed -i '' -e 's/__CWS_WEB_PORT__/33080/' ${ROOT}/ci_worker.conf
sed -i '' -e 's/__CWS_SSL_PORT__/33443/' ${ROOT}/ci_worker.conf
sed -i '' -e 's/__CWS_AJP_PORT__/33009/' ${ROOT}/ci_worker.conf
sed -i '' -e 's/__CWS_SHUTDOWN_PORT__/33005/' ${ROOT}/ci_worker.conf
sed -i '' -e 's/__CWS_JMX_PORT__/31096/' ${ROOT}/ci_worker.conf
else
print "ERROR: UNEXPECTED INSTALL TYPE VALUE: '${INSTALL_TYPE}'"
exit 1;
Expand Down
2 changes: 1 addition & 1 deletion cws-adaptation-engine/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>gov.nasa.jpl.ammos.ids.cws</groupId>
<artifactId>common-workflow-service</artifactId>
<version>2.6.0-pre.1</version><!-- update this each CWS release -->
<version>2.6.0</version><!-- update this each CWS release -->
</parent>
<artifactId>cws-adaptation-engine</artifactId>

Expand Down
2 changes: 1 addition & 1 deletion cws-adaptation/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>gov.nasa.jpl.ammos.ids.cws</groupId>
<artifactId>common-workflow-service</artifactId>
<version>2.6.0-pre.1</version><!-- update this each CWS release -->
<version>2.6.0</version><!-- update this each CWS release -->
</parent>
<artifactId>cws-adaptation</artifactId>

Expand Down
2 changes: 1 addition & 1 deletion cws-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>gov.nasa.jpl.ammos.ids.cws</groupId>
<artifactId>common-workflow-service</artifactId>
<version>2.6.0-pre.1</version><!-- update this each CWS release -->
<version>2.6.0</version><!-- update this each CWS release -->
</parent>
<artifactId>cws-core</artifactId>

Expand Down
2 changes: 1 addition & 1 deletion cws-engine-service/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>gov.nasa.jpl.ammos.ids.cws</groupId>
<artifactId>common-workflow-service</artifactId>
<version>2.6.0-pre.1</version><!-- update this each CWS release -->
<version>2.6.0</version><!-- update this each CWS release -->
</parent>
<artifactId>cws-engine-service</artifactId>

Expand Down
2 changes: 1 addition & 1 deletion cws-engine/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>gov.nasa.jpl.ammos.ids.cws</groupId>
<artifactId>common-workflow-service</artifactId>
<version>2.6.0-pre.1</version><!-- update this each CWS release -->
<version>2.6.0</version><!-- update this each CWS release -->
</parent>
<artifactId>cws-engine</artifactId>

Expand Down
2 changes: 1 addition & 1 deletion cws-installer/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>gov.nasa.jpl.ammos.ids.cws</groupId>
<artifactId>common-workflow-service</artifactId>
<version>2.6.0-pre.1</version><!-- update this each CWS release -->
<version>2.6.0</version><!-- update this each CWS release -->
</parent>
<artifactId>cws-installer</artifactId>

Expand Down
2 changes: 1 addition & 1 deletion cws-service/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>gov.nasa.jpl.ammos.ids.cws</groupId>
<artifactId>common-workflow-service</artifactId>
<version>2.6.0-pre.1</version><!-- update this each CWS release -->
<version>2.6.0</version><!-- update this each CWS release -->
</parent>
<artifactId>cws-service</artifactId>

Expand Down
2 changes: 1 addition & 1 deletion cws-tasks/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>gov.nasa.jpl.ammos.ids.cws</groupId>
<artifactId>common-workflow-service</artifactId>
<version>2.6.0-pre.1</version><!-- update this each CWS release -->
<version>2.6.0</version><!-- update this each CWS release -->
</parent>
<artifactId>cws-tasks</artifactId>

Expand Down
2 changes: 1 addition & 1 deletion cws-test/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>gov.nasa.jpl.ammos.ids.cws</groupId>
<artifactId>common-workflow-service</artifactId>
<version>2.6.0-pre.1</version><!-- update this each CWS release -->
<version>2.6.0</version><!-- update this each CWS release -->
</parent>
<artifactId>cws-test</artifactId>

Expand Down
2 changes: 1 addition & 1 deletion cws-ui/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>gov.nasa.jpl.ammos.ids.cws</groupId>
<artifactId>common-workflow-service</artifactId>
<version>2.6.0-pre.1</version><!-- update this each CWS release -->
<version>2.6.0</version><!-- update this each CWS release -->
</parent>

<artifactId>cws-ui</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions install/docker/console-db-es-ls-kibana/docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ services:
labels:
com.example.service: "cws-server"
com.example.description: "Common Workflow Service"
image: nasa-ammos/common-workflow-service:2.6.0-pre.1 # update this each CWS release
image: nasa-ammos/common-workflow-service:2.6.0 # update this each CWS release
depends_on:
- db
- es
Expand Down Expand Up @@ -121,7 +121,7 @@ services:
labels:
com.example.service: "cws-worker1"
com.example.description: "Common Workflow Service"
image: nasa-ammos/common-workflow-service:2.6.0-pre.1 # update this each CWS release
image: nasa-ammos/common-workflow-service:2.6.0 # update this each CWS release
depends_on:
- db
- es
Expand Down
2 changes: 1 addition & 1 deletion install/docker/cws-image/build.sh
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash

ver='2.6.0-pre.1' # update this each CWS release
ver='2.6.0' # update this each CWS release

# Rebuild cws tar-ball
ROOT=$(pwd)
Expand Down
2 changes: 1 addition & 1 deletion install/docker/worker-ls/docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ services:
labels:
com.example.service: "cws-worker2"
com.example.description: "Common Workflow Service"
image: nasa-ammos/common-workflow-service:2.6.0-pre.1 # update this each CWS release
image: nasa-ammos/common-workflow-service:2.6.0 # update this each CWS release
#depends_on:
# - logstash
hostname: cws-worker2
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>gov.nasa.jpl.ammos.ids.cws</groupId>
<artifactId>common-workflow-service</artifactId>
<version>2.6.0-pre.1</version> <!-- update this each CWS release -->
<version>2.6.0</version> <!-- update this each CWS release -->
<packaging>pom</packaging>
<name>cws</name>
<description>CWS</description>
Expand Down
2 changes: 1 addition & 1 deletion utils.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# Shell utility functions and environment settings used throughout CWS setup scripts

# Update versions as necessary
export CWS_VER='2.6.0-pre.1' # update this each CWS release
export CWS_VER='2.6.0' # update this each CWS release
export CAMUNDA_VER='7.20.0'
export TOMCAT_VER='9.0.75'
export LOGSTASH_VER='8.12.0'
Expand Down

0 comments on commit f5c3c6c

Please sign in to comment.