This is an automated email from the ASF dual-hosted git repository. pinal pushed a commit to branch ATLAS-5221 in repository https://gitbox.apache.org/repos/asf/atlas.git
commit 53069d070ee37cf7631d221b0a913041f9a96b9b Author: Pinal Shah <[email protected]> AuthorDate: Mon Feb 23 14:58:46 2026 +0530 ATLAS-5221: Fix failing integration tests --- .github/workflows/ci.yml | 2 +- dev-support/atlas-docker/scripts/atlas-build.sh | 6 +++++- webapp/pom.xml | 25 ++++++++++++++++++------- 3 files changed, 24 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bf9b0ed00..6d3963f48 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -71,7 +71,7 @@ jobs: export DOCKER_BUILDKIT=1 export COMPOSE_DOCKER_CLI_BUILD=1 docker compose -f docker-compose.atlas-base.yml build - SKIPTESTS=false docker compose -f docker-compose.atlas-base.yml -f docker-compose.atlas-build.yml up + SKIPTESTS=false PROFILE=embedded-solr-it docker compose -f docker-compose.atlas-base.yml -f docker-compose.atlas-build.yml up ATLAS_BUILD_CONTAINER=$(docker ps -a -q --filter "name=atlas-build") EXIT_CODE=$(docker inspect --format '{{.State.ExitCode}}' "$ATLAS_BUILD_CONTAINER") diff --git a/dev-support/atlas-docker/scripts/atlas-build.sh b/dev-support/atlas-docker/scripts/atlas-build.sh index ff60538e8..32b804008 100755 --- a/dev-support/atlas-docker/scripts/atlas-build.sh +++ b/dev-support/atlas-docker/scripts/atlas-build.sh @@ -86,7 +86,11 @@ else done fi -mvn ${ARG_PROFILES} ${ARG_SKIPTESTS} -DskipDocs clean package +if [ "${ARG_PROFILES}" == "embedded-solr-it" ] +then + mvn ${ARG_PROFILES} ${ARG_SKIPTESTS} -DskipDocs clean verify +else + mvn ${ARG_PROFILES} ${ARG_SKIPTESTS} -DskipDocs clean package mv -f distro/target/apache-atlas-${ATLAS_VERSION}-server.tar.gz /home/atlas/dist/ mv -f distro/target/apache-atlas-${ATLAS_VERSION}-hive-hook.tar.gz /home/atlas/dist/ diff --git a/webapp/pom.xml b/webapp/pom.xml index 77d23369f..5e2d87d27 100755 --- a/webapp/pom.xml +++ b/webapp/pom.xml @@ -32,6 +32,7 @@ <description>Apache Atlas Web Application</description> <properties> + <atlas.testtools.scope>test</atlas.testtools.scope> <checkstyle.failOnViolation>true</checkstyle.failOnViolation> <checkstyle.skip>false</checkstyle.skip> <debug.jetty.daemon>true</debug.jetty.daemon> @@ -483,19 +484,19 @@ <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.atlas</groupId> - <artifactId>atlas-testtools</artifactId> - <version>${project.version}</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.easymock</groupId> <artifactId>easymock</artifactId> <version>3.4</version> <scope>test</scope> </dependency> + + <dependency> + <groupId>org.apache.atlas</groupId> + <artifactId>atlas-testtools</artifactId> + <version>${project.version}</version> + <scope>${atlas.testtools.scope}</scope> + </dependency> </dependencies> <build> @@ -815,6 +816,16 @@ </build> <profiles> + <profile> + <id>embedded-solr-it</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <properties> + <atlas.testtools.scope>runtime</atlas.testtools.scope> + </properties> + </profile> + <profile> <id>dist</id> <activation>
