Merge pull request #302 from CloudVE/fix_tox_vm_type

Pass in vm_type and other misc fixes
CloudVE · Aug 11, 2022 · 0fc9b96 · 0fc9b96
2 parents 4ce0d82 + 55fad49
commit 0fc9b96
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml
@@ -77,6 +77,7 @@ jobs:
           # aws
           AWS_ACCESS_KEY: ${{ secrets.AWS_ACCESS_KEY }}
           AWS_SECRET_KEY: ${{ secrets.AWS_SECRET_KEY }}
+          CB_VM_TYPE_AWS: ${{ secrets.CB_VM_TYPE_AWS }}
           # azure
           AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
           AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
@@ -89,6 +90,7 @@ jobs:
           # gcp
           GCP_SERVICE_CREDS_DICT: ${{ secrets.GCP_SERVICE_CREDS_DICT }}
           CB_IMAGE_GCP: ${{ secrets.CB_IMAGE_GCP }}
+          CB_VM_TYPE_GCP: ${{ secrets.CB_VM_TYPE_GCP }}
           # openstack
           OS_AUTH_URL: ${{ secrets.OS_AUTH_URL }}
           OS_PASSWORD: ${{ secrets.OS_PASSWORD }}
@@ -101,6 +103,7 @@ jobs:
           OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
           OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
           CB_IMAGE_OS: ${{ secrets.CB_IMAGE_OS }}
+          CB_VM_TYPE_OS: ${{ secrets.CB_VM_TYPE_OS }}
           CB_PLACEMENT_OS: ${{ secrets.CB_PLACEMENT_OS }}
 
       - name: Create Build Status Badge

diff --git a/setup.py b/setup.py
@@ -36,7 +36,7 @@
     'azure-common<2.0.0',
     'azure-mgmt-devtestlabs<10.0.0',
     'azure-mgmt-resource<22.0.0',
-    'azure-mgmt-compute<28.0.0',
+    'azure-mgmt-compute>=27.2.0,<28.0.0',
     'azure-mgmt-network<22.0.0',
     'azure-mgmt-storage<21.0.0',
     'azure-storage-blob<13.0.0',

diff --git a/tox.ini b/tox.ini
@@ -23,11 +23,11 @@ setenv =
     COVERAGE_FILE=.coverage.{envname}
 passenv =
     PYTHONUNBUFFERED
-    aws: CB_IMAGE_AWS CB_INSTANCE_TYPE_AWS CB_PLACEMENT_AWS AWS_ACCESS_KEY AWS_SECRET_KEY
-    azure: CB_IMAGE_AZURE AZURE_SUBSCRIPTION_ID AZURE_CLIENT_ID AZURE_SECRET AZURE_TENANT AZURE_REGION_NAME AZURE_RESOURCE_GROUP AZURE_STORAGE_ACCOUNT AZURE_VM_DEFAULT_USER_NAME AZURE_PUBLIC_KEY_STORAGE_TABLE_NAME
-    gcp: CB_IMAGE_GCP CB_INSTANCE_TYPE_GCP CB_PLACEMENT_GCP GCP_DEFAULT_REGION GCP_DEFAULT_ZONE GCP_PROJECT_NAME GCP_SERVICE_CREDS_FILE GCP_SERVICE_CREDS_DICT
-    openstack:  CB_IMAGE_OS CB_INSTANCE_TYPE_OS CB_PLACEMENT_OS OS_AUTH_URL OS_PASSWORD OS_PROJECT_NAME OS_TENANT_NAME OS_USERNAME OS_REGION_NAME OS_USER_DOMAIN_NAME OS_PROJECT_DOMAIN_NAME NOVA_SERVICE_NAME OS_APPLICATION_CREDENTIAL_ID OS_APPLICATION_CREDENTIAL_SECRET
-    mock: CB_IMAGE_AWS CB_INSTANCE_TYPE_AWS CB_PLACEMENT_AWS AWS_ACCESS_KEY AWS_SECRET_KEY
+    aws: CB_IMAGE_AWS CB_VM_TYPE_AWS CB_PLACEMENT_AWS AWS_ACCESS_KEY AWS_SECRET_KEY
+    azure: CB_IMAGE_AZURE CB_VM_TYPE_AZURE AZURE_SUBSCRIPTION_ID AZURE_CLIENT_ID AZURE_SECRET AZURE_TENANT AZURE_REGION_NAME AZURE_RESOURCE_GROUP AZURE_STORAGE_ACCOUNT AZURE_VM_DEFAULT_USER_NAME AZURE_PUBLIC_KEY_STORAGE_TABLE_NAME
+    gcp: CB_IMAGE_GCP CB_VM_TYPE_GCP CB_PLACEMENT_GCP GCP_DEFAULT_REGION GCP_DEFAULT_ZONE GCP_PROJECT_NAME GCP_SERVICE_CREDS_FILE GCP_SERVICE_CREDS_DICT
+    openstack:  CB_IMAGE_OS CB_VM_TYPE_OS CB_PLACEMENT_OS OS_AUTH_URL OS_PASSWORD OS_PROJECT_NAME OS_TENANT_NAME OS_USERNAME OS_REGION_NAME OS_USER_DOMAIN_NAME OS_PROJECT_DOMAIN_NAME NOVA_SERVICE_NAME OS_APPLICATION_CREDENTIAL_ID OS_APPLICATION_CREDENTIAL_SECRET
+    mock: CB_IMAGE_AWS CB_VM_TYPE_AWS CB_PLACEMENT_AWS AWS_ACCESS_KEY AWS_SECRET_KEY
 deps =
     -rrequirements.txt
     coverage<5