Merge branch '7.55.x' into release/7.55.2-rc.1

DataDog · Jul 23, 2024 · 6674e80 · 6674e80
2 parents 3acfe64 + 51e67a8
commit 6674e80
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/test/new-e2e/tests/installer/package_agent_test.go b/test/new-e2e/tests/installer/package_agent_test.go
@@ -104,6 +104,7 @@ func (s *packageAgentSuite) TestUpgrade_AgentDebRPM_to_OCI() {
 
 // TestUpgrade_Agent_OCI_then_DebRpm agent deb/rpm install while OCI one is installed
 func (s *packageAgentSuite) TestUpgrade_Agent_OCI_then_DebRpm() {
+	s.T().Skip("Old CentOS version with expired mirrors")
 	// install OCI agent
 	s.RunInstallScript(envForceInstall("datadog-agent"))
 	defer s.Purge()

diff --git a/test/new-e2e/tests/installer/package_apm_inject_test.go b/test/new-e2e/tests/installer/package_apm_inject_test.go
@@ -32,6 +32,7 @@ func testApmInjectAgent(os e2eos.Descriptor, arch e2eos.Architecture) packageSui
 }
 
 func (s *packageApmInjectSuite) TestInstall() {
+	s.T().Skip("Test failing after OCI migration")
 	s.host.InstallDocker()
 	s.RunInstallScript("DD_APM_INSTRUMENTATION_ENABLED=all", "DD_APM_INSTRUMENTATION_LIBRARIES=python", envForceInstall("datadog-agent"), envForceInstall("datadog-apm-inject"), envForceInstall("datadog-apm-library-python"))
 	defer s.Purge()
@@ -99,6 +100,7 @@ func (s *packageApmInjectSuite) TestDockerBrokenJSON() {
 // TestUpgrade_InjectorDeb_To_InjectorOCI tests the upgrade from the DEB injector to the OCI injector.
 // Library package is OCI.
 func (s *packageApmInjectSuite) TestUpgrade_InjectorDeb_To_InjectorOCI() {
+	s.T().Skip("Test failing after OCI migration")
 	s.host.InstallDocker()
 
 	// Deb install using today's defaults
@@ -141,6 +143,7 @@ func (s *packageApmInjectSuite) TestUpgrade_InjectorDeb_To_InjectorOCI() {
 // TestUpgrade_InjectorOCI_To_InjectorDeb tests the upgrade from the OCI injector to the DEB injector.
 // Library package is OCI.
 func (s *packageApmInjectSuite) TestUpgrade_InjectorOCI_To_InjectorDeb() {
+	s.T().Skip("Test failing after OCI migration")
 	s.host.InstallDocker()
 
 	// OCI install