Skip to content

Commit a03508f

Browse files
noobsiecodernoobsiecoder
committed
edit: handles OPS in proper workspace
1 parent 597580b commit a03508f

File tree

1 file changed

+23
-18
lines changed

1 file changed

+23
-18
lines changed

‎.github/workflows/main.yaml‎

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ jobs:
8383
AZURE_TENANT: ${{ secrets.AZURE_TENANT }}
8484
AZURE_RESOURCE_GROUP: ${{ secrets.AZURE_RESOURCE_GROUP }}
8585
AZURE_VM_INSTANCE: ${{ secrets.AZURE_VM_INSTANCE }}
86+
AZURE_VMUSER: ${{ secrets.AZURE_VMUSER }}
8687
# This will run a script to check VM instance availability.
8788
run: |
8889
echo "Azure Cloud login..."
@@ -91,12 +92,12 @@ jobs:
9192
echo "Checking Azure health status..."
9293
script_content=$(cat scripts/check_docker_instance.sh)
9394
deploy_wrapper="
94-
mkdir -p ~/scripts
95-
cat > ~/scripts/check_docker_instance.sh << 'SCRIPT_END'
95+
mkdir -p /home/$AZURE_VMUSER/scripts
96+
cat > /home/$AZURE_VMUSER/scripts/check_docker_instance.sh << 'SCRIPT_END'
9697
$script_content
9798
SCRIPT_END
98-
chmod +x ~/scripts/check_docker_instance.sh
99-
~/scripts/check_docker_instance.sh
99+
chmod +x /home/$AZURE_VMUSER/scripts/check_docker_instance.sh
100+
/home/$AZURE_VMUSER/scripts/check_docker_instance.sh
100101
"
101102
102103
OUTPUT=$(az vm run-command invoke \
@@ -154,8 +155,9 @@ jobs:
154155
AZURE_TENANT: ${{ secrets.AZURE_TENANT }}
155156
AZURE_RESOURCE_GROUP: ${{ secrets.AZURE_RESOURCE_GROUP }}
156157
AZURE_VM_INSTANCE: ${{ secrets.AZURE_VM_INSTANCE }}
157-
GCP_SECRETS_FILE: ${{ secrets.GCP_SECRETS_FILE }}
158+
AZURE_VMUSER: ${{ secrets.AZURE_VMUSER }}
158159
APIKEYS_FILE: ${{ secrets.APIKEYS_FILE }}
160+
GCP_SECRETS_FILE: ${{ secrets.GCP_SECRETS_FILE }}
159161
GITHUB_REPO_URL: ${{ github.server_url }}/${{ github.repository }}.git
160162
GITHUB_BRANCH: "enhance-v1"
161163
if: env.azure_status == 'unavailable'
@@ -180,12 +182,12 @@ jobs:
180182
# Create and run deployment script
181183
script_content=$(cat scripts/starter.sh)
182184
deploy_wrapper="
183-
mkdir -p ~/scripts
184-
cat > ~/scripts/starter.sh << 'SCRIPT_END'
185+
mkdir -p /home/$AZURE_VMUSER/scripts
186+
cat > /home/$AZURE_VMUSER/scripts/starter.sh << 'SCRIPT_END'
185187
$script_content
186188
SCRIPT_END
187-
chmod +x ~/scripts/starter.sh
188-
~/scripts/starter.sh '$GITHUB_REPO_URL' '$GITHUB_BRANCH' '$GCP_SECRETS_FILE' '$APIKEYS_FILE'
189+
chmod +x /home/$AZURE_VMUSER/scripts/starter.sh
190+
/home/$AZURE_VMUSER/scripts/starter.sh '$GITHUB_REPO_URL' '$GITHUB_BRANCH' '$GCP_SECRETS_FILE' '$APIKEYS_FILE'
189191
"
190192
191193
OUTPUT=$(az vm run-command invoke \
@@ -212,6 +214,7 @@ jobs:
212214
AZURE_TENANT: ${{ secrets.AZURE_TENANT }}
213215
AZURE_RESOURCE_GROUP: ${{ secrets.AZURE_RESOURCE_GROUP }}
214216
AZURE_VM_INSTANCE: ${{ secrets.AZURE_VM_INSTANCE }}
217+
AZURE_VMUSER: ${{ secrets.AZURE_VMUSER }}
215218
APIKEYS_FILE: ${{ secrets.APIKEYS_FILE }}
216219
GCP_SECRETS_FILE: ${{ secrets.GCP_SECRETS_FILE }}
217220
GITHUB_REPO_URL: ${{ github.server_url }}/${{ github.repository }}.git
@@ -225,12 +228,12 @@ jobs:
225228
# Create and run deployment script
226229
script_content=$(cat scripts/starter.sh)
227230
deploy_wrapper="
228-
mkdir -p ~/scripts
229-
cat > ~/scripts/starter.sh << 'SCRIPT_END'
231+
mkdir -p /home/$AZURE_VMUSER/scripts
232+
cat > /home/$AZURE_VMUSER/scripts/starter.sh << 'SCRIPT_END'
230233
$script_content
231234
SCRIPT_END
232-
chmod +x ~/scripts/starter.sh
233-
~/scripts/starter.sh '$GITHUB_REPO_URL' '$GITHUB_BRANCH' '$GCP_SECRETS_FILE' '$APIKEYS_FILE'
235+
chmod +x /home/$AZURE_VMUSER/scripts/starter.sh
236+
/home/$AZURE_VMUSER/scripts/starter.sh '$GITHUB_REPO_URL' '$GITHUB_BRANCH' '$GCP_SECRETS_FILE' '$APIKEYS_FILE'
234237
"
235238
236239
OUTPUT=$(az vm run-command invoke \
@@ -263,6 +266,7 @@ jobs:
263266
GCP_CERT: ${{ secrets.GCP_CERT }}
264267
GCP_CERT_URI: ${{ secrets.GCP_CERT_URI }}
265268
GCP_DOMAIN: ${{ secrets.GCP_DOMAIN }}
269+
GCP_VMUSER: ${{ secrets.GCP_VMUSER }}
266270
GCP_INSTANCE_NAME: ${{ secrets.GCP_INSTANCE_NAME }}
267271
GCP_INSTANCE_ZONE: ${{ secrets.GCP_INSTANCE_ZONE }}
268272
if: env.azure_status != 'available' && env.azure_status != 'success'
@@ -326,13 +330,13 @@ jobs:
326330
fi
327331
else
328332
echo "Copying check script to GCP VM"
329-
gcloud compute scp scripts/checker_docker_instance.sh $GCP_INSTANCE_NAME:~/checker_docker_instance.sh --zone=$GCP_INSTANCE_ZONE
333+
gcloud compute scp scripts/checker_docker_instance.sh $GCP_INSTANCE_NAME:/home/$GCP_VMUSER/checker_docker_instance.sh --zone=$GCP_INSTANCE_ZONE
330334
331335
echo "Checking GCP VM for running containers..."
332336
# Run the check script on GCP instance
333337
output=$(gcloud compute ssh $GCP_INSTANCE_NAME \
334338
--zone=$GCP_INSTANCE_ZONE \
335-
--command="chmod +x ~/check_docker_instance.sh && ~/check_docker_instance.sh" \
339+
--command="chmod +x /home/$GCP_VMUSER/check_docker_instance.sh && /home/$GCP_VMUSER/check_docker_instance.sh" \
336340
--ssh-flag="-o ConnectTimeout=10" \
337341
2>&1)
338342
@@ -383,10 +387,11 @@ jobs:
383387
GCP_CERT: ${{ secrets.GCP_CERT }}
384388
GCP_CERT_URI: ${{ secrets.GCP_CERT_URI }}
385389
GCP_DOMAIN: ${{ secrets.GCP_DOMAIN }}
390+
GCP_VMUSER: ${{ secrets.GCP_VMUSER }}
386391
GCP_INSTANCE_NAME: ${{ secrets.GCP_INSTANCE_NAME }}
387392
GCP_INSTANCE_ZONE: ${{ secrets.GCP_INSTANCE_ZONE }}
388-
GCP_SECRETS_FILE: ${{ secrets.GCP_SECRETS_FILE }}
389393
APIKEYS_FILE: ${{ secrets.APIKEYS_FILE }}
394+
GCP_SECRETS_FILE: ${{ secrets.GCP_SECRETS_FILE }}
390395
GITHUB_REPO_URL: ${{ github.server_url }}/${{ github.repository }}.git
391396
GITHUB_BRANCH: "enhance-v1"
392397
if: env.azure_status != 'available' && env.azure_status != 'success' && env.gcp_status == 'available'
@@ -420,12 +425,12 @@ jobs:
420425
421426
# Execute deployment on GCP VM
422427
echo "Copying starter script to GCP VM"
423-
gcloud compute scp scripts/starter.sh $GCP_INSTANCE_NAME:~/starter.sh --zone=$GCP_INSTANCE_ZONE
428+
gcloud compute scp scripts/starter.sh $GCP_INSTANCE_NAME:/home/$GCP_VMUSER/starter.sh --zone=$GCP_INSTANCE_ZONE
424429
425430
echo "Running in GCP VM..."
426431
gcloud compute ssh $GCP_INSTANCE_NAME \
427432
--zone=$GCP_INSTANCE_ZONE \
428-
--command="chmod +x ~/starter.sh && ~/starter.sh '$GITHUB_REPO_URL' '$GITHUB_BRANCH' '$GCP_SECRETS_FILE' '$APIKEYS_FILE'" \
433+
--command="chmod +x /home/$GCP_VMUSER/starter.sh && /home/$GCP_VMUSER/starter.sh '$GITHUB_REPO_URL' '$GITHUB_BRANCH' '$GCP_SECRETS_FILE' '$APIKEYS_FILE'" \
429434
--ssh-flag="-o ConnectTimeout=30"
430435
431436
if [ $? -eq 0 ]; then

0 commit comments

Comments
 (0)