From 3d7d01f32725f38b86686a32818f83c33e4bd8b7 Mon Sep 17 00:00:00 2001 From: bio-boris Date: Thu, 8 Aug 2024 21:16:41 -0500 Subject: [PATCH 1/9] Update ee2-tests.yml --- .github/workflows/ee2-tests.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ee2-tests.yml b/.github/workflows/ee2-tests.yml index 41007ff9..6a2c70a4 100644 --- a/.github/workflows/ee2-tests.yml +++ b/.github/workflows/ee2-tests.yml @@ -76,6 +76,10 @@ jobs: cp test/env/test.travis.env test.env make test-coverage codecov --token="${{ secrets.CODECOV_TOKEN }}" + - name: Upload coverage reports to Codecov + - uses: codecov/codecov-action@v4 + with: + token: ${{ secrets.CODECOV_TOKEN }} - name: Cleanup run: | docker compose down From 2104e586cbb428b4f11c0def5eba0ce6b0933dcc Mon Sep 17 00:00:00 2001 From: bio-boris Date: Thu, 8 Aug 2024 21:18:05 -0500 Subject: [PATCH 2/9] Update ee2-tests.yml --- .github/workflows/ee2-tests.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ee2-tests.yml b/.github/workflows/ee2-tests.yml index 6a2c70a4..d7c9a017 100644 --- a/.github/workflows/ee2-tests.yml +++ b/.github/workflows/ee2-tests.yml @@ -75,7 +75,6 @@ jobs: docker compose up -d cp test/env/test.travis.env test.env make test-coverage - codecov --token="${{ secrets.CODECOV_TOKEN }}" - name: Upload coverage reports to Codecov - uses: codecov/codecov-action@v4 with: From 8ac01202064d4fd35d82d8f398e14927ac5c58ea Mon Sep 17 00:00:00 2001 From: bio-boris Date: Thu, 8 Aug 2024 21:23:57 -0500 Subject: [PATCH 3/9] Update ee2-tests.yml --- .github/workflows/ee2-tests.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/ee2-tests.yml b/.github/workflows/ee2-tests.yml index d7c9a017..d578a801 100644 --- a/.github/workflows/ee2-tests.yml +++ b/.github/workflows/ee2-tests.yml @@ -1,7 +1,6 @@ # This workflow will install Python dependencies, run tests and lint # For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions - name: Execution Engine 2 Test Suite on: @@ -43,8 +42,6 @@ jobs: with: path: "./test" - - Build_and_Run_Tests_and_CodeCov: name: Build and Run Tests and CodeCov runs-on: ubuntu-latest @@ -76,7 +73,7 @@ jobs: cp test/env/test.travis.env test.env make test-coverage - name: Upload coverage reports to Codecov - - uses: codecov/codecov-action@v4 + uses: codecov/codecov-action@v4 with: token: ${{ secrets.CODECOV_TOKEN }} - name: Cleanup From d0005336ba14d70d807f66e09c0733ad310e4515 Mon Sep 17 00:00:00 2001 From: bio-boris Date: Thu, 8 Aug 2024 21:29:12 -0500 Subject: [PATCH 4/9] Update ee2-tests.yml --- .github/workflows/ee2-tests.yml | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ee2-tests.yml b/.github/workflows/ee2-tests.yml index d578a801..768eb9ba 100644 --- a/.github/workflows/ee2-tests.yml +++ b/.github/workflows/ee2-tests.yml @@ -47,11 +47,21 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - mongo-config: - - version: "7.0" - init-path: "./test/dockerfiles/mongo/docker-entrypoint-initdb.d-7.0/" - - version: "3.6" - init-path: "./test/dockerfiles/mongo/docker-entrypoint-initdb.d-3.6/" + mongo-version: ["7.0", "3.6"] + services: + mongo: + image: mongo:${{ matrix.mongo-version }} + options: > + --health-cmd "mongosh --eval 'db.adminCommand(\"ping\")'" + --health-interval 10s + --health-timeout 5s + --health-retries 3 + ports: + - 27017:27017 + env: + MONGO_INITDB_DATABASE: travis + MONGO_INITDB_ROOT_USERNAME: travis + MONGO_INITDB_ROOT_PASSWORD: travis steps: - name: Check out source repository uses: actions/checkout@v4 @@ -63,13 +73,10 @@ jobs: run: | pip install -r requirements.txt git clone https://github.com/kbase/jars /opt/jars - - name: Set MongoDB Version and Init Path + - name: Run Tests with Coverage + env: + MONGO_URL: mongodb://root:example@localhost:27017/testdb run: | - echo "MONGO_VERSION=${{ matrix.mongo-config.version }}" >> $GITHUB_ENV - echo "INIT_PATH=${{ matrix.mongo-config.init-path }}" >> $GITHUB_ENV - - name: Start Services and Run Tests - run: | - docker compose up -d cp test/env/test.travis.env test.env make test-coverage - name: Upload coverage reports to Codecov @@ -78,4 +85,4 @@ jobs: token: ${{ secrets.CODECOV_TOKEN }} - name: Cleanup run: | - docker compose down + docker-compose down From 0cddf722e679fb05f09a8c87cfd0627cb97db1d9 Mon Sep 17 00:00:00 2001 From: bio-boris Date: Thu, 8 Aug 2024 21:30:56 -0500 Subject: [PATCH 5/9] Update ee2-tests.yml --- .github/workflows/ee2-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ee2-tests.yml b/.github/workflows/ee2-tests.yml index 768eb9ba..fc111ceb 100644 --- a/.github/workflows/ee2-tests.yml +++ b/.github/workflows/ee2-tests.yml @@ -75,7 +75,7 @@ jobs: git clone https://github.com/kbase/jars /opt/jars - name: Run Tests with Coverage env: - MONGO_URL: mongodb://root:example@localhost:27017/testdb + MONGO_URL: mongodb://travis:travis@localhost:27017/travis run: | cp test/env/test.travis.env test.env make test-coverage @@ -85,4 +85,4 @@ jobs: token: ${{ secrets.CODECOV_TOKEN }} - name: Cleanup run: | - docker-compose down + docker compose down From 6269f6eee9438cd947c2995268617eec98d35e1c Mon Sep 17 00:00:00 2001 From: bio-boris Date: Thu, 8 Aug 2024 21:33:34 -0500 Subject: [PATCH 6/9] Update ee2-tests.yml --- .github/workflows/ee2-tests.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/ee2-tests.yml b/.github/workflows/ee2-tests.yml index fc111ceb..2228e8f3 100644 --- a/.github/workflows/ee2-tests.yml +++ b/.github/workflows/ee2-tests.yml @@ -47,15 +47,10 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - mongo-version: ["7.0", "3.6"] + mongo-version: ["3.6", "7.0","8.0"] services: mongo: image: mongo:${{ matrix.mongo-version }} - options: > - --health-cmd "mongosh --eval 'db.adminCommand(\"ping\")'" - --health-interval 10s - --health-timeout 5s - --health-retries 3 ports: - 27017:27017 env: From e405feb769af6e580910997641de6c7156274b9d Mon Sep 17 00:00:00 2001 From: bio-boris Date: Thu, 8 Aug 2024 21:35:57 -0500 Subject: [PATCH 7/9] Update ee2-tests.yml --- .github/workflows/ee2-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ee2-tests.yml b/.github/workflows/ee2-tests.yml index 2228e8f3..9bfa773a 100644 --- a/.github/workflows/ee2-tests.yml +++ b/.github/workflows/ee2-tests.yml @@ -47,7 +47,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - mongo-version: ["3.6", "7.0","8.0"] + mongo-version: ["3.6", "7.0"] services: mongo: image: mongo:${{ matrix.mongo-version }} From 038e6b3f90aa5038ddf1d8620d478fe93e35ddef Mon Sep 17 00:00:00 2001 From: bio-boris Date: Thu, 8 Aug 2024 21:39:33 -0500 Subject: [PATCH 8/9] Update ee2-tests.yml --- .github/workflows/ee2-tests.yml | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ee2-tests.yml b/.github/workflows/ee2-tests.yml index 9bfa773a..d578a801 100644 --- a/.github/workflows/ee2-tests.yml +++ b/.github/workflows/ee2-tests.yml @@ -47,16 +47,11 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - mongo-version: ["3.6", "7.0"] - services: - mongo: - image: mongo:${{ matrix.mongo-version }} - ports: - - 27017:27017 - env: - MONGO_INITDB_DATABASE: travis - MONGO_INITDB_ROOT_USERNAME: travis - MONGO_INITDB_ROOT_PASSWORD: travis + mongo-config: + - version: "7.0" + init-path: "./test/dockerfiles/mongo/docker-entrypoint-initdb.d-7.0/" + - version: "3.6" + init-path: "./test/dockerfiles/mongo/docker-entrypoint-initdb.d-3.6/" steps: - name: Check out source repository uses: actions/checkout@v4 @@ -68,10 +63,13 @@ jobs: run: | pip install -r requirements.txt git clone https://github.com/kbase/jars /opt/jars - - name: Run Tests with Coverage - env: - MONGO_URL: mongodb://travis:travis@localhost:27017/travis + - name: Set MongoDB Version and Init Path run: | + echo "MONGO_VERSION=${{ matrix.mongo-config.version }}" >> $GITHUB_ENV + echo "INIT_PATH=${{ matrix.mongo-config.init-path }}" >> $GITHUB_ENV + - name: Start Services and Run Tests + run: | + docker compose up -d cp test/env/test.travis.env test.env make test-coverage - name: Upload coverage reports to Codecov From 225a5f2711cf0b8eba6c927f360f23490cb90220 Mon Sep 17 00:00:00 2001 From: bio-boris Date: Thu, 8 Aug 2024 21:43:17 -0500 Subject: [PATCH 9/9] Update ee2-tests.yml --- .github/workflows/ee2-tests.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ee2-tests.yml b/.github/workflows/ee2-tests.yml index d578a801..95bfec8a 100644 --- a/.github/workflows/ee2-tests.yml +++ b/.github/workflows/ee2-tests.yml @@ -1,6 +1,4 @@ # This workflow will install Python dependencies, run tests and lint -# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions - name: Execution Engine 2 Test Suite on: @@ -48,10 +46,11 @@ jobs: strategy: matrix: mongo-config: - - version: "7.0" - init-path: "./test/dockerfiles/mongo/docker-entrypoint-initdb.d-7.0/" - - version: "3.6" - init-path: "./test/dockerfiles/mongo/docker-entrypoint-initdb.d-3.6/" + - "7.0" + - "3.6" + init-path: + - "./test/dockerfiles/mongo/docker-entrypoint-initdb.d-7.0/" + - "./test/dockerfiles/mongo/docker-entrypoint-initdb.d-3.6/" steps: - name: Check out source repository uses: actions/checkout@v4