From 8f5d7b4620fd5c61357ca9287be2dab45917c632 Mon Sep 17 00:00:00 2001 From: pgodithi Date: Fri, 22 Jul 2022 13:37:17 -0400 Subject: [PATCH] # This is a combination of 18 commits. # This is the 1st commit message: parent 40346748d1bd57a9858e89a27a283518a565ac24 author pgodithi 1658511437 -0400 committer pgodithi 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 40346748d1bd57a9858e89a27a283518a565ac24 author pgodithi 1658511437 -0400 committer pgodithi 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 40346748d1bd57a9858e89a27a283518a565ac24 author pgodithi 1658511437 -0400 committer pgodithi 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 40346748d1bd57a9858e89a27a283518a565ac24 author pgodithi 1658511437 -0400 committer pgodithi 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 40346748d1bd57a9858e89a27a283518a565ac24 author pgodithi 1658511437 -0400 committer pgodithi 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 911a3a036562728b0e622c784a6dc32a6c101092 author pgodithi 1658511150 -0400 committer pgodithi 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 911a3a036562728b0e622c784a6dc32a6c101092 author pgodithi 1658511150 -0400 committer pgodithi 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 Add gradle cleanup before the checks (#2285) Signed-off-by: Peter Zhu Update remaining env vars with credentials in jenkins libraries (#2286) * Update getManifestSHA lib env vars with credentials Signed-off-by: Sayali Gaikawad Remove 2.1.0 from cron for building release candidates (#2287) Signed-off-by: Sayali Gaikawad Add signer to support signing windows artifacts (#2156) * Add signer for windows distribution and implement the jenkins libarary to be capable of signing for windows. Signed-off-by: Zelin Hao * Replace platform with MagicMock for testing Signed-off-by: Zelin Hao * Change to not initiate signer for mock case Signed-off-by: Zelin Hao * Change the default signature type to .asc for compatibility with old usage Signed-off-by: Zelin Hao * Add signer abstract class Signed-off-by: Zelin Hao * Remove abstract method Signed-off-by: Zelin Hao * Commit test cases Signed-off-by: Zelin Hao * Fix python tests Signed-off-by: Zelin Hao * Remove unused library import Signed-off-by: Zelin Hao * Fix mock repo tests Signed-off-by: Zelin Hao * Remove commmented block Signed-off-by: Zelin Hao * Fix the python tests and combine credentials Signed-off-by: Zelin Hao * Change path for windows tests Signed-off-by: Zelin Hao Update sql plugin name to opensearch-sql-plugin (#2295) Signed-off-by: Joshua Li Update the tag creation workflow with bundle manifest groovy library (#2296) Signed-off-by: Zelin Hao Add jdk14 for gradle check 1.x version (#2300) Signed-off-by: Peter Zhu Create a docker promotion jenkins workflow (#2288) * Add docker promotion jenkins jobs Signed-off-by: Zelin Hao * Create a Jenkins workflow for docker promotion job Signed-off-by: Zelin Hao * Fix promoting product with its individual image tag Signed-off-by: Zelin Hao * Add data prepper into tests Signed-off-by: Zelin Hao * Convert to use docker copy job Signed-off-by: Zelin Hao * Update test cases Signed-off-by: Zelin Hao Add java home args in 1.3.4 manifest (#2299) Signed-off-by: Zelin Hao Add 2.1.0 release notes (#2302) * Add 2.1.0 release notes Signed-off-by: Sayali Gaikawad CVE's Fix for Jenkins #2280 #2272 #2239 #1962 (#2303) * Change ref to 2.1 for opensearch dahsboards (#2267) Signed-off-by: Sayali Gaikawad test versionmatrixtest.yaml Signed-off-by: pgodithi test versionmatrixtest.yaml Signed-off-by: pgodithi test versionmatrixtest.yaml Signed-off-by: pgodithi test versionmatrixtest.yaml Signed-off-by: pgodithi test versionmatrixtest.yaml Signed-off-by: pgodithi test versionmatrixtest.yaml Signed-off-by: pgodithi test versionmatrixtest.yaml Signed-off-by: pgodithi test versionmatrixtest.yaml Signed-off-by: pgodithi test versionmatrixtest.yaml Signed-off-by: pgodithi versionincrement.yaml matrix test Signed-off-by: pgodithi versionincrement.yaml matrix test Signed-off-by: pgodithi versionincrement.yaml matrix test Signed-off-by: pgodithi versionincrement.yaml matrix test Signed-off-by: pgodithi versionincrement.yaml matrix test Signed-off-by: pgodithi versionincrement.yaml matrix test Signed-off-by: pgodithi versionincrement.yaml matrix test Signed-off-by: pgodithi versionincrement.yaml matrix test Signed-off-by: pgodithi test versionmatrixtest.yaml Signed-off-by: pgodithi Add test manifest to check build job (#2273) Signed-off-by: Sayali Gaikawad Set concurrent build limit for gradle check (#2274) Signed-off-by: Peter Zhu Add test coverage xml and support 1.x gradle check (#2279) * Add test coverage xml and support 1.x gradle check Signed-off-by: Peter Zhu * Remove comments Signed-off-by: Peter Zhu Add java args to 2.2.0 manifest (#2281) Signed-off-by: Sayali Gaikawad Update downloadFromS3 lib env vars with credentials (#2278) Signed-off-by: Sayali Gaikawad Update buildUploadManifestSHA lib env vars with credentials (#2277) Signed-off-by: Sayali Gaikawad Update signArtifacts lib env vars with credentials (#2275) Signed-off-by: Sayali Gaikawad [OSD][2.1] add functional test repo (#2282) Signed-off-by: Kawika Avilla Change codecov xml name and move gradle check script to build repo (#2283) * Change codecov xml name and move gradle check script to build repo Signed-off-by: Peter Zhu * Add tests Signed-off-by: Peter Zhu * Tweak tokens Signed-off-by: Peter Zhu * Tweak jenkins codeCoverage.xml Signed-off-by: Peter Zhu * Add codeCoverage.xml Signed-off-by: Peter Zhu Add gradle cleanup before the checks (#2285) Signed-off-by: Peter Zhu Update promoteArtifactsLib lib env vars with credentials (#2284) * Resolve merge conflicts Signed-off-by: Sayali Gaikawad Update remaining env vars with credentials in jenkins libraries (#2286) * Update getManifestSHA lib env vars with credentials Signed-off-by: Sayali Gaikawad Remove 2.1.0 from cron for building release candidates (#2287) Signed-off-by: Sayali Gaikawad test versionmatrixtest.yaml Signed-off-by: pgodithi Version increment automation Signed-off-by: pgodithi Version increment automation Signed-off-by: pgodithi Version increment automation Signed-off-by: pgodithi Version increment automation Signed-off-by: pgodithi Version increment automation Signed-off-by: pgodithi Version increment automation Signed-off-by: pgodithi test versionmatrixtest.yaml Signed-off-by: pgodithi test versionmatrixtest.yaml Signed-off-by: pgodithi test versionmatrixtest.yaml Signed-off-by: pgodithi test versionmatrixtest.yaml Signed-off-by: pgodithi test versionmatrixtest.yaml Signed-off-by: pgodithi test versionmatrixtest.yaml Signed-off-by: pgodithi test versionmatrixtest.yaml Signed-off-by: pgodithi test versionmatrixtest.yaml Signed-off-by: pgodithi test versionmatrixtest.yaml Signed-off-by: pgodithi test version increment automation Signed-off-by: pgodithi test version increment automation Signed-off-by: pgodithi Staging version increment automation Signed-off-by: pgodithi Staging version increment automation Signed-off-by: pgodithi Staging version increment automation Signed-off-by: pgodithi version increment automation Signed-off-by: pgodithi * Version increment automation Signed-off-by: pgodithi * Version increment automation Signed-off-by: pgodithi * Version increment automation Signed-off-by: pgodithi * Version increment automation Signed-off-by: pgodithi * Version increment automation Signed-off-by: pgodithi * vulnerabilitiesfix Signed-off-by: pgodithi * vulnerabilitiesfix Signed-off-by: pgodithi * CVE fix Signed-off-by: pgodithi * CVE's: CVE-2021-30129 sshd-core-2.5.1.jar fix Signed-off-by: pgodithi * CVE's: CVE-2021-30129 sshd-core-2.5.1.jar fix Signed-off-by: pgodithi * CVE fix Signed-off-by: pgodithi * CVE fix Signed-off-by: pgodithi Co-authored-by: Sayali Gaikawad <61760125+gaiksaya@users.noreply.github.com> Modify 2.1.0 release notes for OpenSearch component (#2313) Signed-off-by: Sayali Gaikawad Update Gradle Wrapper to 7.4.2 (#2289) * Update Gradle Wrapper to 7.4.2 Signed-off-by: Daniel Widdis * Update Jenkins scan to new Gradle version Signed-off-by: Daniel Widdis Add handling of push events on gradle check (#2315) Signed-off-by: Peter Zhu Add OpenSearch release notes link (#2318) Signed-off-by: Sayali Gaikawad Add components to 1.3.4 manifest (#2319) * Add components to 1.3.4 manifest Signed-off-by: Zelin Hao * Remove atomicwrites from pipfile Signed-off-by: Zelin Hao * Adding back the atomicwrites Signed-off-by: Zelin Hao Move data prepper jenkins env vars to credentials (#2320) * Move data prepper jenkins env vars to credentials Signed-off-by: Sayali Gaikawad Update the JDK version for manifest checks on 3.0.0 (#2301) * Exclude manifest checks for 3.0.0 for now Signed-off-by: Zelin Hao * Add conditional checks for jdk14 and jdk17 Signed-off-by: Zelin Hao * Change jdk version Signed-off-by: Zelin Hao Update release issue template (#2317) * Update release issue template Signed-off-by: Sayali Gaikawad Rename webhooks for notifications (#2322) Signed-off-by: Sayali Gaikawad Add check for test manifest and update error message (#2321) * Add check for test manifest and update error message Signed-off-by: Sayali Gaikawad Fixing junit task (#2328) Signed-off-by: Andriy Redko Version increment automation: matrix check Signed-off-by: pgodithi Version increment automation: matrix check Signed-off-by: pgodithi Version increment automation: matrix check Signed-off-by: pgodithi Version increment automation: matrix check Signed-off-by: pgodithi Version increment automation: matrix check Signed-off-by: pgodithi Version increment automation: yamllint Signed-off-by: pgodithi Version increment automation: yamllint Signed-off-by: pgodithi Version increment automation: matrix test Signed-off-by: pgodithi Version increment automation: matrix test Signed-off-by: pgodithi Version increment automation: matrix test Signed-off-by: pgodithi Version increment automation: test path matrix Signed-off-by: pgodithi Version increment automation: test path matrix Signed-off-by: pgodithi Version increment automation: test path matrix Signed-off-by: pgodithi Version increment automation: test path matrix Signed-off-by: pgodithi Version increment automation: test path matrix Signed-off-by: pgodithi Version increment automation: test path matrix Signed-off-by: pgodithi Version increment automation: test path matrix Signed-off-by: pgodithi Version increment automation: test path matrix Signed-off-by: pgodithi Version increment automation: test path matrix Signed-off-by: pgodithi Version increment automation: test path matrix Signed-off-by: pgodithi Version increment automation: test path matrix Signed-off-by: pgodithi Version increment automation: test path matrix Signed-off-by: pgodithi Version increment automation: test path matrix Signed-off-by: pgodithi Version increment automation: test path matrix Signed-off-by: pgodithi Version increment automation: test path matrix Signed-off-by: pgodithi Version increment automation: test path matrix Signed-off-by: pgodithi Version increment automation: test path matrix Signed-off-by: pgodithi Version increment automation: test path matrix Signed-off-by: pgodithi Version increment automation: test path matrix Signed-off-by: pgodithi Version increment automation: yamllint fix Signed-off-by: pgodithi Version increment automation: yamllint fix Signed-off-by: pgodithi Version increment automation: yamllint fix Signed-off-by: pgodithi Move artifact bucket name from env to creds (#2327) Signed-off-by: Sayali Gaikawad Add some of the remaining components (#2329) Signed-off-by: Zelin Hao Add alerting and ml (#2330) Signed-off-by: Zelin Hao Updated manifests. (#2323) Signed-off-by: opensearch-ci-bot Co-authored-by: opensearch-ci-bot # This is the commit message #2: Add remaining components (#2331) Signed-off-by: Zelin Hao # This is the commit message #3: Version increment automation: Add signoff to true Signed-off-by: pgodithi # This is the commit message #4: Version increment automation: Add signoff setup Signed-off-by: pgodithi # This is the commit message #5: Version increment automation: Add signoff setup Signed-off-by: pgodithi # This is the commit message #6: Version increment automation: Add signoff setup Signed-off-by: pgodithi # This is the commit message #7: Version increment automation: Add signoff setup Signed-off-by: pgodithi # This is the commit message #8: Version increment automation: change to on workflow_dispatch Signed-off-by: pgodithi # This is the commit message #9: Add java args to 2.1.1 manifest (#2334) Signed-off-by: Sayali Gaikawad # This is the commit message #10: Add JS and CU to 2.1.1 (#2335) Signed-off-by: Sayali Gaikawad # This is the commit message #11: Generate the consolidated release notes for 1.3.4 (#2336) * Generate the consolidated release notes for 1.3.4 Signed-off-by: Zelin Hao * Remove the version increment Signed-off-by: Zelin Hao * Remove OSD release notes link Signed-off-by: Zelin Hao # This is the commit message #12: Version increment automation: workflow rename Signed-off-by: pgodithi # This is the commit message #13: darwin test Signed-off-by: pgodithi # This is the commit message #14: darwin test Signed-off-by: pgodithi # This is the commit message #15: darwin test Signed-off-by: pgodithi # This is the commit message #16: Replace the ref for manifest 1.3.4 with tags (#2337) * Replace the ref for manifest 1.3.4 with tags Signed-off-by: Zelin Hao * Remove 1.3.4 build from CI Signed-off-by: Zelin Hao # This is the commit message #17: Add jenkins prefix to the credentials (#2341) Signed-off-by: Sayali Gaikawad # This is the commit message #18: default build.sh logic add for Gradle custom java zippublish plugin (#1999) * Added custom plugin eval logic Signed-off-by: pgodithi * fixed failure checks Signed-off-by: pgodithi * changed to query system property Signed-off-by: pgodithi * Added system property for version check Signed-off-by: pgodithi * Added gradle props Signed-off-by: pgodithi * publish task name change to publishPluginZipPublicationToZipStagingRepository Signed-off-by: pgodithi * Add publishPluginZipPublicationToZipStagingRepository to default build script Signed-off-by: pgodithi * Add publishPluginZipPublicationToZipStagingRepository to default build script Signed-off-by: pgodithi --- .../workflows/increment-plugin-versions.yml | 89 +++++++++++++++++++ .github/workflows/versionincrement.yaml | 77 ---------------- .../maven-sign-release.jenkinsfile | 1 + jenkins/opensearch-ruby/Jenkinsfile | 5 +- .../opensearch/distribution-build.jenkinsfile | 48 +++++----- .../sign-standalone-artifacts.jenkinsfile | 3 + manifests/1.3.4/opensearch-1.3.4-test.yml | 71 +++++++++++++++ manifests/1.3.4/opensearch-1.3.4.yml | 75 ++++++++++++++-- .../opensearch-dashboards-1.3.4-test.yml | 17 ++++ .../1.3.4/opensearch-dashboards-1.3.4.yml | 33 ++++++- manifests/2.1.1/opensearch-2.1.1.yml | 28 ++++++ .../opensearch-release-notes-1.3.4.md | 14 +++ scripts/default/opensearch/build.sh | 5 ++ ...data-prepper-all-artifacts.jenkinsfile.txt | 32 +++++++ .../jobs/PromoteYumRepos_Jenkinsfile.txt | 20 ----- 15 files changed, 390 insertions(+), 128 deletions(-) create mode 100644 .github/workflows/increment-plugin-versions.yml delete mode 100644 .github/workflows/versionincrement.yaml create mode 100644 manifests/1.3.4/opensearch-1.3.4-test.yml create mode 100644 manifests/1.3.4/opensearch-dashboards-1.3.4-test.yml create mode 100644 manifests/2.1.1/opensearch-2.1.1.yml create mode 100644 release-notes/opensearch-release-notes-1.3.4.md diff --git a/.github/workflows/increment-plugin-versions.yml b/.github/workflows/increment-plugin-versions.yml new file mode 100644 index 0000000000..fba478d0d5 --- /dev/null +++ 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 + commit-message: | + Increment version to ${{ env.OPENSEARCH_VERSION }} + + Signed-off-by: opensearch-ci-bot + 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 deleted file mode 100644 index 44d5ece2e1..0000000000 --- a/.github/workflows/versionincrement.yaml +++ /dev/null @@ -1,77 +0,0 @@ ---- -name: Version Increment -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: - repo: [common-utils, job-scheduler, ml-commons, performance-analyzer, performance-analyzer-rca, security, alerting, index-management, sql, observability, asynchronous-search, k-NN, anomaly-detection, cross-cluster-replication, dashboards-reports, geospatial] - branch: [{opensearch_branch: 2.x, plugin_branch: 2.x}, {opensearch_branch: 2.1, plugin_branch: 2.1}, {opensearch_branch: 2.2, plugin_branch: 2.2}, {opensearch_branch: main, plugin_branch: main}] - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - steps: - - name: Check out OpenSearch repo - uses: actions/checkout@v3 - with: - repository: opensearch-project/OpenSearch - ref: ${{ matrix.branch.opensearch_branch }} - - name: Fetch OpenSearch version - run: | - OPENSEARCH_VERSION=$(cat buildSrc/version.properties | grep opensearch | cut -d= -f2 | grep -oE '[0-9.]+') - OPENSEARCH_VERSION=$OPENSEARCH_VERSION-SNAPSHOT - echo "OPENSEARCH_VERSION=$OPENSEARCH_VERSION" >> $GITHUB_ENV - echo "OPENSEARCH_VERSION_NUMBER=$OPENSEARCH_VERSION" | cut -f1 -d"-" >> $GITHUB_ENV - - name: Check out plugin repo - uses: actions/checkout@v3 - with: - repository: opensearch-project/${{ matrix.repo }} - ref: ${{ matrix.branch.plugin_branch }} - - name: Version Increment plugin repo - # If condition for plugins with Gradle Project in subfolders. - run: | - echo "OpenSearch Core repo version on branch ${{ matrix.branch.opensearch_branch }} is ${{ env.OPENSEARCH_VERSION_NUMBER }}" - if [ ${{ matrix.repo }} == "dashboards-reports" ]; then - cd reports-scheduler - ./gradlew versionIncrement -DnewVersion=${{ env.OPENSEARCH_VERSION }} - elif [ ${{ matrix.repo }} == "observability" ]; then - cd opensearch-observability - ./gradlew versionIncrement -DnewVersion=${{ env.OPENSEARCH_VERSION }} - elif [ ${{ matrix.repo }} == "notifications" ]; then - cd notifications - ./gradlew versionIncrement -DnewVersion=${{ env.OPENSEARCH_VERSION }} - else - ./gradlew versionIncrement -DnewVersion=${{ env.OPENSEARCH_VERSION }} - fi - - name: Create Pull Request - id: cpr - uses: peter-evans/create-pull-request@v4 - with: - token: ${{ secrets.CIBOTAUTOPR }} - author: opensearch-ci-bot - commit-message: | - Version Increment. - - Signed-off-by: opensearch-ci-bot - delete-branch: true - branch: create-pull-request/${{ env.OPENSEARCH_VERSION }} - title: '[AUTO] Version Increment to ${{ env.OPENSEARCH_VERSION }}' - body: | - - Version Increment for **${{ matrix.repo }}** plugin 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/jenkins/opensearch-maven-release/maven-sign-release.jenkinsfile b/jenkins/opensearch-maven-release/maven-sign-release.jenkinsfile index cc189e65ca..bd2b0210f0 100644 --- 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 index b927bc4831..b9cb5dc94a 100644 --- 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 index 7d98f55c3f..467ee395b3 100644 --- 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 index d1f4a0d56c..684d944b40 100644 --- 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 new file mode 100644 index 0000000000..f50fd7fc1f --- /dev/null +++ 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 diff --git a/manifests/1.3.4/opensearch-1.3.4.yml b/manifests/1.3.4/opensearch-1.3.4.yml index e978ba2759..442a1393b5 100644 --- a/manifests/1.3.4/opensearch-1.3.4.yml +++ b/manifests/1.3.4/opensearch-1.3.4.yml @@ -10,34 +10,99 @@ ci: components: - name: OpenSearch repository: https://github.com/opensearch-project/OpenSearch.git - ref: '1.3' + ref: tags/1.3.4 checks: - gradle:publish - gradle:properties:version - name: common-utils repository: https://github.com/opensearch-project/common-utils.git - ref: '1.3' + ref: tags/1.3.4.0 checks: - gradle:publish - gradle:properties:version - name: job-scheduler repository: https://github.com/opensearch-project/job-scheduler.git - ref: '1.3' + ref: tags/1.3.4.0 checks: - gradle:properties:version - gradle:dependencies:opensearch.version + - name: ml-commons + repository: https://github.com/opensearch-project/ml-commons.git + ref: tags/1.3.4.0 + checks: + - gradle:properties:version + - gradle:dependencies:opensearch.version: opensearch-ml-plugin - name: security repository: https://github.com/opensearch-project/security.git - ref: '1.3' + ref: tags/1.3.4.0 checks: - gradle:properties:version - gradle:dependencies:opensearch.version - name: k-NN repository: https://github.com/opensearch-project/k-NN.git - ref: '1.3' + ref: tags/1.3.4.0 platforms: - darwin - linux checks: - gradle:properties:version - gradle:dependencies:opensearch.version + - name: asynchronous-search + repository: https://github.com/opensearch-project/asynchronous-search.git + ref: tags/1.3.4.0 + checks: + - gradle:properties:version + - gradle:dependencies:opensearch.version + - name: performance-analyzer + repository: https://github.com/opensearch-project/performance-analyzer.git + ref: tags/1.3.4.0 + checks: + - gradle:properties:version + - gradle:dependencies:opensearch.version + platforms: + - darwin + - linux + - name: alerting + repository: https://github.com/opensearch-project/alerting.git + ref: tags/1.3.4.0 + checks: + - gradle:properties:version + - gradle:dependencies:opensearch.version: alerting + - name: anomaly-detection + repository: https://github.com/opensearch-project/anomaly-detection.git + ref: tags/1.3.4.0 + checks: + - gradle:properties:version + - gradle:dependencies:opensearch.version + - name: index-management + repository: https://github.com/opensearch-project/index-management.git + ref: tags/1.3.4.0 + checks: + - gradle:properties:version + - gradle:dependencies:opensearch.version + - name: cross-cluster-replication + repository: https://github.com/opensearch-project/cross-cluster-replication.git + ref: tags/1.3.4.0 + checks: + - gradle:properties:version + - gradle:dependencies:opensearch.version + - name: dashboards-reports + repository: https://github.com/opensearch-project/dashboards-reports.git + ref: tags/1.3.4.0 + working_directory: reports-scheduler + checks: + - gradle:properties:version + - gradle:dependencies:opensearch.version + - name: opensearch-observability + repository: https://github.com/opensearch-project/observability + ref: tags/1.3.4.0 + working_directory: opensearch-observability + checks: + - gradle:properties:version + - gradle:dependencies:opensearch.version + - name: sql + repository: https://github.com/opensearch-project/sql.git + ref: tags/1.3.4.0 + checks: + - gradle:properties:version + - gradle:dependencies:opensearch.version: plugin diff --git a/manifests/1.3.4/opensearch-dashboards-1.3.4-test.yml b/manifests/1.3.4/opensearch-dashboards-1.3.4-test.yml new file mode 100644 index 0000000000..3ad90cc802 --- /dev/null +++ b/manifests/1.3.4/opensearch-dashboards-1.3.4-test.yml @@ -0,0 +1,17 @@ +--- +schema-version: '1.0' +name: OpenSearch Dashboards +ci: + image: + name: opensearchstaging/ci-runner:ci-runner-rockylinux8-opensearch-dashboards-integtest-v2 +components: + - name: OpenSearch-Dashboards + bwc-test: + test-configs: + - with-security + - without-security + - name: functionalTestDashboards + integ-test: + test-configs: + - with-security + - without-security diff --git a/manifests/1.3.4/opensearch-dashboards-1.3.4.yml b/manifests/1.3.4/opensearch-dashboards-1.3.4.yml index 58d1f700aa..fd5c44f75a 100644 --- a/manifests/1.3.4/opensearch-dashboards-1.3.4.yml +++ b/manifests/1.3.4/opensearch-dashboards-1.3.4.yml @@ -9,4 +9,35 @@ ci: components: - name: OpenSearch-Dashboards repository: https://github.com/opensearch-project/OpenSearch-Dashboards.git - ref: '1.3' + ref: tags/1.3.4 + - name: functionalTestDashboards + repository: https://github.com/opensearch-project/opensearch-dashboards-functional-test.git + ref: tags/1.3.4 + - name: securityDashboards + repository: https://github.com/opensearch-project/security-dashboards-plugin.git + ref: tags/1.3.4.0 + - name: anomalyDetectionDashboards + repository: https://github.com/opensearch-project/anomaly-detection-dashboards-plugin + ref: tags/1.3.4.0 + - name: indexManagementDashboards + repository: https://github.com/opensearch-project/index-management-dashboards-plugin + ref: tags/1.3.4.0 + - name: queryWorkbenchDashboards + repository: https://github.com/opensearch-project/sql.git + working_directory: workbench + ref: tags/1.3.4.0 + - name: reportsDashboards + repository: https://github.com/opensearch-project/dashboards-reports.git + working_directory: dashboards-reports + ref: tags/1.3.4.0 + - name: ganttChartDashboards + repository: https://github.com/opensearch-project/dashboards-visualizations.git + working_directory: gantt-chart + ref: tags/1.3.4.0 + - name: observabilityDashboards + repository: https://github.com/opensearch-project/observability.git + working_directory: dashboards-observability + ref: tags/1.3.4.0 + - name: alertingDashboards + repository: https://github.com/opensearch-project/alerting-dashboards-plugin.git + ref: tags/1.3.4.0 diff --git a/manifests/2.1.1/opensearch-2.1.1.yml b/manifests/2.1.1/opensearch-2.1.1.yml new file mode 100644 index 0000000000..81b5d8eaa9 --- /dev/null +++ b/manifests/2.1.1/opensearch-2.1.1.yml @@ -0,0 +1,28 @@ +--- +schema-version: '1.0' +build: + name: OpenSearch + version: 2.1.1 +ci: + image: + name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v2 + args: -e JAVA_HOME=/opt/java/openjdk-17 +components: + - name: OpenSearch + repository: https://github.com/opensearch-project/OpenSearch.git + ref: '2.1' + checks: + - gradle:publish + - gradle:properties:version + - name: common-utils + repository: https://github.com/opensearch-project/common-utils.git + ref: '2.1' + checks: + - gradle:publish + - gradle:properties:version + - name: job-scheduler + repository: https://github.com/opensearch-project/job-scheduler.git + ref: '2.1' + checks: + - gradle:properties:version + - gradle:dependencies:opensearch.version diff --git a/release-notes/opensearch-release-notes-1.3.4.md b/release-notes/opensearch-release-notes-1.3.4.md new file mode 100644 index 0000000000..32188369c7 --- /dev/null +++ b/release-notes/opensearch-release-notes-1.3.4.md @@ -0,0 +1,14 @@ +# OpenSearch and OpenSearch Dashboards 1.3.4 Release Notes + +## Release Details + +OpenSearch and OpenSearch Dashboards 1.3.4 includes the following bug fixes, and maintenance updates. + +OpenSearch [Release Notes](https://github.com/opensearch-project/OpenSearch/blob/main/release-notes/opensearch.release-notes-1.3.4.md). + + +## BUG FIXES + +### OpenSearch Dashboards Reports +* [1.3] Move HTML sanitization from client to server side (#382) ([#386](https://github.com/opensearch-project/dashboards-reports/pull/386)) + diff --git a/scripts/default/opensearch/build.sh b/scripts/default/opensearch/build.sh index 5cf8540650..3fbe1755b9 100755 --- a/scripts/default/opensearch/build.sh +++ b/scripts/default/opensearch/build.sh @@ -77,3 +77,8 @@ distributions="$(dirname "${zipPath}")" echo "COPY ${distributions}/*.zip" mkdir -p $OUTPUT/plugins cp ${distributions}/*.zip ./$OUTPUT/plugins + +# Publish plugin zips to maven +./gradlew publishPluginZipPublicationToZipStagingRepository -Dopensearch.version=$VERSION -Dbuild.snapshot=$SNAPSHOT -Dbuild.version_qualifier=$QUALIFIER +mkdir -p $OUTPUT/maven/org/opensearch +cp -r ./build/local-staging-repo/org/opensearch/. $OUTPUT/maven/org/opensearch diff --git a/tests/jenkins/jenkinsjob-regression-files/data-prepper/release-data-prepper-all-artifacts.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/data-prepper/release-data-prepper-all-artifacts.jenkinsfile.txt index dfa4aa6201..2352ba7f8a 100644 --- a/tests/jenkins/jenkinsjob-regression-files/data-prepper/release-data-prepper-all-artifacts.jenkinsfile.txt +++ b/tests/jenkins/jenkinsjob-regression-files/data-prepper/release-data-prepper-all-artifacts.jenkinsfile.txt @@ -22,6 +22,7 @@ signArtifacts.git({url=https://github.com/opensearch-project/opensearch-build.git, branch=main}) signArtifacts.sh(curl -sSL https://artifacts.opensearch.org/publickeys/opensearch.pgp | gpg --import -) signArtifacts.usernamePassword({credentialsId=github_bot_token_name, usernameVariable=GITHUB_USER, passwordVariable=GITHUB_TOKEN}) +<<<<<<< HEAD signArtifacts.string({credentialsId=jenkins-signer-client-role, variable=SIGNER_CLIENT_ROLE}) signArtifacts.string({credentialsId=jenkins-signer-client-external-id, variable=SIGNER_CLIENT_EXTERNAL_ID}) signArtifacts.string({credentialsId=jenkins-signer-client-unsigned-bucket, variable=SIGNER_CLIENT_UNSIGNED_BUCKET}) @@ -35,6 +36,21 @@ export UNSIGNED_BUCKET=SIGNER_CLIENT_UNSIGNED_BUCKET export SIGNED_BUCKET=SIGNER_CLIENT_SIGNED_BUCKET +======= + signArtifacts.string({credentialsId=signer-pgp-config, variable=configs}) + signArtifacts.withCredentials([[GITHUB_USER, GITHUB_TOKEN], configs], groovy.lang.Closure) + signArtifacts.readJSON({text=configs}) + signArtifacts.sh( + #!/bin/bash + set +x + export ROLE=dummy_role + export EXTERNAL_ID=dummy_ID + export UNSIGNED_BUCKET=dummy_unsigned_bucket + export SIGNED_BUCKET=dummy_signed_bucket + export PROFILE_IDENTIFIER=null + export PLATFORM_IDENTIFIER=null + +>>>>>>> 700c80d (Add signer to support signing windows artifacts (#2156)) /tmp/workspace/sign.sh /tmp/workspace/archive --sigtype=.sig --platform=linux ) release-data-prepper-all-artifacts.stage(Release Archives to Production Distribution Bucket, groovy.lang.Closure) @@ -98,6 +114,7 @@ signArtifacts.git({url=https://github.com/opensearch-project/opensearch-build.git, branch=main}) signArtifacts.sh(curl -sSL https://artifacts.opensearch.org/publickeys/opensearch.pgp | gpg --import -) signArtifacts.usernamePassword({credentialsId=github_bot_token_name, usernameVariable=GITHUB_USER, passwordVariable=GITHUB_TOKEN}) +<<<<<<< HEAD signArtifacts.string({credentialsId=jenkins-signer-client-role, variable=SIGNER_CLIENT_ROLE}) signArtifacts.string({credentialsId=jenkins-signer-client-external-id, variable=SIGNER_CLIENT_EXTERNAL_ID}) signArtifacts.string({credentialsId=jenkins-signer-client-unsigned-bucket, variable=SIGNER_CLIENT_UNSIGNED_BUCKET}) @@ -111,6 +128,21 @@ export UNSIGNED_BUCKET=SIGNER_CLIENT_UNSIGNED_BUCKET export SIGNED_BUCKET=SIGNER_CLIENT_SIGNED_BUCKET +======= + signArtifacts.string({credentialsId=signer-pgp-config, variable=configs}) + signArtifacts.withCredentials([[GITHUB_USER, GITHUB_TOKEN], configs], groovy.lang.Closure) + signArtifacts.readJSON({text=configs}) + signArtifacts.sh( + #!/bin/bash + set +x + export ROLE=dummy_role + export EXTERNAL_ID=dummy_ID + export UNSIGNED_BUCKET=dummy_unsigned_bucket + export SIGNED_BUCKET=dummy_signed_bucket + export PROFILE_IDENTIFIER=null + export PLATFORM_IDENTIFIER=null + +>>>>>>> 700c80d (Add signer to support signing windows artifacts (#2156)) /tmp/workspace/sign.sh /tmp/workspace/maven --type=maven --platform=linux ) release-data-prepper-all-artifacts.stage(Upload Artifacts to Sonatype, groovy.lang.Closure) diff --git a/tests/jenkins/jobs/PromoteYumRepos_Jenkinsfile.txt b/tests/jenkins/jobs/PromoteYumRepos_Jenkinsfile.txt index 18b4c7d2f7..f752f82494 100644 --- a/tests/jenkins/jobs/PromoteYumRepos_Jenkinsfile.txt +++ b/tests/jenkins/jobs/PromoteYumRepos_Jenkinsfile.txt @@ -44,16 +44,11 @@ ) promoteYumRepos.signArtifacts({artifactPath=/tmp/workspace/artifacts/releases/bundle/opensearch/1.x/yum/repodata/repomd.pom, sigtype=.sig, platform=linux}) -<<<<<<< HEAD signArtifacts.echo(PGP or Windows Signature Signing) -======= - signArtifacts.echo(PGP Signature Signing) ->>>>>>> 071d6df (Update remaining env vars with credentials in jenkins libraries (#2286)) signArtifacts.fileExists(/tmp/workspace/sign.sh) signArtifacts.git({url=https://github.com/opensearch-project/opensearch-build.git, branch=main}) signArtifacts.sh(curl -sSL https://artifacts.opensearch.org/publickeys/opensearch.pgp | gpg --import -) signArtifacts.usernamePassword({credentialsId=github_bot_token_name, usernameVariable=GITHUB_USER, passwordVariable=GITHUB_TOKEN}) -<<<<<<< HEAD signArtifacts.string({credentialsId=jenkins-signer-client-role, variable=SIGNER_CLIENT_ROLE}) signArtifacts.string({credentialsId=jenkins-signer-client-external-id, variable=SIGNER_CLIENT_EXTERNAL_ID}) signArtifacts.string({credentialsId=jenkins-signer-client-unsigned-bucket, variable=SIGNER_CLIENT_UNSIGNED_BUCKET}) @@ -69,21 +64,6 @@ /tmp/workspace/sign.sh /tmp/workspace/artifacts/releases/bundle/opensearch/1.x/yum/repodata/repomd.pom --sigtype=.sig --platform=linux ) -======= - signArtifacts.string({credentialsId=jenkins-signer-client-creds, variable=signer_client_creds}) - signArtifacts.withCredentials([[GITHUB_USER, GITHUB_TOKEN], signer_client_creds], groovy.lang.Closure) - signArtifacts.readJSON({text=signer_client_creds}) - signArtifacts.sh( - #!/bin/bash - set +x - export ROLE=dummy_role - export EXTERNAL_ID=dummy_ID - export UNSIGNED_BUCKET=dummy_unsigned_bucket - export SIGNED_BUCKET=dummy_signed_bucket - - /tmp/workspace/sign.sh /tmp/workspace/artifacts/releases/bundle/opensearch/1.x/yum/repodata/repomd.pom --sigtype=.sig --platform=linux - ) ->>>>>>> 071d6df (Update remaining env vars with credentials in jenkins libraries (#2286)) promoteYumRepos.sh( set -e set +x