Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
bfd41c8e0d | ||
|
|
cec106ce30 | ||
|
|
ba6a3c6f92
|
||
|
|
43144c974b | ||
|
|
6806de4892
|
||
|
|
9c30a30754 | ||
|
|
a9d51ebd47 | ||
|
|
284c69aa3e
|
||
|
|
fb30d9acc5
|
No files matched your search
@@ -72,6 +72,7 @@ jobs:
|
||||
bash tests/test_maven_ci_push.sh
|
||||
bash tests/test_create_github_release.sh
|
||||
bash tests/test_maven_ci_cache.sh
|
||||
bash tests/test_maven_test_results.sh
|
||||
bash tests/test_maven_ci_install.sh
|
||||
bash tests/test_snapshot_refresh.sh
|
||||
bash tests/test_maven_settings_output.sh
|
||||
|
||||
@@ -81,6 +81,7 @@ test-pipelines: pack
|
||||
bash tests/test_maven_ci_push.sh
|
||||
bash tests/test_create_github_release.sh
|
||||
bash tests/test_maven_ci_cache.sh
|
||||
bash tests/test_maven_test_results.sh
|
||||
bash tests/test_maven_ci_install.sh
|
||||
bash tests/test_snapshot_refresh.sh
|
||||
bash tests/test_maven_settings_output.sh
|
||||
|
||||
@@ -14,6 +14,9 @@ steps:
|
||||
command: <<include(scripts/mvn_jar_deploy_gpg_setup.sh)>>
|
||||
- run:
|
||||
name: Publish to Sonatype Central (releases and SNAPSHOTs)
|
||||
# Central's native publication wait can be silent for its 30-minute limit.
|
||||
# Let Maven return its real result before CircleCI's inactivity watchdog.
|
||||
no_output_timeout: 35m
|
||||
command: <<include(scripts/mvn_jar_deploy.sh)>>
|
||||
- save_cache:
|
||||
paths:
|
||||
|
||||
@@ -1,26 +1,10 @@
|
||||
#!/bin/bash
|
||||
# Collect unit and integration JUnit reports without losing same-named module suites.
|
||||
set -euo pipefail
|
||||
|
||||
############################################################################
|
||||
## mvn_verify_save_test_results.sh
|
||||
## Test Results Collection Script
|
||||
##
|
||||
## This script collects JUnit test results from Maven Surefire reports
|
||||
## and saves them to the CircleCI test results directory for reporting.
|
||||
## It finds all XML test result files and copies them to the standard location.
|
||||
##
|
||||
## Process:
|
||||
## 1. Creates test results directory structure
|
||||
## 2. Finds all Surefire XML report files
|
||||
## 3. Copies test results to CircleCI test results directory
|
||||
##
|
||||
## Usage: Called by CircleCI orb command mvn_verify
|
||||
## Output: Collects and saves JUnit test results for CircleCI reporting
|
||||
############################################################################
|
||||
|
||||
set -e
|
||||
|
||||
#############################################################
|
||||
## Create test results directory and collect JUnit reports ##
|
||||
#############################################################
|
||||
mkdir -p ~/test-results/junit/
|
||||
find . -type f -regex ".*/target/surefire-reports/.*xml" -exec cp {} ~/test-results/junit/ \;
|
||||
mkdir -p "$HOME/test-results/junit"
|
||||
while IFS= read -r -d '' report; do
|
||||
destination="$HOME/test-results/junit/${report#./}"
|
||||
mkdir -p "$(dirname "$destination")"
|
||||
cp "$report" "$destination"
|
||||
done < <(find . -type f \( -path '*/target/surefire-reports/TEST-*.xml' -o -path '*/target/failsafe-reports/TEST-*.xml' \) -print0)
|
||||
@@ -23,7 +23,7 @@ NEXT_TEMPLATE = json.loads(zlib.decompress(base64.b64decode("eNrNVE1v2zAMvedXCFq
|
||||
ALL_TEMPLATE = json.loads(zlib.decompress(base64.b64decode("eNq1T7EOgjAU3PmKpjNIdHQyJg4ukmDiYkwDUkxt4UkLEkP4dwsSUojootu7u/fu7lUWQvhOpWKQ4iVazOZ2w4AMlYaVnjXKsszRjCYwZ+lFSQDuduSKEM9fk8PG32+9HSFYn9StRwmSxwJKw0gHsfjhBGnkqAQ47RWtXaGNPHYY9YpZwQ2EIC8X47bbSYOkccRhwUTUhuRU5dhYqvu5rfglZ1xxFHMGSbE91G4SYiYmZUmzgkk6/LPTplsjdPrXD3EhxIcf3sk//sEy1QbVVm09Ad15mhY=")))
|
||||
STARTER_TEMPLATE = json.loads(zlib.decompress(base64.b64decode("eNp1UMGKwkAMvc9XlDmKtejR0yJ42MsKCl5EQnUzZbbTiZ0ZqiL9d1OpWqt7y3t5eS/JRUSRrNB5TVZOo8loPGwYcjvP8MI1o7IsY2aYkLm2mXdEedKSXwCL5QzW8+Xqe/EDIHmkvnkcyeXK0LFjFNAHIGvOD4rJP7plbVocPTrd7KSoLHwab2V7Kg7aIOxQkUPgi7RqZCo1Hod9rQ14Ci+ZnbQirdDGDjPtgzvHe4e/aINmI/ki3/ZslTaBH/m2W3N3mn3iuaMzy/s2n01Gg0T2BLX4Dz3re7UVd1SLWlwByepyJQ==")))
|
||||
ANDROID_TEMPLATE = json.loads(zlib.decompress(base64.b64decode("eNrtV21v2jAQ/s6vsKJ92KomdFSbptKhIoGqfugL0K6aRoWMY4LbxE5tp4BQ9tt3TgJJeGtXbVI17Vty57t77rmXOPMKQtYTlYoJbh2hmvNx30iEHCp4ncMzvGHuSsFcEFiESeJTwqqZ7KTmfHIOrP30oEdCm/isdDCTnRw6Nadmwbk4iXAvihEizrStqdJLEQjplJJIC1mQgZTjgJoAGYAFEDvAZMw4zaAkRzX2zEmXjnDkaytTxIsTltI0NCB+5CZkTMmDiHTRzSKSBHxCUtuT2PWpTSBgMVyOsWgT8SQvVUoiRQdim4gggLMGplNNHU+Q0bToMPKsgkW8fI43YFP46WXAANA6lAWnPfCSREeQK1CmCl5SenK4wYPLJLJD9LOaZJJZVO9NLat9PmLcRQ6y9SykaIRA79Ep6lvOXnUYMd8tWzl708DvW8g2RUckRPN4s2PU79f7fBXXZEx50hT+BM/Us7SVGEmKOjChBous1wgKsR4b/2VIr4mDpWYjTF4eJM17S6js6a5SCLzoibV5CrGEOmsY9vJEqRkMQmCzAHt0BZVlqmcwKS0Z90q0L+fqqOxC1RcADg/qnhCeD1mHTNWnXz5ba9DzaXwj475xjJWGutk0iHwMCG0Q26+abCI4p0RTNxnvZur92tRppaFXamIdH6O8fE5RixqN3+vDt7MBgPgwAgOc8/B/IfyFhRBAUbnt0tAXs3/lA7uzi28l0xQRSV3KNcO+Qlqg1KsTShFS4Jzuam1KxgI6Ffqv0Vg37PNM7zE9joadx8dzw3CXegz25OxGUWmQfH0373Q6g+ZFq3t51hqcN7+1Lwbd9ulZ77r7fXDTa3cvmuft+HVBrrBSEyHd3UGumr3e7WW3tT3IH9wdV9HQZ2qM3reSTvtgSE8w7yA6X41hap0YJJ4I1nApvRanG/Pv0lAoBu0y25pDeRaWN09g7WHki0nh+pmMl1nqyV4qjkh2TS00cH5V3f3NWH5+n2d1y3wuOKePEYPRKMHYAWYTjJLybqUcI+avXQoy1VBiDkO4SWf+Erg/Sz4EmHFrRR1Xtr3trFAlrvwCFLRRYQ==")))
|
||||
POLICY_TEMPLATE = json.loads(zlib.decompress(base64.b64decode("eNqdVcFu2zAMvecrBF+cbI3btEAPQXPoIQMGrFhPA4a6CBSbTrTIkicpa40g/z5Slh073QpsvlgSycdHiqQOI8aiX2Cs0Cqas+tkdkEnP/Ta4vaAa5JzKXLuYFpx58CokwiFuc52YPDkKZywTublouQbQHGUiXJzWdVuq9X8JpldR53WMayeL1pQA1bvTQarTHJL7iJbcimjTsE6qOzAaZRtIdvpveuUzoiYverxDoeKl57cZ2UdOmCP9ff7hy89iAZalyVXOSlWomIiKE+nubB8LTExopqGLE49jwC0WNwmV8lN1IM7nsL+H6Lfwl2wcBesEBLse4R9xm/Y3R2Ll18/xakSZaWNYzUvZbextU1VYXRJuFsp1iwIHnGbqlSBMdpYtmBPz6kKvleZ3iuHZ1ekUWjjMVfECHPkTcdxEk8Ss5F6PY4/JCSPJ/NUEUtRMK7qccWNSzChxtkXESwYgZGAcDrQhE5sa05fppUTag/kn/bO1D0pwTFdgRp3EBPGLSt6OvRhPjlGQUqJ5QWspOb5uJi0qIFs3Jb/ZUy0rDM93DNIAz/3wkBOCYtFHl+w2AkngRYZXt9Gm5rWOdjMiMph4XgRxgPKxc9DtFJYK9SGwAqfmoIIdD6QW8GU9smiWM6sURwAzkjS19xrwitME8acRocupuOcPQTHhQCZWyzKAHRMo8kQa1gSHxds1mYPXjOomnJLqCeW5JGuAXp03qdBZlQOFhpFJAInCsHB0v8wkf+GvRwCYnEboRypta2Ws8MguuOw94IZZrlxFDw3MGmUpmrZ9E6Bxvm8o0336PtkYHYyRQaMTQeRYpcm8CrceIYHIC2c+brHodQWKfNT25ti26fqLzOoHb2jduenUvSiza6Q+uUPr0B/+Id3ojeF374Vbz2MjqPfh4rjhA==")))
|
||||
POLICY_TEMPLATE = json.loads(zlib.decompress(base64.b64decode("eNqdVU1v2zAMvedXCL442Rq3aYEegubQQwYMWLGeBgxVESg2nWqVJU9S1gZB/vtIWXbsdCuw+WKJH4+PlEjtR4wlv8A6aXQyZ5fZ7IwkP8za4XaPa9ILJQvhYVoL78HqowqVhcmfwaLkIUpYpwt6WYkNoDrJZbU5r3f+yej5VTa7TDqrQ1w9nrWgFpzZ2hxWuRKOwiWuEkolnYHzULtB0CR/gvzZbH1ndELEbnWPdxRqUQVyn7XzGIDd777f3n3pQTTQpqqELsiwljWT0Xg6LaQTa4WFkfU0VnEaeESgxeI6u8iukh7c4Zj2/xD9Fs+CxbNgpVTg3iMcKn7FOL+5Yeny66eUa1nVxnq2E5XqNm7nuC6tqQj5Sck1i4p73HLNNVhrrGML9vDIdYy+ys1We5RdkEVpbMBcESesUnAdp1k6yexGmfU4/ZCRPp3MuSaesmRC78a1sD7DklrvXmT0YARGCsLpQDOSuNadvtxoL/UWKD7tvd31tATHTA163EFMmHCs7NnQhxUVmAUZZU6UsFJGFONy0qJGsmnbAOcp0XLe9nBPIC383EoLBRUslUV6xlIvvQJa5HiAG2N3tC7A5VbWHq9OUGE+oH36OESrpHNSbwisDKUpiUAXA7mVTJtQLMrlxBvVEeCEJH3NuWaixjJhzjzZdzkd5uwuBi4lqMLhtYxAB55MhljDK/FxwWZt9eA1h7q5bhl1xZIi0jFAj877NMiNroODxhCJwJFCDLAMPyzkv2Evh4B4ua3UnszaZivYfpDdYdh90Q2r3ASKkRsYnnCul03vlOhczDvadI6hTwZuR1dkwNh0kCl2aQav0o9nKADl4CTWLY6l9pKyMLeDK7Y913+ZQu3wHbW7MJeSF2OfS2Ve/vAO9Md/fCl6c/jta/E2wugw+g3AlOQ8")))
|
||||
MARKETING_TEMPLATE = json.loads(zlib.decompress(base64.b64decode("eNrtW01vozoU3edXWCxmpFEJaWbXxajSW41Gbze7SYUcY4IbY1PbNM2r8t/nmo80IZCq1aNMGG9aYx8b+9yDfQ+lzxOEvEeqNJPCu0Hz6fWVrZFqqeHyGcpwleaCGamgwlvLeD4Pqorb2fTr9PraA9Su6LaRah1zuTnomymfJJSsX6qg8l4Ww/+qrtG+5fB2gZARDZc541GIRRQaqs3BIBVY4JTaiRU4H3B+gbtqoOxQL8v05vMmIsNkjVc0TLGAX8VaRZY2UXbskMgUUJFdgfcLLQD3hDKOtxvFVolBTGiDOUckUTJleYp8f8NM4kc00wvvquiQIpULZEe7qWHHTdwOlchc04WH7prTIFIY+mSOKKyaVnCrfOkdVd81useMG+DihExoWiosIF5tbVYWgm9bblq0BTHFJld0sQimX4LGjGtMIk3MnirICeKuUbObdF29lHdX50UUSbKmKtQEi27xsBRi7heYBlVFS1jjUqzW1DCx8jd0qZmhTbiiK6aNsiR5q4SoKZPBA8TTZ/IU+pAzRXVbEBtidsGsgqkpUdToV6JZoVrj+VexhWGzeoUqgLTzhBkPpQhjJiLQe7HXxZhr+jcTWpwixP54yDFnZttNrEX5Naqnw8jtIO8OIbAPxJ4LX4XoKXQpE4ez8GanJ3zZGBopuUXct2Q1e5DOISNR2zDDJjmcflAX/AoxvddSdA5TJTbFSbeOmEJ+hupG9OkToiSR6PPzwjMSMpyFdwNFzgTVZTEjBgrXs9lut/uMvqG3zcKp+Z1qhuMuV7DNvH4qFrDW7d5tST0GcXLYtwqpF9FHymXmXNFoXNE+pKNMfHtd3SUkqn0S4BLLoSh3iaBLBIdSn0vcPpb06lVgmTtluU66OS+hfrnyAvph7wUTirlJ9k9w0NUulc10vK+z2awDEi07D8Nz4T5zwqDODRGdzT5Q9wGOmgI/K69zKR7Q+gdrs9UEQEq8AtU4EzAeE1CHdJwmoM/VXYQJ6JEAZwKGotyZAGcChlKfMwEfS7ozAc4EDKbNVhOgKKdYUx/WHbEIG+rswMi/lKoi7r6cGYaKy/0sZgC2nCu5iPg4C+MszEVI1fmdPzhCzhw5czQKIZe5fVjduVvFJc6vcW/QwKn+3x2WUfmQVoubKRnlxJTbtfO2I/lTV4qZcK/oBjuF3pKhDPvKrC+h5Jl9XRaSCDb6THarpMT5JPILXJObfXfvh4x/bqgw258bGRCea1i3D8+SzHSzFxWPTEmRAtr2tDtcy8CxVCkuAGsYDJ7w/2gL6likDd0Fr4oWRqhVaKjAwuiib1DBg/rW2G7A0y1O+ckILIRVhhQCVXgzwm7tCNNT1VfIeq7/lpFA/3wf79nZm3xdkvJ/EX2cdNh/R57sJr8BfmwhyA==")))
|
||||
|
||||
|
||||
|
||||
@@ -164,7 +164,7 @@
|
||||
"on": {
|
||||
"push": {
|
||||
"branches": [
|
||||
"**"
|
||||
"main"
|
||||
]
|
||||
},
|
||||
"pull_request": {
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
{
|
||||
"run": {
|
||||
"name": "Validate pattern files",
|
||||
"command": "python3 << 'EOF'\nimport yaml\nimport sys\nfrom pathlib import Path\n\nerrors = []\npattern_count = 0\n\nfor yaml_file in Path('.').rglob('*.yaml'):\n if any(part.startswith('.') for part in yaml_file.parts):\n continue\n\n try:\n with open(yaml_file) as f:\n data = yaml.safe_load(f)\n\n if 'patterns/' in str(yaml_file):\n required = ['id', 'title', 'category', 'description', 'content']\n missing = [f for f in required if f not in data]\n if missing:\n errors.append(f\"{yaml_file}: Missing fields: {missing}\")\n pattern_count += 1\n\n except yaml.YAMLError as e:\n errors.append(f\"{yaml_file}: YAML parse error: {e}\")\n except Exception as e:\n errors.append(f\"{yaml_file}: Error: {e}\")\n\nprint(f\"Validated {pattern_count} pattern files\")\n\nif errors:\n print(\"\\nErrors found:\")\n for e in errors:\n print(f\" - {e}\")\n sys.exit(1)\nelse:\n print(\"All patterns valid\")\nEOF\n"
|
||||
"command": "python3 \\<< 'EOF'\nimport yaml\nimport sys\nfrom pathlib import Path\n\nerrors = []\npattern_count = 0\n\nfor yaml_file in Path('.').rglob('*.yaml'):\n if any(part.startswith('.') for part in yaml_file.parts):\n continue\n\n try:\n with open(yaml_file) as f:\n data = yaml.safe_load(f)\n\n if 'patterns/' in str(yaml_file):\n required = ['id', 'title', 'category', 'description', 'content']\n missing = [f for f in required if f not in data]\n if missing:\n errors.append(f\"{yaml_file}: Missing fields: {missing}\")\n pattern_count += 1\n\n except yaml.YAMLError as e:\n errors.append(f\"{yaml_file}: YAML parse error: {e}\")\n except Exception as e:\n errors.append(f\"{yaml_file}: Error: {e}\")\n\nprint(f\"Validated {pattern_count} pattern files\")\n\nif errors:\n print(\"\\nErrors found:\")\n for e in errors:\n print(f\" - {e}\")\n sys.exit(1)\nelse:\n print(\"All patterns valid\")\nEOF\n"
|
||||
}
|
||||
}
|
||||
]
|
||||
|
||||
@@ -51,7 +51,8 @@ class SpecialistNativeTests(unittest.TestCase):
|
||||
self.assertEqual(steps[3], original['jobs']['build-and-test']['steps'][3])
|
||||
self.assertEqual(steps[4]['if'], 'always()')
|
||||
caller = bridge.canonical('mcp-rag', SHA)
|
||||
self.assertEqual(caller['on']['push'], {'branches': ['**']})
|
||||
# Feature branches run once through the PR event, not also on push.
|
||||
self.assertEqual(caller['on']['push'], {'branches': ['main']})
|
||||
self.assertEqual(caller['on']['pull_request'], {'branches': ['main']})
|
||||
self.assertEqual(caller['jobs']['validate']['secrets'], {
|
||||
'QQQ_MCP_VOYAGE_API_KEY': '${{ secrets.QQQ_MCP_VOYAGE_API_KEY }}'})
|
||||
|
||||
@@ -63,6 +63,17 @@ class MavenCiContract(unittest.TestCase):
|
||||
self.assertIn("-Dgpg.keyname=", deploy)
|
||||
self.assertIn("-DskipTests", deploy)
|
||||
|
||||
def test_publication_wait_outlives_central_native_timeout(self):
|
||||
steps = read("src/commands/mvn_jar_deploy.yml")["steps"]
|
||||
publish = next(s["run"] for s in steps if "mvn_jar_deploy.sh" in str(s))
|
||||
# Central 0.8.x waits silently up to 1800 seconds; the default Circle
|
||||
# ten-minute inactivity limit killed an already-uploaded RC in production.
|
||||
timeout = publish["no_output_timeout"]
|
||||
self.assertTrue(timeout.endswith("m"))
|
||||
self.assertGreater(int(timeout[:-1]), 30)
|
||||
self.assertLessEqual(int(timeout[:-1]), 40)
|
||||
self.assertNotIn("max_auto_reruns", publish)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
@@ -0,0 +1,35 @@
|
||||
#!/bin/bash
|
||||
# Exercise the actual collector with colliding suites, spaces and non-JUnit XML.
|
||||
set -euo pipefail
|
||||
script_dir=$(cd "$(dirname "${BASH_SOURCE[0]}")/../src/scripts" && pwd)
|
||||
scratch=$(mktemp -d)
|
||||
trap 'rm -rf "$scratch"' EXIT
|
||||
export HOME="$scratch/home"
|
||||
mkdir -p "$scratch/repo"
|
||||
cd "$scratch/repo"
|
||||
|
||||
# A repository with no tests is valid.
|
||||
bash "$script_dir/mvn_verify_save_test_results.sh"
|
||||
[[ -d "$HOME/test-results/junit" ]]
|
||||
[[ -z "$(find "$HOME/test-results/junit" -type f -print)" ]]
|
||||
|
||||
for module in 'module one' 'module two'; do
|
||||
for runner in surefire failsafe; do
|
||||
report="$module/target/$runner-reports/TEST-shared.xml"
|
||||
mkdir -p "$(dirname "$report")"
|
||||
printf '<testsuite name="%s %s"/>\n' "$module" "$runner" > "$report"
|
||||
done
|
||||
done
|
||||
printf '<failsafe-summary/>\n' > 'module one/target/failsafe-reports/failsafe-summary.xml'
|
||||
printf '<configuration/>\n' > 'module one/target/surefire-reports/configuration.xml'
|
||||
mkdir -p unrelated
|
||||
printf '<testsuite/>\n' > unrelated/TEST-ignore.xml
|
||||
bash "$script_dir/mvn_verify_save_test_results.sh"
|
||||
[[ "$(find "$HOME/test-results/junit" -type f | wc -l)" -eq 4 ]]
|
||||
for module in 'module one' 'module two'; do
|
||||
for runner in surefire failsafe; do
|
||||
report="$module/target/$runner-reports/TEST-shared.xml"
|
||||
cmp "$report" "$HOME/test-results/junit/$report"
|
||||
done
|
||||
done
|
||||
printf 'PASS: unit/integration reports, module collisions, spaces, exclusions and no tests\n'
|
||||
@@ -34,6 +34,7 @@ class MobilePolicyTests(unittest.TestCase):
|
||||
self.assertEqual(job["resource_class"], "small")
|
||||
self.assertIn("PyYAML==6.0.3", job["steps"][1]["run"]["command"])
|
||||
command = job["steps"][2]["run"]["command"]
|
||||
self.assertTrue(command.startswith("python3 \\<< 'EOF'\n"), "CircleCI requires escaped heredoc interpolation markers")
|
||||
script = command.split("\n", 1)[1].rsplit("\nEOF", 1)[0]
|
||||
valid = "id: example\ntitle: Example\ncategory: test\ndescription: test\ncontent: test\n"
|
||||
for text, expected in ((valid, 0), ("id: incomplete\n", 1), ("[invalid", 1)):
|
||||
|
||||
Reference in new issue
Block a user