Release 2.1.0

deploy/clone-pro.sh

@@ -0,0 +1,30 @@
+#!/bin/bash
+set -e -u -o pipefail
+
+# Requirements: vendorlink SSH channel open with spintldhis01, stintldhis01, sdintldhis01.
+
+cd "$(dirname "$0")"
+source "./lib.sh"
+
+clone() {
+    setup_training
+    image_pro=$(run spintldhis01 bash -x push-pro-docker.sh --skip_dump)
+    run stintldhis01 bash deploy-test-from-pro.sh "$image_pro"
+    run stintldhis01 bash -x deploy-training-from-pro.sh "$image_pro"
+    run sdintldhis01 bash -x deploy-dev-from-pro.sh "$image_pro"
+}
+
+setup_training() {
+    local repo_url="https://github.com/eyeseetea/project-monitoring-app"
+
+    if test -e "project-monitoring-app"; then
+        cd "project-monitoring-app"
+        git fetch
+        cd ..
+    else
+        git clone "$repo_url"
+    fi
+
+}
+
+clone

deploy/deploy-dev-from-pro.sh

@@ -0,0 +1,49 @@
+#!/bin/bash
+# shellcheck disable=SC2001
+
+set -e -u -o pipefail
+
+cd "$(dirname "$0")"
+script_dir=$(pwd)
+source "./lib.sh"
+source "./tasks.sh"
+
+start_from_pro() {
+    local url=$1 image_pro=$2
+    image=$(echo "$image_pro" | sed "s/ip-pro/ip-dev/")
+
+    export TMPDIR=/data/tmp
+
+    local image_running
+    image_running=$(d2-docker list | grep RUN | awk '{print $1}' | grep -m1 ip-dev) || true
+
+    if test "$image_running"; then
+        d2-docker commit "$image_running"
+        docker tag "$image_running" "$image_running-$(timestamp)"
+        d2-docker stop "$image_running"
+    fi
+
+    d2-docker pull "$image_pro"
+    docker tag "$image_pro" "$image"
+    sudo image="$image" /usr/local/bin/start-dhis2-dev
+
+    wait_for_dhis2_server "$url"
+}
+
+post_clone() {
+    local url=$1
+
+    change_server_name "$url" "SP Platform - DEV"
+    set_logos "$url" "$script_dir/icons/dev"
+    set_email_password "$url"
+}
+
+main() {
+    local image_pro=$1
+    url=$(get_url 80)
+
+    start_from_pro "$url" "$image_pro"
+    post_clone "$url"
+}
+
+main "$@"

deploy/deploy-test-from-pro.sh

@@ -6,21 +6,22 @@ script_dir=$(pwd)
 source "./lib.sh"
 source "./tasks.sh"
 
-image_test="docker.eyeseetea.com/samaritans/dhis2-data:40.4.0-sp-ip-test"
-
 start_from_pro() {
-    local url=$1
-    local image_test_running
+    local url=$1 image_pro=$2
+    # shellcheck disable=SC2001
+    image_test=$(echo "$image_pro" | sed "s/ip-pro/ip-test/")
+
+    local running_image
+    running_image=$(d2-docker list | grep RUN | awk '{print $1}' | grep -m1 ip-test) || true
 
-    image_test_running=$(d2-docker list | grep RUN | awk '{print $1}' | grep -m1 ip-test) || true
-    if test "$image_test_running"; then
-        d2-docker commit "$image_test_running"
-        d2-docker copy "$image_test_running" "backup/sp-ip-test-$(timestamp)"
-        d2-docker stop "$image_test_running"
+    if test "$running_image"; then
+        d2-docker commit "$running_image"
+        docker tag "$running_image" "$running_image-$(timestamp)"
+        d2-docker stop "$running_image"
     fi
 
     d2-docker pull "$image_pro"
-    d2-docker copy "$image_pro" "$image_test"
+    docker tag "$image_pro" "$image_test"
     sudo image=$image_test /usr/local/bin/start-dhis2-test
 
     wait_for_dhis2_server "$url"
@@ -29,9 +30,10 @@ start_from_pro() {
 post_clone() {
     local url=$1
 
-    #set_email_password "$url"
     change_server_name "$url" "SP Platform - Test"
     set_logos "$url" "$script_dir/test-icons"
+    set_email_password "$url"
+    run_analytics "$url"
 }
 
 main() {

deploy/deploy-training-from-pro.sh

@@ -0,0 +1,100 @@
+#!/bin/bash
+set -e -u -o pipefail
+
+cd "$(dirname "$0")"
+script_dir=$(pwd)
+source "./lib.sh"
+source "./tasks.sh"
+
+load_training_projects() {
+    local url=$1
+    cd "$script_dir/project-monitoring-app" || return 1
+    yarn ts-node src/scripts/projects.ts --url="$url" import training-projects.json
+}
+
+training_post_clone() {
+    local url=$1
+    set_email_password "$url"
+    enable_users "$url" "traindatareviewer,traindataviewer,traindataentry"
+    change_server_name "$url" "SP Platform - Training"
+    add_users_to_maintainer_roles "$url"
+    set_logos "$url" "$script_dir/icons/training"
+    run_analytics "$url"
+}
+
+get_app_version() {
+    local url=$1
+    curl -sS -u "$auth" "$url/api/apps" |
+        jq '.[] | select(.key == "Data-Management-App").version' -r
+}
+
+get_project_monitoring_app_source() {
+    local url=$1
+
+    app_version=$(get_app_version "$url")
+    cd "$script_dir" || return 1
+
+    # Connection to github is flaky from SP servers, clone locally and rsync it (before the script is run)
+    cd "project-monitoring-app" || return 1
+
+    git checkout v"$app_version" -f
+    yarn install
+    yarn add [email protected]
+    yarn localize
+}
+
+save_last_training_projects() {
+    local url=$1
+    date=$(date --date="60 day ago" "+%Y-%m-%d")
+    cd "$script_dir/project-monitoring-app" || return 1
+    yarn ts-node src/scripts/projects.ts --url="$url" --from="$date" export training-projects.json
+}
+
+delete_projects() {
+    local image_training=$1
+    d2-docker run-sql -i "$image_training" "$script_dir/sql/create-guest-user.sql"
+    d2-docker run-sql -i "$image_training" "$script_dir/sql/empty_data_tables_228.sql"
+    d2-docker run-sql -i "$image_training" "$script_dir/sql/delete-projects.sql"
+}
+
+start_from_pro() {
+    local url=$1 image_pro=$2
+    # shellcheck disable=SC2001
+    image_training=$(echo "$image_pro" | sed "s/ip-pro/ip-training/")
+
+    {
+        d2-docker pull "$image_pro"
+        if test 1 = 2; then
+            current_image=$(d2-docker list | grep RUN | awk '{print $1}' | grep -m1 ip-training) || true
+
+            if test "$current_image"; then
+                d2-docker commit "$current_image"
+                docker tag "$current_image" "$current_image-$(timestamp)"
+                d2-docker stop "$current_image"
+            fi
+
+            docker tag "$image_pro" "$image_training"
+            sudo image="$image_training" /usr/local/bin/start-dhis2-training
+            wait_for_dhis2_server "$url"
+        fi
+    } >&2
+
+    echo "$image_training"
+}
+
+main() {
+    local image_pro=$1
+    url=$(get_url 81)
+
+    if curl -s "$url"; then
+        get_project_monitoring_app_source "$url"
+        save_last_training_projects "$url"
+    fi
+
+    image_training=$(start_from_pro "$url" "$image_pro")
+    delete_projects "$image_training"
+    load_training_projects "$url"
+    training_post_clone "$url"
+}
+
+main "$@"

deploy/lib.sh

@@ -2,10 +2,6 @@
 script_dir="$(dirname "$(readlink -f "${BASH_SOURCE[0]:-$0}")")"
 source "$script_dir/auth.sh"
 
-export image_pro="docker.eyeseetea.com/eyeseetea/dhis2-data:2.36.11.1-sp-ip-pro"
-export image_dev="docker.eyeseetea.com/samaritans/dhis2-data:2.36.11.1-sp-ip-dev"
-export image_training="docker.eyeseetea.com/samaritans/dhis2-data:2.36.11.1-sp-ip-training"
-
 debug() {
     echo "$@" >&2
 }
@@ -20,7 +16,7 @@ run() {
     local command=$2
     shift 2
 
-    debug "Copy deploy folder"
+    debug "Copy deploy folder to $host"
     rsync -a . "$host":deploy/
     debug "Run: $command $*"
     ssh "$host" "cd deploy &&" "$command" "$@"
@@ -30,7 +26,7 @@ wait_for_dhis2_server() {
     local url=$url
     local port
     port=$(echo "$url" | grep -o ':[[:digit:]]*$' | cut -d: -f2)
-    echo "Wait for server: port=$port"
+    debug "Wait for server: port=$port"
 
     while ! curl -sS -f "http://localhost:$port"; do
         sleep 10