move oracle to quay (#4509)

signalfx · Mar 25, 2024 · 471d6f0 · 471d6f0
1 parent 24997eb
commit 471d6f0
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 11 deletions.
diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
@@ -211,6 +211,10 @@ jobs:
         image: quay.io/splunko11ytest/kong:latest
         ports:
           - "18001:8001"
+      oracle:
+        image: quay.io/splunko11ytest/oracle:latest
+        ports:
+          - "1521:1521"
       postgres:
         image: quay.io/splunko11ytest/postgres:latest
         ports:

diff --git a/...ivers/oracledb/testdata/server/Dockerfile → docker/oracle/Dockerfile b/...ivers/oracledb/testdata/server/Dockerfile → docker/oracle/Dockerfile
diff --git a/...oracledb/testdata/server/initOracleDB.sql → docker/oracle/initOracleDB.sql b/...oracledb/testdata/server/initOracleDB.sql → docker/oracle/initOracleDB.sql
diff --git a/tests/receivers/oracledb/bundled_test.go b/tests/receivers/oracledb/bundled_test.go
@@ -25,14 +25,13 @@ import (
 )
 
 func TestOracledbDockerObserver(t *testing.T) {
-	t.Skipf("Skip until %s is resolved", "https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/31457")
 	testutils.SkipIfNotContainerTest(t)
 	if runtime.GOOS == "darwin" {
 		t.Skip("unable to share sockets between mac and d4m vm: https://github.com/docker/for-mac/issues/483#issuecomment-758836836")
 	}
 
 	testutils.AssertAllMetricsReceived(t, "bundled.yaml", "otlp_exporter.yaml",
-		oracledb, []testutils.CollectorBuilder{
+		nil, []testutils.CollectorBuilder{
 			func(c testutils.Collector) testutils.Collector {
 				cc := c.(*testutils.CollectorContainer)
 				cc.Container = cc.Container.WithBinds("/var/run/docker.sock:/var/run/docker.sock:ro")

diff --git a/tests/receivers/oracledb/oracledb_test.go b/tests/receivers/oracledb/oracledb_test.go
@@ -18,24 +18,16 @@
 package tests
 
 import (
-	"path"
 	"testing"
-	"time"
 
 	"github.com/signalfx/splunk-otel-collector/tests/testutils"
 )
 
-// The Oracle DB container takes close to 10 minutes on a local machine to do the default setup, so the best way to
-// account for startup time is to wait for the container to be healthy before continuing test.
-var oracledb = []testutils.Container{testutils.NewContainer().WithContext(
-	path.Join(".", "testdata", "server"),
-).WithName("oracledb").WithExposedPorts("1521:1521").WillWaitForHealth(5 * time.Minute)}
-
 // This test ensures the collector can connect to an Oracle DB, and properly get metrics. It's not intended to
 // test the receiver itself.
 func TestOracleDBIntegration(t *testing.T) {
 	testutils.AssertAllMetricsReceived(t, "all.yaml", "all_metrics_config.yaml",
-		oracledb, []testutils.CollectorBuilder{
+		nil, []testutils.CollectorBuilder{
 			func(collector testutils.Collector) testutils.Collector {
 				return collector.WithEnv(map[string]string{"ORACLEDB_URL": "oracle://otel:password@localhost:1521/XE"})
 			},