chore: fixes docker install step and failing build info test (#112)

mongodb · Jan 7, 2025 · f2ecd03 · f2ecd03
1 parent 5159908
commit f2ecd03
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 5 deletions.
diff --git a/.github/workflows/quality-check.yaml b/.github/workflows/quality-check.yaml
@@ -85,8 +85,23 @@ jobs:
 
       - name: Setup Docker (for Test Containers)
         run: |
-          sudo apt update -y
-          sudo apt install -y docker docker-compose
+          echo "Adding Docker official GPG key"
+          sudo apt-get update
+          sudo apt-get install ca-certificates curl
+          sudo install -m 0755 -d /etc/apt/keyrings
+          sudo curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc
+          sudo chmod a+r /etc/apt/keyrings/docker.asc
+          
+          echo "Adding the repository to APT sources"
+          echo \
+          "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu \
+          $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | \
+          sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
+          sudo apt-get update
+
+          echo "Installing docker"
+          sudo apt-get install docker-ce docker-ce-cli containerd.io docker-compose-plugin
+
 
       - name: Run Test Suite
         run: |

diff --git a/...c/test/kotlin/com/mongodb/jbplugin/observability/probe/NewConnectionActivatedProbeTest.kt b/...c/test/kotlin/com/mongodb/jbplugin/observability/probe/NewConnectionActivatedProbeTest.kt
@@ -68,7 +68,7 @@ internal abstract class NewConnectionActivatedProbeTest(
                     event.properties[TelemetryProperty.IS_LOCALHOST] == isLocalhost &&
                     event.properties[TelemetryProperty.IS_ENTERPRISE] == isEnterprise &&
                     event.properties[TelemetryProperty.IS_GENUINE] == isGenuine &&
-                    event.properties[TelemetryProperty.VERSION] == version &&
+                    event.properties[TelemetryProperty.VERSION].toString().startsWith(version) &&
                     !event.properties.containsKey(TelemetryProperty.ATLAS_HOST)
             },
         )
@@ -83,7 +83,9 @@ internal class NewConnectionActivatedProbeTestForLocalEnvironment :
         isLocalhost = true,
         isEnterprise = false,
         isGenuine = true,
-        version = "7.0.15",
+        // not having an exact version here because then we'd have to keep it updated with every
+        // mongodb release
+        version = "7.0.",
     )
 
 @RequiresMongoDbCluster(
@@ -97,5 +99,7 @@ internal class NewConnectionActivatedProbeTestForAtlasCliEnvironment :
         isLocalhost = true,
         isEnterprise = true,
         isGenuine = true,
-        version = "7.0.15",
+        // not having an exact version here because then we'd have to keep it updated with every
+        // mongodb release
+        version = "7.0.",
     )