Fix Swift scaler E2E test enviroment variables (#1747)

Signed-off-by: Pedro Felipe Dominguite <p.dominguite@sidi.org.br>
kedacore · Apr 19, 2021 · 33c3cdb · 33c3cdb
1 parent aefaba8
commit 33c3cdb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/tests/scalers/openstack-swift.test.ts b/tests/scalers/openstack-swift.test.ts
@@ -214,7 +214,7 @@ test.serial('Deployment should be scaled to 0 after deleting all objects in cont
       t.fail(`Could not delete all objects inside container to test scaling to zero. Swift API returned: ${response}`)
     }
 
-    for (let i = 0; i < 20 && replicaCount !== '0'; i++) {
+    for (let i = 0; i < 30 && replicaCount !== '0'; i++) {
       replicaCount = sh.exec(
           `kubectl get deployment.apps/${deploymentName} --namespace ${testNamespace} -o jsonpath="{.spec.replicas}"`
       ).stdout
@@ -227,7 +227,7 @@ test.serial('Deployment should be scaled to 0 after deleting all objects in cont
     t.is(
       replicaCount,
       '0',
-      'Replica count should be 0 after creating ScaledObject'
+      'Replica count should be 0 after deleting all objects in container'
     )
   } catch (err) {
     t.fail(err.message)

diff --git a/tests/scalers/openstack/openstack-helper.ts b/tests/scalers/openstack/openstack-helper.ts
@@ -6,7 +6,7 @@ const requestTimeout = 30000
 
 const keystoneClient: AxiosInstance = axios.create({
     url: '/v3/auth/tokens',
-    baseURL: process.env['OS_AUTH_URL'],
+    baseURL: process.env['OPENSTACK_AUTH_URL'],
     timeout: requestTimeout
 })
 
@@ -47,7 +47,7 @@ class OpenstackHelperClient {
     // It will use the service URL provided by the user. If not provided, it will look for the URL into the Openstack catalog
     private static async getCredentials(osServiceName: string, osServiceURL ?: string): Promise<Credentials> {
         const credentials = <Credentials>{}
-        const osRegion = process.env['OS_REGION_NAME']
+        const osRegion = process.env['OPENSTACK_REGION_NAME']
 
         try {
             const response = await keystoneClient.request({
@@ -61,14 +61,14 @@ class OpenstackHelperClient {
                             ],
                             "password": {
                                 "user": {
-                                    "id": process.env['OS_USER_ID'],
-                                    "password": process.env['OS_PASSWORD']
+                                    "id": process.env['OPENSTACK_USER_ID'],
+                                    "password": process.env['OPENSTACK_PASSWORD']
                                 }
                             }
                         },
                         "scope": {
                             "project": {
-                                "id": process.env['OS_PROJECT_ID']
+                                "id": process.env['OPENSTACK_PROJECT_ID']
                             }
                         }
                     }