Fix tests

datahub-project · Jul 28, 2023 · 337888c · 337888c
1 parent d146ac2
commit 337888c
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 21 deletions.
diff --git a/docker/datahub-ingestion-base/build.gradle b/docker/datahub-ingestion-base/build.gradle
@@ -29,6 +29,8 @@ task mkdirBuildDocker {
     }
 }
 dockerClean.finalizedBy(mkdirBuildDocker)
+dockerClean.dependsOn([':docker:datahub-ingestion-slim:dockerClean',
+                       ':docker:datahub-ingestion:dockerClean'])
 
 task cleanLocalDockerImages {
     doLast {

diff --git a/docker/datahub-ingestion-base/entrypoint.sh b/docker/datahub-ingestion-base/entrypoint.sh
@@ -5,6 +5,7 @@ if [ ! -z "$ACTIONS_EXTRA_PACKAGES" ]; then
 fi
 
 if [[ ! -z "$ACTIONS_CONFIG" && ! -z "$ACTIONS_EXTRA_PACKAGES" ]]; then
+  mkdir -p /tmp/datahub/logs
   curl -q "$ACTIONS_CONFIG" -o config.yaml
   exec dockerize -wait ${DATAHUB_GMS_PROTOCOL:-http}://$DATAHUB_GMS_HOST:$DATAHUB_GMS_PORT/health -timeout 240s \
     datahub actions --config config.yaml

diff --git a/docker/datahub-ingestion-slim/build.gradle b/docker/datahub-ingestion-slim/build.gradle
@@ -44,6 +44,7 @@ task mkdirBuildDocker {
     }
 }
 dockerClean.finalizedBy(mkdirBuildDocker)
+dockerClean.dependsOn(':docker:datahub-ingestion:dockerClean')
 
 task cleanLocalDockerImages {
     doLast {

diff --git a/metadata-ingestion/=63.0.0 b/metadata-ingestion/=63.0.0
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/entity/EntityServiceImpl.java b/metadata-io/src/main/java/com/linkedin/metadata/entity/EntityServiceImpl.java
@@ -146,7 +146,7 @@ public class EntityServiceImpl implements EntityService {
     OBJECT_MAPPER.getFactory().setStreamReadConstraints(StreamReadConstraints.builder().maxStringLength(maxSize).build());
   }
 
-  private static final int DEFAULT_MAX_TRANSACTION_RETRY = 3;
+  private static final int DEFAULT_MAX_TRANSACTION_RETRY = 5;
 
   protected final AspectDao _aspectDao;
   private final EventProducer _producer;

diff --git a/smoke-test/tests/cypress/cypress/e2e/mutations/deprecations.js b/smoke-test/tests/cypress/cypress/e2e/mutations/deprecations.js
@@ -10,10 +10,10 @@ describe("deprecation", () => {
         cy.addViaFormModal("test deprecation", "Add Deprecation Details");
 
         cy.goToDataset(urn, datasetName);
-        cy.contains("Deprecated");
+        cy.contains("DEPRECATED");
 
         cy.openThreeDotDropdown();
         cy.clickOptionWithText("Mark as un-deprecated");
-        cy.ensureTextNotPresent("Deprecated");
+        cy.ensureTextNotPresent("DEPRECATED");
     });
 });