Skip to content

Conversation

rjrudin
Copy link
Contributor

@rjrudin rjrudin commented Aug 6, 2025

Need to use the latest 12 image so that the vector tests pass.

@Copilot Copilot AI review requested due to automatic review settings August 6, 2025 15:45
Copy link

@Copilot Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR updates the Jenkins build configuration to use a more flexible Docker-based approach for MarkLogic server setup, replacing the previous RPM-based installation. The changes aim to fix Jenkins builds by using the latest MarkLogic 12 image and improving the test environment setup.

  • Replaces hardcoded MarkLogic Docker image with environment variable configuration
  • Switches from Java 11 to Java 17 in Jenkins environment
  • Migrates from RPM-based MarkLogic setup to Docker Compose for containerized testing

Reviewed Changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated 2 comments.

File Description
test-app/docker-compose.yml Parameterizes MarkLogic image and logs volume using environment variables
Jenkinsfile Updates Java version, replaces RPM setup with Docker Compose, adds cleanup procedures
.env Adds environment variable defaults for Docker image and logs volume configuration

docker-compose down -v || true
sudo /usr/local/sbin/mladmin cleandata
cd marklogic-python-client/test-app
MARKLOGIC_LOGS_VOLUME=/tmp docker-compose up -d --build
Copy link
Preview

Copilot AI Aug 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using /tmp for logs volume may cause issues as /tmp can be cleaned up by the system. Consider using a more persistent directory or creating a dedicated temporary directory for this build.

Suggested change
MARKLOGIC_LOGS_VOLUME=/tmp docker-compose up -d --build
mkdir -p "$WORKSPACE/marklogic-logs"
MARKLOGIC_LOGS_VOLUME="$WORKSPACE/marklogic-logs" docker-compose up -d --build

Copilot uses AI. Check for mistakes.

docker-compose down -v || true
sudo /usr/local/sbin/mladmin cleandata
cd marklogic-python-client/test-app
MARKLOGIC_LOGS_VOLUME=/tmp docker-compose up -d --build
Copy link
Preview

Copilot AI Aug 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The environment variable MARKLOGIC_IMAGE is not set in this command, which means it will fall back to the default in .env. Consider explicitly setting MARKLOGIC_IMAGE here to ensure the intended image version is used.

Suggested change
MARKLOGIC_LOGS_VOLUME=/tmp docker-compose up -d --build
MARKLOGIC_IMAGE=marklogicdb/marklogic-server:latest MARKLOGIC_LOGS_VOLUME=/tmp docker-compose up -d --build

Copilot uses AI. Check for mistakes.

@rjrudin rjrudin force-pushed the feature/jenkins branch 3 times, most recently from 471984c to 0c1f79e Compare August 6, 2025 16:00
Need to use the latest 12 image so that the vector tests pass.
@rjrudin rjrudin merged commit bccbaa2 into develop Aug 6, 2025
2 checks passed
@rjrudin rjrudin deleted the feature/jenkins branch August 6, 2025 16:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants