Improve tests

ballerina-platform · May 30, 2022 · 5b91e99 · 5b91e99
1 parent c18d2bc
commit 5b91e99
Show file tree

Hide file tree

Showing 6 changed files with 121 additions and 247 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -14,11 +14,13 @@ jobs:
               MONGO_INITDB_ROOT_PASSWORD: admin
           mongodb-ssl:
             image: rzhilkibaev/mongo-x509-auth-ssl:latest
+
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v3
             - name: Set up JDK 11
-              uses: actions/setup-java@v1
+              uses: actions/setup-java@v3
               with:
+                distribution: 'zulu'
                 java-version: 11 
             - name: Grant execute permission for gradlew
               run: chmod +x gradlew
@@ -31,36 +33,39 @@ jobs:
               run: |
                 ./gradlew build
      
-            - name: Ballerina Build W/O tests
+            - name: Ballerina Build
               uses: ballerina-platform/ballerina-action/@nightly
               with:
                 args:
                   pack mongodb
               env:
                 JAVA_HOME: /usr/lib/jvm/default-jvm
                 JAVA_OPTS: -DBALLERINA_DEV_COMPILE_BALLERINA_ORG=true
-            - name: Ballerina Build W/ tests
+
+            - name: SSL Tests
               uses: ballerina-platform/ballerina-action/@nightly
               with:
                 args:
-                  test --groups mongodb --code-coverage mongodb
+                  test --groups mongodb-ssl --code-coverage
               env:
                 JAVA_HOME: /usr/lib/jvm/default-jvm
                 # Following credentials are only used during testing in docker container
-                MONGODB_HOST: mongodb
-                MONGODB_USER: admin
-                MONGODB_PASSWORD: admin
-            - name: Ballerina Build W/ tests (SSL)
+                WORKING_DIR: ./mongodb
+                MONGODB_HOST: mongodb-ssl
+                MONGODB_USER: C=US,ST=CA,L=San Francisco,O=Jaspersoft,OU=JSDev,CN=admin
+
+            - name: MongoDB Tests
               uses: ballerina-platform/ballerina-action/@nightly
               with:
                 args:
-                  test --groups mongodb-ssl --code-coverage
+                  test --groups mongodb --code-coverage mongodb
               env:
                 JAVA_HOME: /usr/lib/jvm/default-jvm
                 # Following credentials are only used during testing in docker container
-                WORKING_DIR: ./mongodb
-                MONGODB_HOST: mongodb-ssl
-                MONGODB_USER: C=US,ST=CA,L=San Francisco,O=Jaspersoft,OU=JSDev,CN=admin
+                MONGODB_HOST: mongodb
+                MONGODB_USER: admin
+                MONGODB_PASSWORD: admin
+
 
             # Read the ballerina test results
             - name: Read Ballerina Test Results

diff --git a/.github/workflows/daily-build.yml b/.github/workflows/daily-build.yml
@@ -17,13 +17,15 @@ jobs:
               MONGO_INITDB_ROOT_PASSWORD: admin
           mongodb-ssl:
             image: rzhilkibaev/mongo-x509-auth-ssl:latest
+
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v3
 
             # Set up Java Environment
             - name: Set up JDK 11
-              uses: actions/setup-java@v1
+              uses: actions/setup-java@v3
               with:
+                distribution: 'zulu'
                 java-version: 11 
 
             # Grant execute permission to the gradlew script
@@ -39,29 +41,29 @@ jobs:
               run: |
                 ./gradlew build
             
-            - name: Ballerina Build W/ tests
+            - name: SSL Tests
               uses: ballerina-platform/ballerina-action/@nightly
               with:
                 args:
-                  test --groups mongodb --code-coverage mongodb
+                  test --groups mongodb-ssl --code-coverage
               env:
                 JAVA_HOME: /usr/lib/jvm/default-jvm
                 # Following credentials are only used during testing in docker container
-                MONGODB_HOST: mongodb
-                MONGODB_USER: admin
-                MONGODB_PASSWORD: admin
+                WORKING_DIR: ./mongodb
+                MONGODB_HOST: mongodb-ssl
+                MONGODB_USER: C=US,ST=CA,L=San Francisco,O=Jaspersoft,OU=JSDev,CN=admin
 
-            - name: Ballerina Build W/ tests (SSL)
+            - name: MongoDB Tests
               uses: ballerina-platform/ballerina-action/@nightly
               with:
                 args:
-                  test --groups mongodb-ssl --code-coverage
+                  test --groups mongodb --code-coverage mongodb
               env:
                 JAVA_HOME: /usr/lib/jvm/default-jvm
                 # Following credentials are only used during testing in docker container
-                WORKING_DIR: ./mongodb
-                MONGODB_HOST: mongodb-ssl
-                MONGODB_USER: C=US,ST=CA,L=San Francisco,O=Jaspersoft,OU=JSDev,CN=admin
+                MONGODB_HOST: mongodb
+                MONGODB_USER: admin
+                MONGODB_PASSWORD: admin
 
             # Read the ballerina test results
             - name: Read Ballerina Test Results

diff --git a/.github/workflows/dev-stg-release.yml b/.github/workflows/dev-stg-release.yml
@@ -16,20 +16,13 @@ jobs:
         runs-on: ubuntu-latest
         env: 
           BALLERINA_${{ github.event.inputs.bal_central_environment }}_CENTRAL: true
-        services:
-          mongodb:
-            image: mongo:4.2.0
-            env:
-              # Following credentials are only used during testing in docker container
-              MONGO_INITDB_ROOT_USERNAME: admin
-              MONGO_INITDB_ROOT_PASSWORD: admin
-          mongodb-ssl:
-            image: rzhilkibaev/mongo-x509-auth-ssl:latest
+
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v3
             - name: Set up JDK 11
-              uses: actions/setup-java@v1
+              uses: actions/setup-java@v3
               with:
+                distribution: 'zulu'
                 java-version: 11
             - name: Grant execute permission for gradlew
               run: chmod +x gradlew
@@ -41,29 +34,8 @@ jobs:
                 JAVA_OPTS: -DBALLERINA_DEV_COMPILE_BALLERINA_ORG=true
               run: |
                 ./gradlew build
-            - name: Ballerina Build W/ tests
-              uses: ballerina-platform/ballerina-action/@master
-              with:
-                args:
-                  test --groups mongodb mongodb
-              env:
-                JAVA_HOME: /usr/lib/jvm/default-jvm
-                # Following credentials are only used during testing in docker container
-                MONGODB_HOST: mongodb
-                MONGODB_USER: admin
-                MONGODB_PASSWORD: admin
-            - name: Ballerina Build W/ tests (SSL)
-              uses: ballerina-platform/ballerina-action/@master
-              with:
-                args:
-                  test --groups mongodb-ssl
-              env:
-                JAVA_HOME: /usr/lib/jvm/default-jvm
-                # Following credentials are only used during testing in docker container
-                WORKING_DIR: ./mongodb
-                MONGODB_HOST: mongodb-ssl
-                MONGODB_USER: C=US,ST=CA,L=San Francisco,O=Jaspersoft,OU=JSDev,CN=admin
-            - name: Ballerina Build W/O tests
+
+            - name: Ballerina Build
               uses: ballerina-platform/ballerina-action/@master
               with:
                 args:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -7,21 +7,15 @@ on:
 jobs:
     build:
         runs-on: ubuntu-latest
-        services:
-          mongodb:
-            image: mongo:4.2.0
-            env:
-              # Following credentials are only used during testing in docker container
-              MONGO_INITDB_ROOT_USERNAME: admin
-              MONGO_INITDB_ROOT_PASSWORD: admin
-          mongodb-ssl:
-            image: rzhilkibaev/mongo-x509-auth-ssl:latest
+
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v3
             - name: Set up JDK 11
-              uses: actions/setup-java@v1
+              uses: actions/setup-java@v3
               with:
+                distribution: 'zulu'
                 java-version: 11
+
             - name: Grant execute permission for gradlew
               run: chmod +x gradlew
 
@@ -32,36 +26,16 @@ jobs:
                 JAVA_OPTS: -DBALLERINA_DEV_COMPILE_BALLERINA_ORG=true
               run: |
                 ./gradlew build
-            - name: Ballerina Build W/ tests
-              uses: ballerina-platform/ballerina-action/@master
-              with:
-                args:
-                  test --groups mongodb mongodb
-              env:
-                JAVA_HOME: /usr/lib/jvm/default-jvm
-                # Following credentials are only used during testing in docker container
-                MONGODB_HOST: mongodb
-                MONGODB_USER: admin
-                MONGODB_PASSWORD: admin
-            - name: Ballerina Build W/ tests (SSL)
-              uses: ballerina-platform/ballerina-action/@master
-              with:
-                args:
-                  test --groups mongodb-ssl
-              env:
-                JAVA_HOME: /usr/lib/jvm/default-jvm
-                # Following credentials are only used during testing in docker container
-                WORKING_DIR: ./mongodb
-                MONGODB_HOST: mongodb-ssl
-                MONGODB_USER: C=US,ST=CA,L=San Francisco,O=Jaspersoft,OU=JSDev,CN=admin
-            - name: Ballerina Build W/O tests
+
+            - name: Ballerina Build
               uses: ballerina-platform/ballerina-action/@master
               with:
                 args:
                   pack mongodb
               env:
                 JAVA_HOME: /usr/lib/jvm/default-jvm
                 JAVA_OPTS: -DBALLERINA_DEV_COMPILE_BALLERINA_ORG=true
+
             - name: Ballerina Push
               uses: ballerina-platform/ballerina-action/@master
               with: