-
Notifications
You must be signed in to change notification settings - Fork 3
MLE-23398 Trying to fix Jenkins #116
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
There was a problem hiding this 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 |
There was a problem hiding this comment.
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.
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 |
There was a problem hiding this comment.
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.
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.
471984c
to
0c1f79e
Compare
Need to use the latest 12 image so that the vector tests pass.
0c1f79e
to
7ef68de
Compare
Need to use the latest 12 image so that the vector tests pass.