Browse Source

Minor fixes

Phyks (Lucas Verney) 5 months ago
parent
commit
4331a51e28
2 changed files with 3 additions and 3 deletions
  1. 2
    2
      ovh_orchestrator/__main__.py
  2. 1
    1
      run.sh

+ 2
- 2
ovh_orchestrator/__main__.py View File

@@ -23,7 +23,7 @@ if __name__ == '__main__':
23 23
         # Get image id
24 24
         result = client.get(
25 25
             '/cloud/project/' + config.ovh_public_cloud_project + '/image',
26
-            flavorType='s1-2',
26
+            flavorType=config.ovh_public_cloud_flavor,
27 27
             osType='linux',
28 28
             region=config.ovh_public_cloud_region,
29 29
         )
@@ -52,7 +52,7 @@ if __name__ == '__main__':
52 52
         flavor_id = next(
53 53
             x['id']
54 54
             for x in result
55
-            if x['name'] == 's1-2'
55
+            if x['name'] == config.ovh_public_cloud_flavor
56 56
         )
57 57
 
58 58
         # Create instance

+ 1
- 1
run.sh View File

@@ -23,7 +23,7 @@ if [ "$1" == "" ] || [ $# -gt 1 ]; then
23 23
     # Run the build on the OVH instance
24 24
     scp -o "StrictHostKeyChecking=no" -o "UserKnownHostsFile=/dev/null" ./build_android.sh ubuntu@${IP_ADDRESS}:~
25 25
     # Build /e/ (or edit the BUILD_FLAVOR environment variable)
26
-    ssh -o "StrictHostKeyChecking=no" -o "UserKnownHostsFile=/dev/null" -f ubuntu@${IP_ADDRESS} 'screen -S build -dm bash BUILD_FLAVOR=e ./build_android.sh'
26
+    ssh -o "StrictHostKeyChecking=no" -o "UserKnownHostsFile=/dev/null" -f ubuntu@${IP_ADDRESS} 'BUILD_FLAVOR=e screen -S build -dm bash ./build_android.sh'
27 27
 else
28 28
     IP_ADDRESS="$1"
29 29
 fi