chore: allow examples to use older or newer versions of ockam

build-trust · Jun 19, 2024 · 0e78fef · 0e78fef
1 parent 8da0e79
commit 0e78fef
Show file tree

Hide file tree

Showing 92 changed files with 342 additions and 201 deletions.
diff --git a/examples/command/portals/ai/amazon_bedrock/ai_corp/run.sh b/examples/command/portals/ai/amazon_bedrock/ai_corp/run.sh
@@ -52,7 +52,8 @@ run() {
     aws ec2 create-key-pair --key-name "$key_name" --query 'KeyMaterial' > key.pem
     chmod 400 key.pem
 
-    sed "s/\$ENROLLMENT_TICKET/${enrollment_ticket}/g" run_ockam.sh > user_data.sh
+    sed "s/\$ENROLLMENT_TICKET/${enrollment_ticket}/g" run_ockam.sh > user_data1.sh
+    sed "s/\$OCKAM_VERSION/${OCKAM_VERSION}/g" user_data1.sh > user_data.sh
     instance_id=$(aws ec2 run-instances --image-id "$ami_id" --instance-type c5n.large \
         --subnet-id "$subnet_id" --security-group-ids "$sg_id" \
         --key-name "$key_name" --user-data file://user_data.sh --query 'Instances[0].InstanceId')
@@ -128,7 +129,7 @@ get_configured_region() {
 cleanup() {
     # ----------------------------------------------------------------------------------------------------------------
     # DELETE INSTANCE
-    rm -f user_data.sh
+    rm -f user_data*.sh
 
     instance_ids=$(aws ec2 describe-instances --filters "Name=tag:Name,Values=${name}-ec2-instance" \
         --query "Reservations[].Instances[?State.Name!='terminated'].InstanceId[]")

diff --git a/examples/command/portals/ai/amazon_bedrock/ai_corp/run_ockam.sh b/examples/command/portals/ai/amazon_bedrock/ai_corp/run_ockam.sh
@@ -7,6 +7,7 @@ sudo -u ec2-user bash << 'EOS'
 set -ex
 
 # Install Ockam Command
+export OCKAM_VERSION="$OCKAM_VERSION"
 curl --proto '=https' --tlsv1.2 -sSfL https://install.command.ockam.io | bash
 source "$HOME/.ockam/env"
 

diff --git a/examples/command/portals/ai/amazon_bedrock/health_corp/client.js b/examples/command/portals/ai/amazon_bedrock/health_corp/client.js
@@ -10,8 +10,8 @@ async function run() {
         console.log("Connected to the model.\n\nApp: ", query);
         const queryResponse = await fetch("http://127.0.0.1:3000/query", {
             method: "POST",
-            headers: {"Content-Type": "application/json"},
-            body: JSON.stringify({query}),
+            headers: { "Content-Type": "application/json" },
+            body: JSON.stringify({ query }),
             keepalive: true,
         });
 
@@ -23,6 +23,7 @@ async function run() {
 
         const answer = await queryResponse.json();
         console.log(answer['answer']);
+        console.log("\nThe example run was successful 🥳.");
     } catch (error) {
         console.log("Error:", error);
     }

diff --git a/examples/command/portals/ai/amazon_bedrock/health_corp/run.sh b/examples/command/portals/ai/amazon_bedrock/health_corp/run.sh
@@ -44,14 +44,14 @@ run() {
     aws ec2 create-key-pair --key-name "${name}-key" --query 'KeyMaterial' > key.pem
     chmod 400 key.pem
 
-    sed "s/\$ENROLLMENT_TICKET/${enrollment_ticket}/g" run_ockam.sh > user_data.sh
+    sed "s/\$ENROLLMENT_TICKET/${enrollment_ticket}/g" run_ockam.sh > user_data1.sh
+    sed "s/\$OCKAM_VERSION/${OCKAM_VERSION}/g" user_data1.sh > user_data.sh
     instance_id=$(aws ec2 run-instances --image-id "$ami_id" --instance-type c5n.large \
         --subnet-id "$subnet_id" --security-group-ids "$sg_id" \
         --key-name "${name}-key" --user-data file://user_data.sh --query 'Instances[0].InstanceId')
     aws ec2 create-tags --resources "$instance_id" --tags "Key=Name,Value=${name}-ec2-instance"
     aws ec2 wait instance-running --instance-ids "$instance_id"
     ip=$(aws ec2 describe-instances --instance-ids "$instance_id" --query 'Reservations[0].Instances[0].PublicIpAddress')
-    rm -f user_data.sh
 
     until scp -o StrictHostKeyChecking=no -i ./key.pem ./client.js "ec2-user@$ip:client.js"; do sleep 10; done
     ssh -o StrictHostKeyChecking=no -i ./key.pem "ec2-user@$ip" \
@@ -65,7 +65,7 @@ cleanup() {
     # ----------------------------------------------------------------------------------------------------------------
     # DELETE INSTANCE
 
-    rm -f user_data.sh
+    rm -rf user_data*.sh
     instance_ids=$(aws ec2 describe-instances --filters "Name=tag:Name,Values=${name}-ec2-instance" \
         --query "Reservations[].Instances[?State.Name!='terminated'].InstanceId[]")
     for i in $instance_ids; do

diff --git a/examples/command/portals/ai/amazon_bedrock/health_corp/run_ockam.sh b/examples/command/portals/ai/amazon_bedrock/health_corp/run_ockam.sh
@@ -7,6 +7,7 @@ sudo -u ec2-user bash << 'EOS'
 set -ex
 
 # Install Ockam Command
+export OCKAM_VERSION="$OCKAM_VERSION"
 curl --proto '=https' --tlsv1.2 -sSfL https://install.command.ockam.io | bash
 source "$HOME/.ockam/env"
 

diff --git a/examples/command/portals/ai/amazon_bedrock/run.sh b/examples/command/portals/ai/amazon_bedrock/run.sh
@@ -44,6 +44,10 @@ run() {
     health_corp_ticket=$(ockam project ticket --usage-count 1 --expires-in 60m \
         --attribute "ai-inlet=true")
 
+    if [[ -n "$OCKAM_VERSION" ]]; then
+        export OCKAM_VERSION="v${OCKAM_VERSION}";
+    fi
+
     # Invoke `ai_corp/run.sh` in the directory that has ai_corp's configuration. Pass the above
     # enrollment ticket as the first argument to run.sh script. Read ai_corp/run.sh to understand the parts
     # that are provisioned in ai_corp's virtual private cloud.

diff --git a/examples/command/portals/ai/amazon_ec2/ai_corp/run.sh b/examples/command/portals/ai/amazon_ec2/ai_corp/run.sh
@@ -47,7 +47,8 @@ run() {
     # make sure that the current region supports the instance required to run the model
     check_if_instance_type_available g5g.2xlarge
 
-    sed "s/\$ENROLLMENT_TICKET/${enrollment_ticket}/g" run_ockam.sh > user_data.sh
+    sed "s/\$ENROLLMENT_TICKET/${enrollment_ticket}/g" run_ockam.sh > user_data1.sh
+    sed "s/\$OCKAM_VERSION/${OCKAM_VERSION}/g" user_data1.sh > user_data.sh
     instance_id=$(aws ec2 run-instances --image-id "$ami_id" --instance-type g5g.2xlarge \
         --subnet-id "$subnet_id" --security-group-ids "$sg_id" \
         --key-name "${name}-key" --user-data file://user_data.sh --query 'Instances[0].InstanceId')
@@ -115,7 +116,7 @@ cleanup() {
     # ----------------------------------------------------------------------------------------------------------------
     # DELETE INSTANCE
 
-    rm -f user_data.sh
+    rm -f user_data*.sh
     instance_ids=$(aws ec2 describe-instances --filters "Name=tag:Name,Values=${name}-ec2-instance" \
         --query "Reservations[*].Instances[*].InstanceId")
     for i in $instance_ids; do

diff --git a/examples/command/portals/ai/amazon_ec2/ai_corp/run_ockam.sh b/examples/command/portals/ai/amazon_ec2/ai_corp/run_ockam.sh
@@ -7,6 +7,7 @@ sudo -u ec2-user bash << 'EOS'
 set -ex
 
 # Install Ockam Command
+export OCKAM_VERSION="$OCKAM_VERSION"
 curl --proto '=https' --tlsv1.2 -sSfL https://install.command.ockam.io | bash
 source "$HOME/.ockam/env"
 

diff --git a/examples/command/portals/ai/amazon_ec2/health_corp/client.js b/examples/command/portals/ai/amazon_ec2/health_corp/client.js
@@ -21,6 +21,7 @@ async function run() {
 
     const answer = await queryResponse.json();
     console.log(answer['answer']);
+    console.log("\nThe example run was successful 🥳.");
   } catch (error) {
     console.log("Error:", error.message);
   }

diff --git a/examples/command/portals/ai/amazon_ec2/health_corp/run.sh b/examples/command/portals/ai/amazon_ec2/health_corp/run.sh
@@ -44,7 +44,8 @@ run() {
     aws ec2 create-key-pair --key-name "${name}-key" --query 'KeyMaterial' > key.pem
     chmod 400 key.pem
 
-    sed "s/\$ENROLLMENT_TICKET/${enrollment_ticket}/g" run_ockam.sh > user_data.sh
+    sed "s/\$ENROLLMENT_TICKET/${enrollment_ticket}/g" run_ockam.sh > user_data1.sh
+    sed "s/\$OCKAM_VERSION/${OCKAM_VERSION}/g" user_data1.sh > user_data.sh
     instance_id=$(aws ec2 run-instances --image-id "$ami_id" --instance-type c5n.large \
         --subnet-id "$subnet_id" --security-group-ids "$sg_id" \
         --key-name "${name}-key" --user-data file://user_data.sh --query 'Instances[0].InstanceId')
@@ -65,7 +66,7 @@ cleanup() {
     # ----------------------------------------------------------------------------------------------------------------
     # DELETE INSTANCE
 
-    rm -f user_data.sh
+    rm -f user_data*.sh
     instance_ids=$(aws ec2 describe-instances --filters "Name=tag:Name,Values=${name}-ec2-instance" \
         --query "Reservations[*].Instances[*].InstanceId")
     for i in $instance_ids; do

diff --git a/examples/command/portals/ai/amazon_ec2/health_corp/run_ockam.sh b/examples/command/portals/ai/amazon_ec2/health_corp/run_ockam.sh
@@ -7,6 +7,7 @@ sudo -u ec2-user bash << 'EOS'
 set -ex
 
 # Install Ockam Command
+export OCKAM_VERSION="$OCKAM_VERSION"
 curl --proto '=https' --tlsv1.2 -sSfL https://install.command.ockam.io | bash
 source "$HOME/.ockam/env"
 

diff --git a/examples/command/portals/ai/amazon_ec2/run.sh b/examples/command/portals/ai/amazon_ec2/run.sh
@@ -44,6 +44,10 @@ run() {
     health_corp_ticket=$(ockam project ticket --usage-count 1 --expires-in 60m \
         --attribute "ai-inlet=true")
 
+    if [[ -n "$OCKAM_VERSION" ]]; then
+        export OCKAM_VERSION="v${OCKAM_VERSION}";
+    fi
+
     # Invoke `ai_corp/run.sh` in the directory that has ai_corp's configuration. Pass the above
     # enrollment ticket as the first argument to run.sh script. Read ai_corp/run.sh to understand the parts
     # that are provisioned in ai_corp's virtual private cloud.

diff --git a/examples/command/portals/apis/nodejs/amazon_ec2/aws_cli/monitoring_corp/run.sh b/examples/command/portals/apis/nodejs/amazon_ec2/aws_cli/monitoring_corp/run.sh
@@ -44,14 +44,14 @@ run() {
     aws ec2 create-key-pair --key-name "${name}-key" --query 'KeyMaterial' > key.pem
     chmod 400 key.pem
 
-    sed "s/\$ENROLLMENT_TICKET/${enrollment_ticket}/g" run_ockam.sh > user_data.sh
+    sed "s/\$ENROLLMENT_TICKET/${enrollment_ticket}/g" run_ockam.sh > user_data1.sh
+    sed "s/\$OCKAM_VERSION/${OCKAM_VERSION}/g" user_data1.sh > user_data.sh
     instance_id=$(aws ec2 run-instances --image-id "$ami_id" --instance-type t2.micro \
         --subnet-id "$subnet_id" --security-group-ids "$sg_id" \
         --key-name "${name}-key" --user-data file://user_data.sh --query 'Instances[0].InstanceId')
     aws ec2 create-tags --resources "$instance_id" --tags "Key=Name,Value=${name}-ec2-instance"
     aws ec2 wait instance-running --instance-ids "$instance_id"
     ip=$(aws ec2 describe-instances --instance-ids "$instance_id" --query 'Reservations[0].Instances[0].PublicIpAddress')
-    rm -f user_data.sh
 
     until scp -o StrictHostKeyChecking=no -i ./key.pem ./api.js "ec2-user@$ip:api.js"; do sleep 10; done
     ssh -o StrictHostKeyChecking=no -i ./key.pem "ec2-user@$ip" \
@@ -68,7 +68,7 @@ cleanup() {
     # ----------------------------------------------------------------------------------------------------------------
     # DELETE INSTANCE
 
-    rm -f user_data.sh
+    rm -f user_data*.sh
     instance_ids=$(aws ec2 describe-instances --filters "Name=tag:Name,Values=${name}-ec2-instance" \
         --query "Reservations[*].Instances[*].InstanceId")
     for i in $instance_ids; do

diff --git a/examples/command/portals/apis/nodejs/amazon_ec2/aws_cli/monitoring_corp/run_ockam.sh b/examples/command/portals/apis/nodejs/amazon_ec2/aws_cli/monitoring_corp/run_ockam.sh
@@ -7,6 +7,7 @@ sudo -u ec2-user bash << 'EOS'
 set -ex
 
 # Install Ockam Command
+export OCKAM_VERSION="$OCKAM_VERSION"
 curl --proto '=https' --tlsv1.2 -sSfL https://install.command.ockam.io | bash
 source "$HOME/.ockam/env"
 

diff --git a/examples/command/portals/apis/nodejs/amazon_ec2/aws_cli/run.sh b/examples/command/portals/apis/nodejs/amazon_ec2/aws_cli/run.sh
@@ -44,6 +44,10 @@ run() {
     travel_app_corp_ticket=$(ockam project ticket --usage-count 1 --expires-in 60m \
         --attribute "monitoring-api-inlet=true")
 
+    if [[ -n "$OCKAM_VERSION" ]]; then
+        export OCKAM_VERSION="v${OCKAM_VERSION}";
+    fi
+
     # Invoke `monitoring_corp/run.sh` in the directory that has monitoring_corp's configuration. Pass the above
     # enrollment ticket as the first argument to run.sh script. Read monitoring_corp/run.sh to understand the parts
     # that are provisioned in monitoring_corp's virtual private cloud.

diff --git a/examples/command/portals/apis/nodejs/amazon_ec2/aws_cli/travel_app_corp/run.sh b/examples/command/portals/apis/nodejs/amazon_ec2/aws_cli/travel_app_corp/run.sh
@@ -44,14 +44,14 @@ run() {
     aws ec2 create-key-pair --key-name "${name}-key" --query 'KeyMaterial' > key.pem
     chmod 400 key.pem
 
-    sed "s/\$ENROLLMENT_TICKET/${enrollment_ticket}/g" run_ockam.sh > user_data.sh
+    sed "s/\$ENROLLMENT_TICKET/${enrollment_ticket}/g" run_ockam.sh > user_data1.sh
+    sed "s/\$OCKAM_VERSION/${OCKAM_VERSION}/g" user_data1.sh > user_data.sh
     instance_id=$(aws ec2 run-instances --image-id "$ami_id" --instance-type t2.micro \
         --subnet-id "$subnet_id" --security-group-ids "$sg_id" \
         --key-name "${name}-key" --user-data file://user_data.sh --query 'Instances[0].InstanceId')
     aws ec2 create-tags --resources "$instance_id" --tags "Key=Name,Value=${name}-ec2-instance"
     aws ec2 wait instance-running --instance-ids "$instance_id"
     ip=$(aws ec2 describe-instances --instance-ids "$instance_id" --query 'Reservations[0].Instances[0].PublicIpAddress')
-    rm -f user_data.sh
 
     until scp -o StrictHostKeyChecking=no -i ./key.pem ./client.js "ec2-user@$ip:client.js"; do sleep 10; done
     ssh -o StrictHostKeyChecking=no -i ./key.pem "ec2-user@$ip" \
@@ -65,7 +65,7 @@ cleanup() {
     # ----------------------------------------------------------------------------------------------------------------
     # DELETE INSTANCE
 
-    rm -f user_data.sh
+    rm -rf user_data*.sh
     instance_ids=$(aws ec2 describe-instances --filters "Name=tag:Name,Values=${name}-ec2-instance" \
         --query "Reservations[*].Instances[*].InstanceId")
     for i in $instance_ids; do

diff --git a/examples/command/portals/apis/nodejs/amazon_ec2/aws_cli/travel_app_corp/run_ockam.sh b/examples/command/portals/apis/nodejs/amazon_ec2/aws_cli/travel_app_corp/run_ockam.sh
@@ -7,6 +7,7 @@ sudo -u ec2-user bash << 'EOS'
 set -ex
 
 # Install Ockam Command
+export OCKAM_VERSION="$OCKAM_VERSION"
 curl --proto '=https' --tlsv1.2 -sSfL https://install.command.ockam.io | bash
 source "$HOME/.ockam/env"
 

diff --git a/examples/command/portals/apis/python/amazon_ec2/aws_cli/monitoring_corp/run.sh b/examples/command/portals/apis/python/amazon_ec2/aws_cli/monitoring_corp/run.sh
@@ -44,7 +44,8 @@ run() {
     aws ec2 create-key-pair --key-name "${name}-key" --query 'KeyMaterial' > key.pem
     chmod 400 key.pem
 
-    sed "s/\$ENROLLMENT_TICKET/${enrollment_ticket}/g" run_ockam.sh > user_data.sh
+    sed "s/\$ENROLLMENT_TICKET/${enrollment_ticket}/g" run_ockam.sh > user_data1.sh
+    sed "s/\$OCKAM_VERSION/${OCKAM_VERSION}/g" user_data1.sh > user_data.sh
     instance_id=$(aws ec2 run-instances --image-id "$ami_id" --instance-type t2.micro \
         --subnet-id "$subnet_id" --security-group-ids "$sg_id" \
         --key-name "${name}-key" --user-data file://user_data.sh --query 'Instances[0].InstanceId')

diff --git a/examples/command/portals/apis/python/amazon_ec2/aws_cli/monitoring_corp/run_ockam.sh b/examples/command/portals/apis/python/amazon_ec2/aws_cli/monitoring_corp/run_ockam.sh
@@ -7,6 +7,7 @@ sudo -u ec2-user bash << 'EOS'
 set -ex
 
 # Install Ockam Command
+export OCKAM_VERSION="$OCKAM_VERSION"
 curl --proto '=https' --tlsv1.2 -sSfL https://install.command.ockam.io | bash
 source "$HOME/.ockam/env"
 

diff --git a/examples/command/portals/apis/python/amazon_ec2/aws_cli/run.sh b/examples/command/portals/apis/python/amazon_ec2/aws_cli/run.sh
@@ -45,6 +45,10 @@ run() {
     travel_app_corp_ticket=$(ockam project ticket --usage-count 1 --expires-in 60m \
         --attribute "monitoring-api-inlet=true")
 
+    if [[ -n "$OCKAM_VERSION" ]]; then
+        export OCKAM_VERSION="v${OCKAM_VERSION}";
+    fi
+
     # Invoke `monitoring_corp/run.sh` in the directory that has monitoring_corp's configuration. Pass the above
     # enrollment ticket as the first argument to run.sh script. Read monitoring_corp/run.sh to understand the parts
     # that are provisioned in monitoring_corp's virtual private cloud.

diff --git a/examples/command/portals/apis/python/amazon_ec2/aws_cli/travel_app_corp/run.sh b/examples/command/portals/apis/python/amazon_ec2/aws_cli/travel_app_corp/run.sh
@@ -44,14 +44,14 @@ run() {
     aws ec2 create-key-pair --key-name "${name}-key" --query 'KeyMaterial' > key.pem
     chmod 400 key.pem
 
-    sed "s/\$ENROLLMENT_TICKET/${enrollment_ticket}/g" run_ockam.sh > user_data.sh
+    sed "s/\$ENROLLMENT_TICKET/${enrollment_ticket}/g" run_ockam.sh > user_data1.sh
+    sed "s/\$OCKAM_VERSION/${OCKAM_VERSION}/g" user_data1.sh > user_data.sh
     instance_id=$(aws ec2 run-instances --image-id "$ami_id" --instance-type t2.micro \
         --subnet-id "$subnet_id" --security-group-ids "$sg_id" \
         --key-name "${name}-key" --user-data file://user_data.sh --query 'Instances[0].InstanceId')
     aws ec2 create-tags --resources "$instance_id" --tags "Key=Name,Value=${name}-ec2-instance"
     aws ec2 wait instance-running --instance-ids "$instance_id"
     ip=$(aws ec2 describe-instances --instance-ids "$instance_id" --query 'Reservations[0].Instances[0].PublicIpAddress')
-    rm -f user_data.sh
 
     until scp -o StrictHostKeyChecking=no -i ./key.pem ./client.py "ec2-user@$ip:client.py"; do sleep 10; done
     ssh -o StrictHostKeyChecking=no -i ./key.pem "ec2-user@$ip" \
@@ -68,7 +68,7 @@ cleanup() {
     # ----------------------------------------------------------------------------------------------------------------
     # DELETE INSTANCE
 
-    rm -f user_data.sh
+    rm -rf user_data*.sh
     instance_ids=$(aws ec2 describe-instances --filters "Name=tag:Name,Values=${name}-ec2-instance" \
         --query "Reservations[*].Instances[*].InstanceId")
     for i in $instance_ids; do

diff --git a/examples/command/portals/apis/python/amazon_ec2/aws_cli/travel_app_corp/run_ockam.sh b/examples/command/portals/apis/python/amazon_ec2/aws_cli/travel_app_corp/run_ockam.sh
@@ -7,6 +7,7 @@ sudo -u ec2-user bash << 'EOS'
 set -ex
 
 # Install Ockam Command
+export OCKAM_VERSION="$OCKAM_VERSION"
 curl --proto '=https' --tlsv1.2 -sSfL https://install.command.ockam.io | bash
 source "$HOME/.ockam/env"
 

diff --git a/examples/command/portals/coderepos/gitlab/amazon_ec2/aws_cli/analysis_corp/run.sh b/examples/command/portals/coderepos/gitlab/amazon_ec2/aws_cli/analysis_corp/run.sh
@@ -45,15 +45,15 @@ run() {
     aws ec2 create-key-pair --key-name "${name}-key" --query 'KeyMaterial' > key.pem
     chmod 400 key.pem
 
-    sed "s/\$ENROLLMENT_TICKET/${enrollment_ticket}/g" run_ockam.sh > run_ockam_temp.sh
-    cat run_repoaccess.sh run_ockam_temp.sh > user_data.sh
+    sed "s/\$ENROLLMENT_TICKET/${enrollment_ticket}/g" run_ockam.sh > user_data1.sh
+    sed "s/\$OCKAM_VERSION/${OCKAM_VERSION}/g" user_data1.sh > user_data2.sh
+    cat run_repoaccess.sh user_data2.sh > user_data.sh
     instance_id=$(aws ec2 run-instances --image-id "$ami_id" --instance-type c5n.large \
         --subnet-id "$subnet_id" --security-group-ids "$sg_id" \
         --key-name "${name}-key" --user-data file://user_data.sh --query 'Instances[0].InstanceId')
     aws ec2 create-tags --resources "$instance_id" --tags "Key=Name,Value=${name}-ec2-instance"
     aws ec2 wait instance-running --instance-ids "$instance_id"
     ip=$(aws ec2 describe-instances --instance-ids "$instance_id" --query 'Reservations[0].Instances[0].PublicIpAddress')
-    rm -f run_ockam_temp.sh user_data.sh
 
     until scp -o StrictHostKeyChecking=no -i ./key.pem ./app.js "ec2-user@$ip:app.js"; do sleep 10; done
     until scp -o StrictHostKeyChecking=no -i ./key.pem ../bank_corp/gitlab_rsa "ec2-user@$ip:gitlab_rsa"; do sleep 10; done
@@ -70,7 +70,8 @@ cleanup() {
     # ----------------------------------------------------------------------------------------------------------------
     # DELETE INSTANCE
 
-    rm -f run_ockam_temp.sh user_data.sh
+    rm -rf user_data*.sh
+    rm -rf run_repoaccess.sh
     instance_ids=$(aws ec2 describe-instances --filters "Name=tag:Name,Values=${name}-ec2-instance" \
         --query "Reservations[*].Instances[*].InstanceId")
     for i in $instance_ids; do

diff --git a/examples/command/portals/coderepos/gitlab/amazon_ec2/aws_cli/analysis_corp/run_ockam.sh b/examples/command/portals/coderepos/gitlab/amazon_ec2/aws_cli/analysis_corp/run_ockam.sh
@@ -7,6 +7,7 @@ sudo -u ec2-user bash << 'EOS'
 set -ex
 
 # Install Ockam Command
+export OCKAM_VERSION="$OCKAM_VERSION"
 curl --proto '=https' --tlsv1.2 -sSfL https://install.command.ockam.io | bash
 source "$HOME/.ockam/env"
 

diff --git a/examples/command/portals/coderepos/gitlab/amazon_ec2/aws_cli/bank_corp/run.sh b/examples/command/portals/coderepos/gitlab/amazon_ec2/aws_cli/bank_corp/run.sh
@@ -54,10 +54,12 @@ run() {
     aws ec2 create-key-pair --key-name "${name}-key" --query 'KeyMaterial' > key.pem
     chmod 400 key.pem
 
-    sed "s/\$ENROLLMENT_TICKET/${enrollment_ticket}/g" run_ockam.sh > run_ockam_temp.sh
+    sed "s/\$ENROLLMENT_TICKET/${enrollment_ticket}/g" run_ockam.sh > user_data1.sh
+    sed "s/\$OCKAM_VERSION/${OCKAM_VERSION}/g" user_data1.sh > user_data2.sh
     sed "s|PUBLIC_KEY=\$SSH_PUBLIC_KEY|PUBLIC_KEY='$SSH_PUBLIC_KEY'|g" run_gitlab.sh > run_gitlab_temp.sh
 
-    cat run_gitlab_temp.sh run_ockam_temp.sh > user_data.sh
+    cat run_gitlab_temp.sh user_data2.sh > user_data.sh
+
     instance_id=$(aws ec2 run-instances --image-id "$ami_id" --instance-type c5n.large \
         --subnet-id "$subnet1_id" --security-group-ids "$sg_id" \
         --key-name "${name}-key" --user-data file://user_data.sh --query 'Instances[0].InstanceId')
@@ -66,7 +68,6 @@ run() {
     ip=$(aws ec2 describe-instances --instance-ids "$instance_id" --query 'Reservations[0].Instances[0].PublicIpAddress')
     sleep 180
     check_gitlab_availability "$ip"
-    rm -f user_data.sh run_gitlab_temp.sh run_ockam_temp.sh
 }
 
 check_gitlab_availability() {
@@ -100,7 +101,8 @@ cleanup() {
     # ----------------------------------------------------------------------------------------------------------------
     # DELETE INSTANCE
 
-    rm -f user_data.sh run_gitlab_temp.sh run_ockam_temp.sh
+    rm -rf user_data*.sh
+    rm -rf run_gitlab_temp.sh
     rm -f gitlab_rsa gitlab_rsa.pub
     instance_ids=$(aws ec2 describe-instances --filters "Name=tag:Name,Values=${name}-gitlab-ec2" \
         --query "Reservations[*].Instances[*].InstanceId")

diff --git a/examples/command/portals/coderepos/gitlab/amazon_ec2/aws_cli/bank_corp/run_gitlab.sh b/examples/command/portals/coderepos/gitlab/amazon_ec2/aws_cli/bank_corp/run_gitlab.sh
@@ -98,4 +98,3 @@ curl -X POST -H "Content-Type: application/json" -H "Authorization: Bearer $ACCE
 
 echo "SSH key added successfully."
 echo "Setup complete"
-
diff --git a/examples/command/portals/coderepos/gitlab/amazon_ec2/aws_cli/bank_corp/run_ockam.sh b/examples/command/portals/coderepos/gitlab/amazon_ec2/aws_cli/bank_corp/run_ockam.sh
@@ -7,6 +7,7 @@ sudo -u ec2-user bash << 'EOS'
 set -ex
 
 # Install Ockam Command
+export OCKAM_VERSION="$OCKAM_VERSION"
 curl --proto '=https' --tlsv1.2 -sSfL https://install.command.ockam.io | bash
 source "$HOME/.ockam/env"
 

diff --git a/examples/command/portals/coderepos/gitlab/amazon_ec2/aws_cli/run.sh b/examples/command/portals/coderepos/gitlab/amazon_ec2/aws_cli/run.sh
@@ -44,6 +44,10 @@ run() {
     analysis_corp_ticket=$(ockam project ticket --usage-count 1 --expires-in 60m \
         --attribute "gitlab-inlet=true")
 
+    if [[ -n "$OCKAM_VERSION" ]]; then
+        export OCKAM_VERSION="v${OCKAM_VERSION}";
+    fi
+
     # Invoke `bank_corp/run.sh` in the directory that has bank_corp's configuration. Pass the above enrollment ticket
     # as the first argument to run.sh script. Read bank_corp/run.sh to understand the parts that are provisioned in
     # bank_corp's virtual private cloud.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -98,4 +98,3 @@ curl -X POST -H "Content-Type: application/json" -H "Authorization: Bearer $ACCE

		echo "SSH key added successfully."
		echo "Setup complete"