diff --git a/ci/ci.sh b/ci/ci.sh index 7a54d7aa..297156a1 100755 --- a/ci/ci.sh +++ b/ci/ci.sh @@ -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; diff --git a/cws-adaptation-engine/pom.xml b/cws-adaptation-engine/pom.xml index 1dc22c83..adef435b 100644 --- a/cws-adaptation-engine/pom.xml +++ b/cws-adaptation-engine/pom.xml @@ -3,7 +3,7 @@ gov.nasa.jpl.ammos.ids.cws common-workflow-service - 2.6.0-pre.1 + 2.6.0 cws-adaptation-engine diff --git a/cws-adaptation/pom.xml b/cws-adaptation/pom.xml index 15881661..2757431b 100644 --- a/cws-adaptation/pom.xml +++ b/cws-adaptation/pom.xml @@ -3,7 +3,7 @@ gov.nasa.jpl.ammos.ids.cws common-workflow-service - 2.6.0-pre.1 + 2.6.0 cws-adaptation diff --git a/cws-core/pom.xml b/cws-core/pom.xml index ba2d75e1..5535cc2e 100644 --- a/cws-core/pom.xml +++ b/cws-core/pom.xml @@ -3,7 +3,7 @@ gov.nasa.jpl.ammos.ids.cws common-workflow-service - 2.6.0-pre.1 + 2.6.0 cws-core diff --git a/cws-engine-service/pom.xml b/cws-engine-service/pom.xml index 3bc75c28..c1e833e8 100644 --- a/cws-engine-service/pom.xml +++ b/cws-engine-service/pom.xml @@ -3,7 +3,7 @@ gov.nasa.jpl.ammos.ids.cws common-workflow-service - 2.6.0-pre.1 + 2.6.0 cws-engine-service diff --git a/cws-engine/pom.xml b/cws-engine/pom.xml index 8a55fe72..260f8041 100644 --- a/cws-engine/pom.xml +++ b/cws-engine/pom.xml @@ -4,7 +4,7 @@ gov.nasa.jpl.ammos.ids.cws common-workflow-service - 2.6.0-pre.1 + 2.6.0 cws-engine diff --git a/cws-installer/pom.xml b/cws-installer/pom.xml index 545c6caf..f5360a8c 100644 --- a/cws-installer/pom.xml +++ b/cws-installer/pom.xml @@ -3,7 +3,7 @@ gov.nasa.jpl.ammos.ids.cws common-workflow-service - 2.6.0-pre.1 + 2.6.0 cws-installer diff --git a/cws-service/pom.xml b/cws-service/pom.xml index e2310289..2afc4400 100644 --- a/cws-service/pom.xml +++ b/cws-service/pom.xml @@ -4,7 +4,7 @@ gov.nasa.jpl.ammos.ids.cws common-workflow-service - 2.6.0-pre.1 + 2.6.0 cws-service diff --git a/cws-tasks/pom.xml b/cws-tasks/pom.xml index af11cd5a..52ed690e 100644 --- a/cws-tasks/pom.xml +++ b/cws-tasks/pom.xml @@ -4,7 +4,7 @@ gov.nasa.jpl.ammos.ids.cws common-workflow-service - 2.6.0-pre.1 + 2.6.0 cws-tasks diff --git a/cws-test/pom.xml b/cws-test/pom.xml index 6f189183..a1d3373c 100644 --- a/cws-test/pom.xml +++ b/cws-test/pom.xml @@ -3,7 +3,7 @@ gov.nasa.jpl.ammos.ids.cws common-workflow-service - 2.6.0-pre.1 + 2.6.0 cws-test diff --git a/cws-ui/pom.xml b/cws-ui/pom.xml index b986c342..44b4737d 100644 --- a/cws-ui/pom.xml +++ b/cws-ui/pom.xml @@ -5,7 +5,7 @@ gov.nasa.jpl.ammos.ids.cws common-workflow-service - 2.6.0-pre.1 + 2.6.0 cws-ui diff --git a/install/docker/console-db-es-ls-kibana/docker-compose.yml b/install/docker/console-db-es-ls-kibana/docker-compose.yml index c9cd71de..40f35cfb 100644 --- a/install/docker/console-db-es-ls-kibana/docker-compose.yml +++ b/install/docker/console-db-es-ls-kibana/docker-compose.yml @@ -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 @@ -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 diff --git a/install/docker/cws-image/build.sh b/install/docker/cws-image/build.sh index 75d9dd93..a1178da1 100755 --- a/install/docker/cws-image/build.sh +++ b/install/docker/cws-image/build.sh @@ -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) diff --git a/install/docker/worker-ls/docker-compose.yml b/install/docker/worker-ls/docker-compose.yml index 8b552196..d286386a 100644 --- a/install/docker/worker-ls/docker-compose.yml +++ b/install/docker/worker-ls/docker-compose.yml @@ -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 diff --git a/pom.xml b/pom.xml index 3149aac6..ff32c60f 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 gov.nasa.jpl.ammos.ids.cws common-workflow-service - 2.6.0-pre.1 + 2.6.0 pom cws CWS diff --git a/utils.sh b/utils.sh index a1c4c54d..864cbcca 100755 --- a/utils.sh +++ b/utils.sh @@ -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'