Skip to content

Conversation

@rjrudin
Copy link
Contributor

@rjrudin rjrudin commented Oct 29, 2025

Needs two separate invocations to handle data/modules going to different locations.

Needs two separate invocations to handle data/modules going to different locations.
Copilot AI review requested due to automatic review settings October 29, 2025 17:14
@github-actions
Copy link

Copyright Validation Results
Total: 57 | Passed: 0 | Failed: 0 | Skipped: 57 | at: 2025-10-29 17:14:43 UTC | commit: e679c07

⏭️ Skipped (Excluded) Files

  • CONTRIBUTING.md
  • Jenkinsfile
  • test-app/build.gradle
  • test-app/gradle-e2e.properties
  • test-app/gradle.properties
  • test-app/src/main/ml-config/databases/Schemas/schemas/permissions.properties
  • test-app/src/main/ml-config/databases/Schemas/schemas/tde/exportingRows.tdex
  • test-app/src/main/ml-config/databases/Schemas/schemas/tde/masterDetail.tdex
  • test-app/src/main/ml-config/databases/Schemas/schemas/tde/masterDetail2.tdej
  • test-app/src/main/ml-config/databases/Schemas/schemas/tde/masterDetail3.tdej
  • test-app/src/main/ml-config/databases/Schemas/schemas/tde/masterDetail4.tdej
  • test-app/src/main/ml-config/databases/dmsdk-api-rest-server-modules.json
  • test-app/src/main/ml-config/databases/dmsdk-api-rest-server.json
  • test-app/src/main/ml-config/databases/node-client-api-rest-server-modules.json
  • test-app/src/main/ml-config/databases/node-client-api-rest-server.json
  • test-app/src/main/ml-config/databases/node-client-api-rest-server/temporal/axes/temporal-system-axis.json
  • test-app/src/main/ml-config/databases/node-client-api-rest-server/temporal/axes/temporal-valid-axis.json
  • test-app/src/main/ml-config/databases/node-client-api-rest-server/temporal/collections/temporal-collection.json
  • test-app/src/main/ml-config/databases/node-client-api-rest-server/temporal/collections/temporalCollectionLsqt.json
  • test-app/src/main/ml-config/databases/nodeOpticFunctionalTest.json
  • test-app/src/main/ml-config/databases/nodeOpticFunctionalTestModules.json
  • test-app/src/main/ml-config/servers/dmsdk-api-rest-server.json
  • test-app/src/main/ml-config/servers/node-client-api-rest-server.json
  • test-app/src/main/ml-config/servers/node-client-api-ssl-server.json
  • test-app/src/main/ml-config/servers/nodeOpticFunctionalTest.json
  • test-app/src/main/ml-e2e-data/optic/lexicon/test/city1.json
  • test-app/src/main/ml-e2e-data/optic/lexicon/test/city2.json
  • test-app/src/main/ml-e2e-data/optic/lexicon/test/city3.json
  • test-app/src/main/ml-e2e-data/optic/lexicon/test/city4.json
  • test-app/src/main/ml-e2e-data/optic/lexicon/test/city5.json
  • test-app/src/main/ml-e2e-data/optic/lexicon/test/collections.properties
  • test-app/src/main/ml-e2e-data/optic/lexicon/test/doc1.json
  • test-app/src/main/ml-e2e-data/optic/lexicon/test/doc2.json
  • test-app/src/main/ml-e2e-data/optic/lexicon/test/doc3.json
  • test-app/src/main/ml-e2e-data/optic/lexicon/test/doc4.xml
  • test-app/src/main/ml-e2e-data/optic/lexicon/test/doc5.xml
  • test-app/src/main/ml-e2e-data/optic/plan/test/collections.properties
  • test-app/src/main/ml-e2e-data/optic/plan/test/planLexicons.json
  • test-app/src/main/ml-e2e-data/optic/plan/test/planTriples.json
  • test-app/src/main/ml-e2e-data/optic/plan/test/planViews.json
  • test-app/src/main/ml-e2e-data/optic/sparql/test/collections.properties
  • test-app/src/main/ml-e2e-data/optic/sparql/test/dedupdoc1.xml
  • test-app/src/main/ml-e2e-data/optic/triple/test/collections.properties
  • test-app/src/main/ml-e2e-data/optic/triple/test/duplicatePlayerTripleSet.xml
  • test-app/src/main/ml-e2e-data/optic/triple/test/duplicateTeamTripleSet.xml
  • test-app/src/main/ml-e2e-data/optic/triple/test/otherPlayerTripleSet.xml
  • test-app/src/main/ml-e2e-data/optic/triple/test/playerTripleSet.xml
  • test-app/src/main/ml-e2e-data/optic/triple/test/teamTripleSet.xml
  • test-app/src/main/ml-e2e-data/optic/view/test/collections.properties
  • test-app/src/main/ml-e2e-data/optic/view/test/masterDetail.xml
  • test-app/src/main/ml-e2e-data/optic/view/test/masterDetail2.json
  • test-app/src/main/ml-e2e-data/optic/view/test/masterDetail3.json
  • test-app/src/main/ml-e2e-data/optic/view/test/masterDetail4.json
  • test-app/src/main/ml-e2e-data/optic/view/test/masterDetail5.json
  • test-app/src/main/ml-e2e-modules/root/optic/test/mapperReducer.sjs
  • test-app/src/main/turtle/companies/companies_100.ttl
  • test-app/src/main/turtle/people/people.ttl

✅ All files have valid copyright headers!

Copy link

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 consolidates two separate ml-gradle test projects by merging test-complete-app-mlDeploy into test-app. The changes eliminate the duplicate deployment project and configure test-app to handle both standard and e2e test deployments through separate invocations with different property configurations.

  • Removed the standalone test-complete-app-mlDeploy project directory and all its files
  • Enhanced test-app to support e2e test data/module deployment via a new gradle-e2e.properties configuration
  • Updated CI/CD and documentation to reflect the consolidated approach

Reviewed Changes

Copilot reviewed 25 out of 77 changed files in this pull request and generated 1 comment.

Show a summary per file
File Description
test-complete-app-mlDeploy/* Entire directory removed including security configs, gradle wrapper, and build files
test-app/gradle-e2e.properties New properties file defining e2e-specific data/module paths and database configuration
test-app/gradle.properties Added properties plugin configuration for environment-based property loading
test-app/build.gradle Added properties plugin version update and curl tasks previously in mlDeploy project
test-app/src/main/ml-config/servers/node-client-api-ssl-server.json Updated SSL certificate template reference
Jenkinsfile Streamlined e2e test setup by removing separate mlDeploy project deployment
CONTRIBUTING.md Updated deployment instructions to include e2e data/module loading step

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

"authentication": "digestbasic",
"ssl-certificate-template": "ssl-project-template"
}
"ssl-certificate-template": "node-client-ssl-template"
Copy link

Copilot AI Oct 29, 2025

Choose a reason for hiding this comment

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

The SSL certificate template reference has been changed from 'ssl-project-template' to 'node-client-ssl-template', but this new template is not included in the visible configuration files. Ensure this template is defined elsewhere in the project or deployed separately.

Copilot uses AI. Check for mistakes.
@rjrudin rjrudin merged commit 0160b49 into develop Oct 29, 2025
3 checks passed
@rjrudin rjrudin deleted the feature/merge-ml-gradle-projects branch October 29, 2025 19:06
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