# This is a combination of 18 commits.

# This is the 1st commit message: parent 4034674 author pgodithi <pgodithi@amazon.com> 1658511437 -0400 committer pgodithi <pgodithi@amazon.com> 1658511496 -0400 gpgsig -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEuaPMeSek3p9IWNzDMSDf0RO9/aIFAmLa4IgACgkQMSDf0RO9 /aI+uA/+MIf7ieROQ+Hyy9oVsAo8IjD1jhAsYouQzAOrbDD5IY9c0RgXEynt5zkP kr2A7eTDKNjFK5K28o34OcstG86omt3ZlzcseQUHKgBkjcAjUIGliQN94ffLrqMH hRThgcUOMSvxttekJiKgaY8gYLL4y7K49kvZ8P+NveqIti58bV7e3c1y6WW6nPWe 9uMx7ge+OttHbklSZzC0u3/aUk0gIta7P+qFj3MoKKEWOG6Q2TylSMIeqwfA0nEK FJ6KnWKDVqHqvHrsil2AqkjlkLt2GR4pvUNyZzKQOF4taHurYdEqUCB4oDTcod1v Q8NuckwM1rt23DEd/qlFWfaUfZciky4q+RGXD3IhDAV/oq6RXjPn7hOKU1HaqXcn zrPVw5Ta7nVefuDbrSQL7/28cJ1ZmdHTXsKH/ss4qVnPL4ckc6j2JR484lSiACbS 2/ep8xsuYN9nj2c/F2ofQ2lH7MVTj3Esc0cPRMh6P9N/Vy3ZJz51RMxfZ11TrLf8 xSifJJNK7gF9Jm8FVJ1h+3P5I2g8/f+Pts0yANSTn/HiaYU9dr8h6If24P3BJaFQ xhHqEtLzHAi/ucKFxDmsgm5nVfBL+sNstblwvMAdgyzCiSnru4nAXXuzt/A6T6EM 0PGAzLJGSpq5hei2ypks+27GiinVCog/T1GS6VHUy6DamWmuZ90= =BkvZ -----END PGP SIGNATURE----- parent 4034674 author pgodithi <pgodithi@amazon.com> 1658511437 -0400 committer pgodithi <pgodithi@amazon.com> 1658511484 -0400 gpgsig -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEuaPMeSek3p9IWNzDMSDf0RO9/aIFAmLa4HwACgkQMSDf0RO9 /aL0Xg//aD8uuDZoTVqsnOpcuVH4Pl12bg95TnsVe+Sy6keAk/WdKoyjKTco41AM zeLpO0u6q5ZUVXfzIoXnQiBMw/H/DLjTP0fhdHBWbVM1gnBxhr3uqChhCj452uE/ KBaIMUVdZxfVpfbRH3SsNemJ7nQxhn3rJVnEtOr7NUVo0RSJlU9bQGUbJLzh7YuE AKKMnjUkVzi7poZEVnLDTy2RS9N4D1hI30dXHliK2e+nx1PXygpfta7Z7e418FoZ cbbyRHtv4l82ZtDWhjWHfyyrv8SVpQoE4M/Le96S6LfyZPFkZVw5bloeg7GDps+Y o4ktqcI6T+R+/hvpKgt4q0YihZwKZor0UHbvY0CCVOcPPS5FVjbKgTTFAKGPlthL xPo+fKU12AfHj8zI6XpTQOcsEp2ZxxNjRY1fpac8pHiy9KtcZ5cOHaKtbss2+eqW /XriA2gejyBvfOHgghN9ouYleFpN7vcUIcVr1P7dY/LeNezfibwzTPYuriJILHZj +uokaqPMgmJARBh5gAkCKL5EzfsdUrld9lD3b/3++9mFetExUm7nt5oHYG/2lzJs 52lBq+cHjRE6bQi8D7QMf415V4REBI8h97XjtnRB6p0e+y5vLHCezRzKSX0zwaF2 9MYLj6b/GE2vP/V/Vo6gWrKfWZmBin+MJFHnGmofKvNLV7qtvho= =MUD9 -----END PGP SIGNATURE----- parent 4034674 author pgodithi <pgodithi@amazon.com> 1658511437 -0400 committer pgodithi <pgodithi@amazon.com> 1658511470 -0400 gpgsig -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEuaPMeSek3p9IWNzDMSDf0RO9/aIFAmLa4G4ACgkQMSDf0RO9 /aLJ3hAAgShTzsqd6oU87/57pmNX5C+G6aT/hyZNj/ytL1pL2IvmsE5wW+5xLVqW HN7hkqH3tbqykUXfqvubXSCerA0UXzSeXkguqjbneyfEmy60cQ+sPs68l5lX1XHH Q6ulVUIQUdXDxzSTHXoDXHlm3mK2Emsti/ecy+O3gCgXsxwp/Vz3r376u5Pk+rQz +WioZ5UL3oHdN+9szjq4iLB8EeouaCMFCx+1WxGsTiSasxRZYWwMGl9W5joaRzNX LIn8u/CBuAU/a7/FvkZTFe2C0CrnluNykv3YwUn5OunoFBj0oHxPYwc2kJInaf/v cl8yvyNJwEdNg07mkduLuJss21QoD8BHeROI+JvLyJnzqOMsbMyGiFIxIpPxWbS7 DNNpUR/q2qg7A1RDKDVKDmXoPyfSXogVxVAeP/Cj2kxB9Mh8BCkI6t5Xj4jPNhYH dCVgF8FvUbyJaauZ8w67TYugap2CWc8I+9Q6aBb+8TpsWCyAmpIVhXTVln5dUYwN P+1EmIvhbhbBZow1hQ6oL3QsSUDTxtGkBpxd8zN4wcR7AtWBw3shknmk7ktDfry4 mU4Ppau9s7Ru4Cc2LAIMrBb/TYR5GrgzPFlb4Gs9dHrnmiylk9MZ0uOLsd1w3Dnq t8A0bUXR1YaFnKRsWKBUo1At7qvQGM9FiJAWzhbVlhLRErB+aIQ= =Bj8V -----END PGP SIGNATURE----- parent 4034674 author pgodithi <pgodithi@amazon.com> 1658511437 -0400 committer pgodithi <pgodithi@amazon.com> 1658511455 -0400 gpgsig -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEuaPMeSek3p9IWNzDMSDf0RO9/aIFAmLa4F8ACgkQMSDf0RO9 /aIccg//XFm4uaihSzRTiVndSewfFOGS5lUWRKwgkN3s9k4lwgwJyg3tbhAw5lJG rcEvD5Vwifcwv8vaNpUE7xh6sooO5TcQj3U2HISaJUXfRF4eXV7DjT9IwS24cX8/ ZiQ9EaFc+0lFJI1SB02ewHz8M0hCIWTKUckyDdbEOUtejIU5PZRfbITqR0syT3f4 r19ar1Z8i3rJBlh6lMzErMla4cQQBidVrPaLL3dD4l+ZBLIt9rQghChkzZLXYxhH rQa5DzGGmoSxqjmrW2rKZn6qzE4cR57IRqpFMz72ySCDbYuGZCX4uGfYM1IYzix+ kCjiYyAeJ+T0e4yGZVj3ckA8+H9QDHl/nv9w0ymq5ocVbaxJ1Z9sZlejJGd/Psdb HiUa+t792ABgO/pI08o8ga3SNb4NZAhF7IwXepLTP8UMnDdlfn3+/7PMECwa2ojH 0m91VeHgUEA86YauCt9O8Rx2YRUCV7mQ8MfoawDL3LfmpQxtysoTO3BX2I3NVR0O XPIu8Ja9uUxsrmBD6LJ2LCeQ1GovOl9veM5SkVjH1onfHMFcCEmv113dmqZUCGEb JrkEDHeH+CmuOvPIOyJeLFG+YEKR0+MWtcvkfYNAn/PlEoO5L5LTDoPh6uxyq5b+ G84PtJSMTO7Z/dkyGZNupgw+3zjzwRRaHjZ4GLbmKQq+7Lzshis= =ESCj -----END PGP SIGNATURE----- parent 4034674 author pgodithi <pgodithi@amazon.com> 1658511437 -0400 committer pgodithi <pgodithi@amazon.com> 1658511439 -0400 gpgsig -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEuaPMeSek3p9IWNzDMSDf0RO9/aIFAmLa4E8ACgkQMSDf0RO9 /aJuiBAArcbfDuI4Q9aAjTPqVpD3k/Jw6QlVLG2erOEBWT0MR8EKeFGCjskzzCPZ CF27ZSAxxiwwsGSM1u9qMSotDrExYSkFid2ME0CVinHJQN+Byjjmeu9kqFQXTim3 YqEhVt5mbfc/lV6qd+O1DafzNsqN2AJKpEwejFznqZOqhG1mQAqXQMKnU5NTI6FH cVte0nOFZ3OBNqSHAV/D6CH5xfWpaHtvH5OhhsNUlPReQYJbHWewzihCDhL61zFa k10eF0euyT+FlxO2iuuQXKySUIUlqdnEMl9+BvBGCDxWAZVhqa9IUQ3e6V5ntpW3 mWDBm8tMPmp1HLpGhhCYXXNZgpAraKR5nkHB1MPCGNr1NPjkAvj1RY2F3WL92M79 UotUTQSyEgtDEgzghtIUrXmmsQgVrii14RwtaJMJV7hq9y0nYtn25euIteHy7NyI 2bpe0PxOWOw8OymQcepjyGTo0H7aKTgb9KOuyTwRhqkU0jPYfznNNFdo0c21/PoK OwOu86yZLsxY3tEZGlJK2fBwBUktMOBsQxbM83dWYk31tTMB7Tf+tXZF7meOCmls JDg17FAaqiHnHEZ18YksjUA84IWnSnjTmLAxKIYa7i5cnjFnWK9BNQvsyiXW4qhn v20X15+EouRCePu3uRnpI8yNf5Q4R7pBmDlvYy6zJfppQtfD6x4= =vkB5 -----END PGP SIGNATURE----- parent 911a3a0 author pgodithi <pgodithi@amazon.com> 1658511150 -0400 committer pgodithi <pgodithi@amazon.com> 1658511189 -0400 gpgsig -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEuaPMeSek3p9IWNzDMSDf0RO9/aIFAmLa31UACgkQMSDf0RO9 /aJOHQ//ecjaTfftv4cMqqhOpTNwiwm0AbXyOp6w9zcuOgCaR3IVYfZGIdK6+UJ2 n0KZKP8+Aip0TzIXheDrrk3tF9+yCuoRCCFIlkdLkXAUhSu7t8zX5DcnTSnq/ahA d4lFLL5trB2IsCDKG5trTHO81uWtaf5UfcBmVmgsqWe2OsFPmBwMYgKM93he4VAN HrridkwHKB8DnXwJdGrEv97mFEwA1TJVDmmd70bB3XlXWsvECy94vtt3ly2f8AX6 5cwaSmqr6KotphTAipXWvj3R7jaorpn6N4AT3oh2LL9bQ4lBdZvY/kl96qYs6vAT ws+BUjihxxswOaKUjnLUdoiViwUCjKSiaPSb5T6mZuzCSegF5+9kuhkMBvChkWUG rgkq0bbmTnnBFZn+QhU2A03xg6CxZO44r6UxkX4yVU3CkPyKSFGRqgYEWWCfFCwh SwAv/TE3OLffHLoxUht8bMZ3qFcWFJpGv3dYN+vFMy8Fumf+t9sAhBXjJFkdrmqF 9zv27pO6KfZVCk2lg4T17BBZ4NKOGs0YJannvq/80Q32Sjl0mf/ChoTsnG7YzJxo 7O55nc4sXw/E+a/78RscWqUoUSXIa4D69RQxFS8x31FsXhSDpuDom9SkyDMIMFSD L16Yi+cSOLM0DBd7ajI5KegHjxrK1d16mIhwCekf7ykjR6zePME= =jOT6 -----END PGP SIGNATURE----- parent 911a3a0 author pgodithi <pgodithi@amazon.com> 1658511150 -0400 committer pgodithi <pgodithi@amazon.com> 1658511150 -0400 gpgsig -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEuaPMeSek3p9IWNzDMSDf0RO9/aIFAmLa3y8ACgkQMSDf0RO9 /aLVShAAqF370BU0vihflbom1UwJZLsz/YI7G7hS+zIlkKdEeLMYAujr6x/AIdwf xxuqqiHo/B2M6BoIpDulYPAigpz6uMsBh/1oVPeKuJs8su6bPGbPmp7j8fojF00I mbJFlWbkQknpjhzPt4XCLsO9zl7urAzttOJeMCnYlyt8jWHkBvFMPxaEpqlhq4xA IRhL2PkeAOB+WktejCi8Gno2waVjcrQBCGoVtqH9vKwNTFC+JjHmGPcmuD2h2Uuj DVDqo7LA04wtfpcml6KbSBrhUolZyRsyVqiEWpihKe9gFLYQKJI+gr42yMYJohJO u3d5VfYQeLciLa350CRD/GfV7VGMgu+aJ7N9h0kwPm+hri8nSQM7atwrTgPA+wfL NXqbROTT8ETKNaoo1g2fdYS/oo9Tru705m4tr9h6WN8YMtEKPm5jD4DwxtLI8JbK T7a3hZ9jOyRAmdTpkYgPHVNWBtLhraUTRfzh/P86Pg2wBtoSTvw/ngDfLh5PVHcV +Rb3JcEqKNCJnHkEqmzPlXFlZzmrIY3/k5QwK6MozMrQ23fbdTE+NREFR0AZygYy APnzo8sYHz2idOla8VYeJumorIpSiAxLS64TTAc4y8wjdiRxUCbdxa8t14dIXUqp Ye3fvWwBNlW+y1IYVq1PN/NU9z/7s/UutuDw31pJ2GkqzfzyCRs= =QoHe -----END PGP SIGNATURE----- MacOS Signed-off-by: pgodithi <pgodithi@amazon.com> Add gradle cleanup before the checks (opensearch-project#2285) Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> Update remaining env vars with credentials in jenkins libraries (opensearch-project#2286) * Update getManifestSHA lib env vars with credentials Signed-off-by: Sayali Gaikawad <gaiksaya@amazon.com> Remove 2.1.0 from cron for building release candidates (opensearch-project#2287) Signed-off-by: Sayali Gaikawad <gaiksaya@amazon.com> Add signer to support signing windows artifacts (opensearch-project#2156) * Add signer for windows distribution and implement the jenkins libarary to be capable of signing for windows. Signed-off-by: Zelin Hao <zelinhao@amazon.com> * Replace platform with MagicMock for testing Signed-off-by: Zelin Hao <zelinhao@amazon.com> * Change to not initiate signer for mock case Signed-off-by: Zelin Hao <zelinhao@amazon.com> * Change the default signature type to .asc for compatibility with old usage Signed-off-by: Zelin Hao <zelinhao@amazon.com> * Add signer abstract class Signed-off-by: Zelin Hao <zelinhao@amazon.com> * Remove abstract method Signed-off-by: Zelin Hao <zelinhao@amazon.com> * Commit test cases Signed-off-by: Zelin Hao <zelinhao@amazon.com> * Fix python tests Signed-off-by: Zelin Hao <zelinhao@amazon.com> * Remove unused library import Signed-off-by: Zelin Hao <zelinhao@amazon.com> * Fix mock repo tests Signed-off-by: Zelin Hao <zelinhao@amazon.com> * Remove commmented block Signed-off-by: Zelin Hao <zelinhao@amazon.com> * Fix the python tests and combine credentials Signed-off-by: Zelin Hao <zelinhao@amazon.com> * Change path for windows tests Signed-off-by: Zelin Hao <zelinhao@amazon.com> Update sql plugin name to opensearch-sql-plugin (opensearch-project#2295) Signed-off-by: Joshua Li <joshuali925@gmail.com> Update the tag creation workflow with bundle manifest groovy library (opensearch-project#2296) Signed-off-by: Zelin Hao <zelinhao@amazon.com> Add jdk14 for gradle check 1.x version (opensearch-project#2300) Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> Create a docker promotion jenkins workflow (opensearch-project#2288) * Add docker promotion jenkins jobs Signed-off-by: Zelin Hao <zelinhao@amazon.com> * Create a Jenkins workflow for docker promotion job Signed-off-by: Zelin Hao <zelinhao@amazon.com> * Fix promoting product with its individual image tag Signed-off-by: Zelin Hao <zelinhao@amazon.com> * Add data prepper into tests Signed-off-by: Zelin Hao <zelinhao@amazon.com> * Convert to use docker copy job Signed-off-by: Zelin Hao <zelinhao@amazon.com> * Update test cases Signed-off-by: Zelin Hao <zelinhao@amazon.com> Add java home args in 1.3.4 manifest (opensearch-project#2299) Signed-off-by: Zelin Hao <zelinhao@amazon.com> Add 2.1.0 release notes (opensearch-project#2302) * Add 2.1.0 release notes Signed-off-by: Sayali Gaikawad <gaiksaya@amazon.com> CVE's Fix for Jenkins opensearch-project#2280 opensearch-project#2272 opensearch-project#2239 opensearch-project#1962 (opensearch-project#2303) * Change ref to 2.1 for opensearch dahsboards (opensearch-project#2267) Signed-off-by: Sayali Gaikawad <gaiksaya@amazon.com> test versionmatrixtest.yaml Signed-off-by: pgodithi <pgodithi@amazon.com> test versionmatrixtest.yaml Signed-off-by: pgodithi <pgodithi@amazon.com> test versionmatrixtest.yaml Signed-off-by: pgodithi <pgodithi@amazon.com> test versionmatrixtest.yaml Signed-off-by: pgodithi <pgodithi@amazon.com> test versionmatrixtest.yaml Signed-off-by: pgodithi <pgodithi@amazon.com> test versionmatrixtest.yaml Signed-off-by: pgodithi <pgodithi@amazon.com> test versionmatrixtest.yaml Signed-off-by: pgodithi <pgodithi@amazon.com> test versionmatrixtest.yaml Signed-off-by: pgodithi <pgodithi@amazon.com> test versionmatrixtest.yaml Signed-off-by: pgodithi <pgodithi@amazon.com> versionincrement.yaml matrix test Signed-off-by: pgodithi <pgodithi@amazon.com> versionincrement.yaml matrix test Signed-off-by: pgodithi <pgodithi@amazon.com> versionincrement.yaml matrix test Signed-off-by: pgodithi <pgodithi@amazon.com> versionincrement.yaml matrix test Signed-off-by: pgodithi <pgodithi@amazon.com> versionincrement.yaml matrix test Signed-off-by: pgodithi <pgodithi@amazon.com> versionincrement.yaml matrix test Signed-off-by: pgodithi <pgodithi@amazon.com> versionincrement.yaml matrix test Signed-off-by: pgodithi <pgodithi@amazon.com> versionincrement.yaml matrix test Signed-off-by: pgodithi <pgodithi@amazon.com> test versionmatrixtest.yaml Signed-off-by: pgodithi <pgodithi@amazon.com> Add test manifest to check build job (opensearch-project#2273) Signed-off-by: Sayali Gaikawad <gaiksaya@amazon.com> Set concurrent build limit for gradle check (opensearch-project#2274) Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> Add test coverage xml and support 1.x gradle check (opensearch-project#2279) * Add test coverage xml and support 1.x gradle check Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> * Remove comments Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> Add java args to 2.2.0 manifest (opensearch-project#2281) Signed-off-by: Sayali Gaikawad <gaiksaya@amazon.com> Update downloadFromS3 lib env vars with credentials (opensearch-project#2278) Signed-off-by: Sayali Gaikawad <gaiksaya@amazon.com> Update buildUploadManifestSHA lib env vars with credentials (opensearch-project#2277) Signed-off-by: Sayali Gaikawad <gaiksaya@amazon.com> Update signArtifacts lib env vars with credentials (opensearch-project#2275) Signed-off-by: Sayali Gaikawad <gaiksaya@amazon.com> [OSD][2.1] add functional test repo (opensearch-project#2282) Signed-off-by: Kawika Avilla <kavilla414@gmail.com> Change codecov xml name and move gradle check script to build repo (opensearch-project#2283) * Change codecov xml name and move gradle check script to build repo Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> * Add tests Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> * Tweak tokens Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> * Tweak jenkins codeCoverage.xml Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> * Add codeCoverage.xml Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> Add gradle cleanup before the checks (opensearch-project#2285) Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> Update promoteArtifactsLib lib env vars with credentials (opensearch-project#2284) * Resolve merge conflicts Signed-off-by: Sayali Gaikawad <gaiksaya@amazon.com> Update remaining env vars with credentials in jenkins libraries (opensearch-project#2286) * Update getManifestSHA lib env vars with credentials Signed-off-by: Sayali Gaikawad <gaiksaya@amazon.com> Remove 2.1.0 from cron for building release candidates (opensearch-project#2287) Signed-off-by: Sayali Gaikawad <gaiksaya@amazon.com> test versionmatrixtest.yaml Signed-off-by: pgodithi <pgodithi@amazon.com> Version increment automation Signed-off-by: pgodithi <pgodithi@amazon.com> Version increment automation Signed-off-by: pgodithi <pgodithi@amazon.com> Version increment automation Signed-off-by: pgodithi <pgodithi@amazon.com> Version increment automation Signed-off-by: pgodithi <pgodithi@amazon.com> Version increment automation Signed-off-by: pgodithi <pgodithi@amazon.com> Version increment automation Signed-off-by: pgodithi <pgodithi@amazon.com> test versionmatrixtest.yaml Signed-off-by: pgodithi <pgodithi@amazon.com> test versionmatrixtest.yaml Signed-off-by: pgodithi <pgodithi@amazon.com> test versionmatrixtest.yaml Signed-off-by: pgodithi <pgodithi@amazon.com> test versionmatrixtest.yaml Signed-off-by: pgodithi <pgodithi@amazon.com> test versionmatrixtest.yaml Signed-off-by: pgodithi <pgodithi@amazon.com> test versionmatrixtest.yaml Signed-off-by: pgodithi <pgodithi@amazon.com> test versionmatrixtest.yaml Signed-off-by: pgodithi <pgodithi@amazon.com> test versionmatrixtest.yaml Signed-off-by: pgodithi <pgodithi@amazon.com> test versionmatrixtest.yaml Signed-off-by: pgodithi <pgodithi@amazon.com> test version increment automation Signed-off-by: pgodithi <pgodithi@amazon.com> test version increment automation Signed-off-by: pgodithi <pgodithi@amazon.com> Staging version increment automation Signed-off-by: pgodithi <pgodithi@amazon.com> Staging version increment automation Signed-off-by: pgodithi <pgodithi@amazon.com> Staging version increment automation Signed-off-by: pgodithi <pgodithi@amazon.com> version increment automation Signed-off-by: pgodithi <pgodithi@amazon.com> * Version increment automation Signed-off-by: pgodithi <pgodithi@amazon.com> * Version increment automation Signed-off-by: pgodithi <pgodithi@amazon.com> * Version increment automation Signed-off-by: pgodithi <pgodithi@amazon.com> * Version increment automation Signed-off-by: pgodithi <pgodithi@amazon.com> * Version increment automation Signed-off-by: pgodithi <pgodithi@amazon.com> * vulnerabilitiesfix Signed-off-by: pgodithi <pgodithi@amazon.com> * vulnerabilitiesfix Signed-off-by: pgodithi <pgodithi@amazon.com> * CVE fix Signed-off-by: pgodithi <pgodithi@amazon.com> * CVE's: CVE-2021-30129 sshd-core-2.5.1.jar fix Signed-off-by: pgodithi <pgodithi@amazon.com> * CVE's: CVE-2021-30129 sshd-core-2.5.1.jar fix Signed-off-by: pgodithi <pgodithi@amazon.com> * CVE fix Signed-off-by: pgodithi <pgodithi@amazon.com> * CVE fix Signed-off-by: pgodithi <pgodithi@amazon.com> Co-authored-by: Sayali Gaikawad <61760125+gaiksaya@users.noreply.github.com> Modify 2.1.0 release notes for OpenSearch component (opensearch-project#2313) Signed-off-by: Sayali Gaikawad <gaiksaya@amazon.com> Update Gradle Wrapper to 7.4.2 (opensearch-project#2289) * Update Gradle Wrapper to 7.4.2 Signed-off-by: Daniel Widdis <widdis@gmail.com> * Update Jenkins scan to new Gradle version Signed-off-by: Daniel Widdis <widdis@gmail.com> Add handling of push events on gradle check (opensearch-project#2315) Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> Add OpenSearch release notes link (opensearch-project#2318) Signed-off-by: Sayali Gaikawad <gaiksaya@amazon.com> Add components to 1.3.4 manifest (opensearch-project#2319) * Add components to 1.3.4 manifest Signed-off-by: Zelin Hao <zelinhao@amazon.com> * Remove atomicwrites from pipfile Signed-off-by: Zelin Hao <zelinhao@amazon.com> * Adding back the atomicwrites Signed-off-by: Zelin Hao <zelinhao@amazon.com> Move data prepper jenkins env vars to credentials (opensearch-project#2320) * Move data prepper jenkins env vars to credentials Signed-off-by: Sayali Gaikawad <gaiksaya@amazon.com> Update the JDK version for manifest checks on 3.0.0 (opensearch-project#2301) * Exclude manifest checks for 3.0.0 for now Signed-off-by: Zelin Hao <zelinhao@amazon.com> * Add conditional checks for jdk14 and jdk17 Signed-off-by: Zelin Hao <zelinhao@amazon.com> * Change jdk version Signed-off-by: Zelin Hao <zelinhao@amazon.com> Update release issue template (opensearch-project#2317) * Update release issue template Signed-off-by: Sayali Gaikawad <gaiksaya@amazon.com> Rename webhooks for notifications (opensearch-project#2322) Signed-off-by: Sayali Gaikawad <gaiksaya@amazon.com> Add check for test manifest and update error message (opensearch-project#2321) * Add check for test manifest and update error message Signed-off-by: Sayali Gaikawad <gaiksaya@amazon.com> Fixing junit task (opensearch-project#2328) Signed-off-by: Andriy Redko <andriy.redko@aiven.io> Version increment automation: matrix check Signed-off-by: pgodithi <pgodithi@amazon.com> Version increment automation: matrix check Signed-off-by: pgodithi <pgodithi@amazon.com> Version increment automation: matrix check Signed-off-by: pgodithi <pgodithi@amazon.com> Version increment automation: matrix check Signed-off-by: pgodithi <pgodithi@amazon.com> Version increment automation: matrix check Signed-off-by: pgodithi <pgodithi@amazon.com> Version increment automation: yamllint Signed-off-by: pgodithi <pgodithi@amazon.com> Version increment automation: yamllint Signed-off-by: pgodithi <pgodithi@amazon.com> Version increment automation: matrix test Signed-off-by: pgodithi <pgodithi@amazon.com> Version increment automation: matrix test Signed-off-by: pgodithi <pgodithi@amazon.com> Version increment automation: matrix test Signed-off-by: pgodithi <pgodithi@amazon.com> Version increment automation: test path matrix Signed-off-by: pgodithi <pgodithi@amazon.com> Version increment automation: test path matrix Signed-off-by: pgodithi <pgodithi@amazon.com> Version increment automation: test path matrix Signed-off-by: pgodithi <pgodithi@amazon.com> Version increment automation: test path matrix Signed-off-by: pgodithi <pgodithi@amazon.com> Version increment automation: test path matrix Signed-off-by: pgodithi <pgodithi@amazon.com> Version increment automation: test path matrix Signed-off-by: pgodithi <pgodithi@amazon.com> Version increment automation: test path matrix Signed-off-by: pgodithi <pgodithi@amazon.com> Version increment automation: test path matrix Signed-off-by: pgodithi <pgodithi@amazon.com> Version increment automation: test path matrix Signed-off-by: pgodithi <pgodithi@amazon.com> Version increment automation: test path matrix Signed-off-by: pgodithi <pgodithi@amazon.com> Version increment automation: test path matrix Signed-off-by: pgodithi <pgodithi@amazon.com> Version increment automation: test path matrix Signed-off-by: pgodithi <pgodithi@amazon.com> Version increment automation: test path matrix Signed-off-by: pgodithi <pgodithi@amazon.com> Version increment automation: test path matrix Signed-off-by: pgodithi <pgodithi@amazon.com> Version increment automation: test path matrix Signed-off-by: pgodithi <pgodithi@amazon.com> Version increment automation: test path matrix Signed-off-by: pgodithi <pgodithi@amazon.com> Version increment automation: test path matrix Signed-off-by: pgodithi <pgodithi@amazon.com> Version increment automation: test path matrix Signed-off-by: pgodithi <pgodithi@amazon.com> Version increment automation: test path matrix Signed-off-by: pgodithi <pgodithi@amazon.com> Version increment automation: yamllint fix Signed-off-by: pgodithi <pgodithi@amazon.com> Version increment automation: yamllint fix Signed-off-by: pgodithi <pgodithi@amazon.com> Version increment automation: yamllint fix Signed-off-by: pgodithi <pgodithi@amazon.com> Move artifact bucket name from env to creds (opensearch-project#2327) Signed-off-by: Sayali Gaikawad <gaiksaya@amazon.com> Add some of the remaining components (opensearch-project#2329) Signed-off-by: Zelin Hao <zelinhao@amazon.com> Add alerting and ml (opensearch-project#2330) Signed-off-by: Zelin Hao <zelinhao@amazon.com> Updated manifests. (opensearch-project#2323) Signed-off-by: opensearch-ci-bot <opensearch-infra@amazon.com> Co-authored-by: opensearch-ci-bot <opensearch-infra@amazon.com> # This is the commit message opensearch-project#2: Add remaining components (opensearch-project#2331) Signed-off-by: Zelin Hao <zelinhao@amazon.com> # This is the commit message opensearch-project#3: Version increment automation: Add signoff to true Signed-off-by: pgodithi <pgodithi@amazon.com> # This is the commit message opensearch-project#4: Version increment automation: Add signoff setup Signed-off-by: pgodithi <pgodithi@amazon.com> # This is the commit message opensearch-project#5: Version increment automation: Add signoff setup Signed-off-by: pgodithi <pgodithi@amazon.com> # This is the commit message opensearch-project#6: Version increment automation: Add signoff setup Signed-off-by: pgodithi <pgodithi@amazon.com> # This is the commit message opensearch-project#7: Version increment automation: Add signoff setup Signed-off-by: pgodithi <pgodithi@amazon.com> # This is the commit message opensearch-project#8: Version increment automation: change to on workflow_dispatch Signed-off-by: pgodithi <pgodithi@amazon.com> # This is the commit message opensearch-project#9: Add java args to 2.1.1 manifest (opensearch-project#2334) Signed-off-by: Sayali Gaikawad <gaiksaya@amazon.com> # This is the commit message opensearch-project#10: Add JS and CU to 2.1.1 (opensearch-project#2335) Signed-off-by: Sayali Gaikawad <gaiksaya@amazon.com> # This is the commit message opensearch-project#11: Generate the consolidated release notes for 1.3.4 (opensearch-project#2336) * Generate the consolidated release notes for 1.3.4 Signed-off-by: Zelin Hao <zelinhao@amazon.com> * Remove the version increment Signed-off-by: Zelin Hao <zelinhao@amazon.com> * Remove OSD release notes link Signed-off-by: Zelin Hao <zelinhao@amazon.com> # This is the commit message opensearch-project#12: Version increment automation: workflow rename Signed-off-by: pgodithi <pgodithi@amazon.com> # This is the commit message opensearch-project#13: darwin test Signed-off-by: pgodithi <pgodithi@amazon.com> # This is the commit message opensearch-project#14: darwin test Signed-off-by: pgodithi <pgodithi@amazon.com> # This is the commit message opensearch-project#15: darwin test Signed-off-by: pgodithi <pgodithi@amazon.com> # This is the commit message opensearch-project#16: Replace the ref for manifest 1.3.4 with tags (opensearch-project#2337) * Replace the ref for manifest 1.3.4 with tags Signed-off-by: Zelin Hao <zelinhao@amazon.com> * Remove 1.3.4 build from CI Signed-off-by: Zelin Hao <zelinhao@amazon.com> # This is the commit message opensearch-project#17: Add jenkins prefix to the credentials (opensearch-project#2341) Signed-off-by: Sayali Gaikawad <gaiksaya@amazon.com> # This is the commit message #18: default build.sh logic add for Gradle custom java zippublish plugin (opensearch-project#1999) * Added custom plugin eval logic Signed-off-by: pgodithi <pgodithi@amazon.com> * fixed failure checks Signed-off-by: pgodithi <pgodithi@amazon.com> * changed to query system property Signed-off-by: pgodithi <pgodithi@amazon.com> * Added system property for version check Signed-off-by: pgodithi <pgodithi@amazon.com> * Added gradle props Signed-off-by: pgodithi <pgodithi@amazon.com> * publish task name change to publishPluginZipPublicationToZipStagingRepository Signed-off-by: pgodithi <pgodithi@amazon.com> * Add publishPluginZipPublicationToZipStagingRepository to default build script Signed-off-by: pgodithi <pgodithi@amazon.com> * Add publishPluginZipPublicationToZipStagingRepository to default build script Signed-off-by: pgodithi <pgodithi@amazon.com>
prudhvigodithi · Jul 22, 2022 · 8f5d7b4 · 8f5d7b4
1 parent 4034674
commit 8f5d7b4
Show file tree

Hide file tree

Showing 15 changed files with 390 additions and 128 deletions.
diff --git a/.github/workflows/increment-plugin-versions.yml b/.github/workflows/increment-plugin-versions.yml
@@ -0,0 +1,89 @@
+---
+name: Increment Plugin Versions
+
+on:
+  workflow_dispatch:
+    inputs:
+      logLevel:
+        description: Log level
+        required: true
+        default: warning
+        type: choice
+        options:
+          - info
+          - warning
+          - debug
+
+jobs:
+  plugin-version-increment-sync:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        entry:
+          - {repo: alerting}
+          - {repo: anomaly-detection}
+          - {repo: asynchronous-search}
+          - {repo: common-utils}
+          - {repo: cross-cluster-replication}
+          - {repo: dashboards-reports, path: reports-scheduler}
+          - {repo: geospatial}
+          - {repo: index-management}
+          - {repo: job-scheduler}
+          - {repo: k-NN}
+          - {repo: ml-commons}
+          - {repo: notifications, path: notifications}
+          - {repo: observability, path: opensearch-observability}
+          - {repo: performance-analyzer}
+          - {repo: performance-analyzer-rca}
+          - {repo: security}
+          - {repo: sql}
+        branch:
+          - 'main'
+          - '2.x'
+          - '2.1'
+          - '2.2'
+    steps:
+      - name: Check out OpenSearch repo
+        uses: actions/checkout@v3
+        with:
+          repository: opensearch-project/OpenSearch
+          ref: ${{ matrix.branch }}
+      - name: Fetch OpenSearch version
+        run: |
+          OPENSEARCH_VERSION=$(cat buildSrc/version.properties | grep opensearch | cut -d= -f2 | grep -oE '[0-9.]+')
+          echo "OPENSEARCH_VERSION_NUMBER=$OPENSEARCH_VERSION" >> $GITHUB_ENV
+          OPENSEARCH_VERSION=$OPENSEARCH_VERSION-SNAPSHOT
+          echo "OPENSEARCH_VERSION=$OPENSEARCH_VERSION" >> $GITHUB_ENV
+      - name: Check out plugin repo
+        uses: actions/checkout@v3
+        with:
+          repository: opensearch-project/${{ matrix.entry.repo }}
+          ref: ${{ matrix.branch }}
+      - name: Increment Version in ${{ matrix.entry.repo }}
+        run: |
+          echo "OpenSearch Core repo version on branch ${{ matrix.branch }} is ${{ env.OPENSEARCH_VERSION_NUMBER }}"
+          if [ ${{ matrix.entry.path }} ]; then
+            echo "The gradle path is ${{ matrix.entry.path }}"
+            cd ${{ matrix.entry.path }}
+          fi
+          ./gradlew updateVersion -DnewVersion=${{ env.OPENSEARCH_VERSION }}
+      - name: Create Pull Request
+        id: cpr
+        uses: peter-evans/create-pull-request@v4
+        with:
+          token: ${{ secrets.CIBOTAUTOPR }}
+          author: opensearch-ci-bot <opensearch-infra@amazon.com>
+          commit-message: |
+            Increment version to ${{ env.OPENSEARCH_VERSION }}
+
+            Signed-off-by: opensearch-ci-bot <opensearch-infra@amazon.com>
+          delete-branch: true
+          branch: create-pull-request/${{ env.OPENSEARCH_VERSION }}
+          title: '[AUTO] Increment version to ${{ env.OPENSEARCH_VERSION }}'
+          body: |
+            - Incremented version to **${{ env.OPENSEARCH_VERSION }}**.
+      - name: Check outputs
+        run: |-
+          echo "Pull Request Number - ${{ steps.cpr.outputs.pull-request-number }}"
+          echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}"
diff --git a/.github/workflows/versionincrement.yaml b/.github/workflows/versionincrement.yaml
diff --git a/jenkins/opensearch-maven-release/maven-sign-release.jenkinsfile b/jenkins/opensearch-maven-release/maven-sign-release.jenkinsfile
@@ -22,6 +22,7 @@ pipeline {
     }
     environment {
         ARTIFACT_PATH = "distribution-build-opensearch/${VERSION}/${BUILD_ID}/linux/x64/tar/builds"
+        ARTIFACT_BUCKET_NAME = credentials('jenkins-artifact-bucket-name')
     }
     stages {
         stage('sign') {

diff --git a/jenkins/opensearch-ruby/Jenkinsfile b/jenkins/opensearch-ruby/Jenkinsfile
@@ -12,6 +12,9 @@ pipeline {
             trim: true
         )
     }
+    environment {
+        ARTIFACT_BUCKET_NAME = credentials('jenkins-artifact-bucket-name')
+    }
     stages {
         stage('ruby-build-sign-upload') {
             agent {
@@ -28,7 +31,7 @@ pipeline {
                         error('RELEASE_BRANCH parameter is not set')
                     }
                     git url: 'https://github.com/opensearch-project/opensearch-ruby.git', branch: "$RELEASE_BRANCH"
-                    withCredentials([string(credentialsId: 'opensearchproject-rubygems-private-key', variable: 'RUBYGEMS_PRIVATE_KEY')]) {
+                    withCredentials([string(credentialsId: 'jenkins-opensearchproject-rubygems-private-key', variable: 'RUBYGEMS_PRIVATE_KEY')]) {
                         writeFile file: 'gem-private_key.pem', text: RUBYGEMS_PRIVATE_KEY
                     }
                     sh'''

diff --git a/jenkins/opensearch/distribution-build.jenkinsfile b/jenkins/opensearch/distribution-build.jenkinsfile
@@ -67,18 +67,18 @@ pipeline {
         }
         stage('build') {
             parallel {
-                stage('build-snapshot-x64-tar') {
+                /*stage('build-snapshot-x64-darwin-tar') {
                     environment {
                         SNAPSHOT_REPO_URL = "https://aws.oss.sonatype.org/content/repositories/snapshots/"
                     }
                     agent {
-                        docker {
-                            label AGENT_X64
-                            image dockerAgent.image
-                            args dockerAgent.args
-                            alwaysPull true
+                        node {
+                            label 'Jenkins-Agent-Mac-M1-Single-Host'
                         }
                     }
+                    tools {
+                        jdk 'jdk-17'
+                    }
                     steps {
                         script {
                             buildManifest(
@@ -109,8 +109,8 @@ pipeline {
                             postCleanup()
                         }
                     }
-                }
-                stage('build-snapshot-arm64-tar') {
+                }*/
+                /*stage('build-snapshot-arm64-tar') {
                     agent {
                         docker {
                             label AGENT_ARM64
@@ -139,16 +139,16 @@ pipeline {
                             postCleanup()
                         }
                     }
-                }
+                } */
                 stage('build-and-test-x64-tar') {
                     agent {
-                        docker {
-                            label AGENT_X64
-                            image dockerAgent.image
-                            args dockerAgent.args
-                            alwaysPull true
+                        node {
+                            label 'Jenkins-Agent-Mac-M1-Single-Host'
                         }
                     }
+                    tools {
+                        jdk 'jdk-17'
+                    }
                     steps {
                         script {
                             def buildManifestObj = buildAssembleUpload(
@@ -225,7 +225,7 @@ pipeline {
                         }
                     }
                 }
-                stage('build-and-test-x64-rpm') {
+                /*stage('build-and-test-x64-rpm') {
                     agent { label AGENT_X64 }
                     stages {
                         stage('build-archive-linux-x64-rpm') {
@@ -314,8 +314,8 @@ pipeline {
                             }
                         }
                     }
-                }
-                stage('build-and-test-arm64-tar') {
+                }*/
+                /*stage('build-and-test-arm64-tar') {
                     agent {
                         docker {
                             label AGENT_ARM64
@@ -398,8 +398,8 @@ pipeline {
                             }
                         }
                     }
-                }
-                stage('build-and-test-arm64-rpm') {
+                }*/
+                /*stage('build-and-test-arm64-rpm') {
                     agent { label AGENT_X64 }
                     stages {
                         stage('build-archive-linux-arm64-rpm') {
@@ -488,10 +488,10 @@ pipeline {
                             }
                         }
                     }
-                }
+                }*/
             }
         }
-        stage('update index file') {
+        /*stage('update index file') {
             agent {
                 docker {
                     label AGENT_X64
@@ -507,8 +507,8 @@ pipeline {
                     )
                 }
             }
-        }
-        stage('docker build') {
+        }*/
+        /*stage('docker build') {
             when {
                 beforeAgent true
                 expression { 
@@ -537,7 +537,7 @@ pipeline {
                     )
                 }
             }
-        }
+        }*/
     }
     post {
         success {

diff --git a/jenkins/sign-artifacts/sign-standalone-artifacts.jenkinsfile b/jenkins/sign-artifacts/sign-standalone-artifacts.jenkinsfile
@@ -30,6 +30,9 @@ pipeline {
                 description: 'What is signature file type? Required only for linux signing.'
         )
     }
+    environment {
+        ARTIFACT_BUCKET_NAME = credentials('jenkins-artifact-bucket-name')
+    }
     stages {
         stage('sign') {
             steps {

diff --git a/manifests/1.3.4/opensearch-1.3.4-test.yml b/manifests/1.3.4/opensearch-1.3.4-test.yml
@@ -0,0 +1,71 @@
+---
+schema-version: '1.0'
+name: OpenSearch
+ci:
+  image:
+    name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v2
+    args: -e JAVA_HOME=/opt/java/openjdk-11
+components:
+  - name: index-management
+    integ-test:
+      build-dependencies:
+        - job-scheduler
+      test-configs:
+        - with-security
+        - without-security
+      additional-cluster-configs:
+        path.repo: [/tmp]
+
+  - name: anomaly-detection
+    integ-test:
+      build-dependencies:
+        - job-scheduler
+      test-configs:
+        - with-security
+        - without-security
+
+  - name: asynchronous-search
+    integ-test:
+      test-configs:
+        - with-security
+        - without-security
+
+  - name: alerting
+    integ-test:
+      test-configs:
+        - with-security
+        - without-security
+      additional-cluster-configs:
+        plugins.destination.host.deny_list: [10.0.0.0/8, 127.0.0.1]
+
+  - name: sql
+    integ-test:
+      test-configs:
+        - with-security
+        - without-security
+      additional-cluster-configs:
+        script.context.field.max_compilations_rate: 1000/1m
+
+  - name: k-NN
+    integ-test:
+      test-configs:
+        - with-security
+        - without-security
+
+  - name: dashboards-reports
+    working-directory: reports-scheduler
+    integ-test:
+      test-configs:
+        - without-security
+
+  - name: observability
+    working-directory: opensearch-observability
+    integ-test:
+      test-configs:
+        - without-security
+
+  - name: ml-commons
+    integ-test:
+      test-configs:
+        - with-security
+        - without-security