From 3bf03fc84594d620996fa52e5923cc8c301508ab Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Wed, 5 Jul 2023 20:28:36 -0400 Subject: [PATCH] [Python 3.9 Upgrade] OpenSearch-Build Repo Python Migration to 3.9 Version (#3658) Signed-off-by: Peter Zhu --- .github/workflows/manifests.yml | 4 +- .github/workflows/python-tests.yml | 4 +- .github/workflows/versions.yml | 4 +- .github/workflows/yaml-lint.yml | 2 +- Pipfile | 37 +-- Pipfile.lock | 234 ++++++++---------- .../perf-test.jenkinsfile | 2 +- ...ase-data-prepper-all-artifacts.jenkinsfile | 4 +- jenkins/manifests-update.jenkinsFile | 2 +- .../distribution-build.jenkinsfile | 4 +- .../integ-test.jenkinsfile | 6 +- .../opensearch/distribution-build.jenkinsfile | 4 +- jenkins/opensearch/integ-test.jenkinsfile | 6 +- jenkins/opensearch/perf-test.jenkinsfile | 2 +- jenkins/promotion/promote-repos.jenkinsfile | 4 +- .../rpm-validation/rpm-validation.jenkinsfile | 2 +- .../sign-standalone-artifacts.jenkinsfile | 2 +- .../validate-artifacts.jenkinsfile | 6 +- .../2.7.1/opensearch-dashboards-2.7.1.yml | 2 +- .../2.8.0/opensearch-dashboards-2.8.0.yml | 2 +- manifests/2.8.1/opensearch-2.8.1.yml | 2 +- .../2.8.1/opensearch-dashboards-2.8.1.yml | 2 +- .../2.9.0/opensearch-2.9.0-seg-rep-test.yml | 2 +- manifests/2.9.0/opensearch-2.9.0-test.yml | 2 +- manifests/2.9.0/opensearch-2.9.0.yml | 2 +- .../opensearch-dashboards-2.9.0-test.yml | 2 +- .../2.9.0/opensearch-dashboards-2.9.0.yml | 2 +- manifests/3.0.0/opensearch-3.0.0-test.yml | 2 +- manifests/3.0.0/opensearch-3.0.0.yml | 2 +- .../3.0.0/opensearch-dashboards-3.0.0.yml | 2 +- .../opensearch-dashboards/1.x/manifest.yml | 2 +- .../opensearch-dashboards/2.x/manifest.yml | 2 +- .../opensearch-dashboards/3.x/manifest.yml | 2 +- .../default/manifest.yml | 2 +- .../templates/opensearch/1.x/manifest.yml | 2 +- .../templates/opensearch/2.x/manifest.yml | 2 +- .../templates/opensearch/3.x/manifest.yml | 2 +- .../templates/opensearch/default/manifest.yml | 2 +- .../sign-standalone-artifacts.jenkinsfile.txt | 2 +- tests/test_run_assemble.py | 2 +- .../test_input_manifests.py | 8 +- tests/tests_system/test_process.py | 7 +- 42 files changed, 194 insertions(+), 194 deletions(-) diff --git a/.github/workflows/manifests.yml b/.github/workflows/manifests.yml index cb573b2829..3c0917b424 100644 --- a/.github/workflows/manifests.yml +++ b/.github/workflows/manifests.yml @@ -34,7 +34,7 @@ jobs: needs: list-manifests11 runs-on: ubuntu-latest env: - PYTHON_VERSION: 3.7 + PYTHON_VERSION: 3.9 JDK_VERSION: 11 strategy: matrix: @@ -60,7 +60,7 @@ jobs: needs: list-manifests17 runs-on: ubuntu-latest env: - PYTHON_VERSION: 3.7 + PYTHON_VERSION: 3.9 JDK_VERSION: 17 strategy: matrix: diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml index 9364cc5660..7660f6ec45 100644 --- a/.github/workflows/python-tests.yml +++ b/.github/workflows/python-tests.yml @@ -13,7 +13,7 @@ jobs: - windows-latest runs-on: ${{ matrix.os }} env: - PYTHON_VERSION: 3.7 + PYTHON_VERSION: 3.9 steps: - uses: actions/checkout@v3 - name: Set up Python ${{ env.PYTHON_VERSION }} @@ -44,7 +44,7 @@ jobs: python-tests-build-image: runs-on: ubuntu-latest container: - image: public.ecr.aws/opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v2 + image: public.ecr.aws/opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3 options: --user root steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/versions.yml b/.github/workflows/versions.yml index b3718c3abd..428087df55 100644 --- a/.github/workflows/versions.yml +++ b/.github/workflows/versions.yml @@ -10,8 +10,8 @@ jobs: update: runs-on: ubuntu-latest env: - PYTHON_VERSION: 3.7 - JDK_VERSION: 14 + PYTHON_VERSION: 3.9 + JDK_VERSION: 11 steps: - uses: actions/checkout@v3 - name: Set Up JDK ${{ env.JDK_VERSION }} diff --git a/.github/workflows/yaml-lint.yml b/.github/workflows/yaml-lint.yml index 0203ca1dd7..70ba006a72 100644 --- a/.github/workflows/yaml-lint.yml +++ b/.github/workflows/yaml-lint.yml @@ -7,7 +7,7 @@ jobs: yaml-lint: runs-on: ubuntu-latest env: - PYTHON_VERSION: 3.7 + PYTHON_VERSION: 3.9 steps: - uses: actions/checkout@v3 - name: Set up Python ${{ env.PYTHON_VERSION }} diff --git a/Pipfile b/Pipfile index 5a25bb3d5f..9f0798b96c 100644 --- a/Pipfile +++ b/Pipfile @@ -6,31 +6,40 @@ name = "pypi" [packages] pyyaml = "~=5.4" types-PyYAML = "~=5.4" -requests = "~=2.26" +# TODO: The 'requests' package stays on 2.28 until we deprecate CentOS7. +# As newer version requires openssl1.1.1 where CentOS7 only provides openssl1.1.0. +# https://github.com/opensearch-project/opensearch-build/issues/3554 +requests = "<=2.28.1" types-requests = "~=2.25" pre-commit = "~=2.15.0" isort = "~=5.9" flake8 = "~=3.9" -mypy = "~=0.9" -pytest = "*" +# TODO: Newer version of mypy above 0.971 such as 0.991 has included new checks such as 'call-overload', 'override', and 'arg-type' +# that would introduce new errors during the checks. Set this as a later enhancement for now +# https://github.com/opensearch-project/opensearch-build/issues/3704 +mypy = "<=0.971" +pytest = "~=7.1.3" coverage = "~=4.5.4" pytest-cov = "~=2.10.0" jproperties = "~=2.1.1" retry = "~=0.9" -sortedcontainers = "*" +sortedcontainers = "~=2.4.0" +# TODO: pkg_resources is deprecated in Python 3.9 ever since Python 3.8 introduces importlib.metadata +# The latest version of cerberus is still using pkg_resources with this PR pending: https://github.com/pyeve/cerberus/pull/579 +# You will see a new deprecation warning when running cerberus related code in this repository: 'DeprecationWarning: pkg_resources is deprecated as an API' cerberus = "~=1.3.4" psutil = "~=5.8" -atomicwrites = "*" -validators = "*" -yamlfix = "*" -yamllint = "*" -pytablewriter = "*" -typed-ast = "*" -zipp = "*" -importlib-metadata = "*" -ruamel-yaml = "*" +atomicwrites = "~=1.4.1" +validators = "~=0.20.0" +yamlfix = "~=1.0.1" +yamllint = "~=1.27.1" +pytablewriter = "~=0.64.2" +typed-ast = "~=1.5.4" +zipp = "~=3.8.1" +importlib-metadata = "~=4.12.0" +ruamel-yaml = "~=0.17.21" [dev-packages] [requires] -python_version = "3.7" +python_version = "3.9" diff --git a/Pipfile.lock b/Pipfile.lock index b1b2fbb3ab..8dcb40bfe8 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,11 +1,11 @@ { "_meta": { "hash": { - "sha256": "91faf65dfb384770d0abe154b5d9b48afbac57ae4582cac13de957c42cb36c9c" + "sha256": "15c704bcb340f5a90f3d3197c5cd791d86549cc1b7adec55998b0263b675e48e" }, "pipfile-spec": 6, "requires": { - "python_version": "3.7" + "python_version": "3.9" }, "sources": [ { @@ -25,11 +25,11 @@ }, "attrs": { "hashes": [ - "sha256:29adc2665447e5191d0e7c568fde78b21f9672d344281d0c6e1ab085429b22b6", - "sha256:86efa402f67bf2df34f51a335487cf46b1ec130d02b8d39fd248abfd30da551c" + "sha256:1f28b4522cdc2fb4256ac1a020c78acf9cba2c6b461ccd2c126f3aa8e8335d04", + "sha256:6279836d581513a26f1bf235f9acd333bc9115683f14f7e8fae46c98fc50e015" ], - "markers": "python_version >= '3.5'", - "version": "==22.1.0" + "markers": "python_version >= '3.7'", + "version": "==23.1.0" }, "cerberus": { "hashes": [ @@ -40,11 +40,11 @@ }, "certifi": { "hashes": [ - "sha256:35824b4c3a97115964b408844d64aa14db1cc518f6562e8d7261699d1350a9e3", - "sha256:4ad3232f5e926d6718ec31cfc1fcadfde020920e278684144551c91769c7bc18" + "sha256:0f0d56dc5a6ad56fd4ba36484d6cc34451e1c6548c61daad8c320169f91eddc7", + "sha256:c6c2e98f5c7869efca1f8916fed228dd91539f9f1b444c314c06eef02980c716" ], - "index": "pypi", - "version": "==2022.12.7" + "markers": "python_version >= '3.6'", + "version": "==2023.5.7" }, "cfgv": { "hashes": [ @@ -67,7 +67,7 @@ "sha256:5a3d016c7c547f69d6f81fb0db9449ce888b418b5b9952cc5e6e66843e9dd845", "sha256:83e9a75d1911279afd89352c68b45348559d1fc0506b054b346651b5e7fee29f" ], - "markers": "python_version >= '3.6'", + "markers": "python_full_version >= '3.6.0'", "version": "==2.1.1" }, "click": { @@ -118,11 +118,11 @@ }, "dataproperty": { "hashes": [ - "sha256:73ccf10f8b123968210438a1a1aa859ea6d5a16b4e1f4d307da7a81b838e79fa", - "sha256:a8f29175950f4b2c33a387aa3809130d87b9a8d3b92a916c906c49efdb566b32" + "sha256:08113748e164c17d60b9e66c256cbabec0c654b7aaf5e8441c4ec4ee51d5c921", + "sha256:54a5c1440b0b5ab2e902c29b451dd408dadefd93232ae21672e6f1305698f802" ], "markers": "python_version >= '3.6'", - "version": "==0.55.0" + "version": "==0.55.1" }, "decorator": { "hashes": [ @@ -149,11 +149,11 @@ }, "filelock": { "hashes": [ - "sha256:7565f628ea56bfcd8e54e42bdc55da899c85c1abfe1b5bcfd147e9188cebb3b2", - "sha256:8df285554452285f79c035efb0c861eb33a4bcfa5b7a137016e32e6a90f9792c" + "sha256:002740518d8aa59a26b0c76e10fb8c6e15eae825d34b6fdf670333fd7b938d81", + "sha256:cbb791cdea2a72f23da6ac5b5269ab0a0d161e9ef0100e653b69049a7706d1ec" ], "markers": "python_version >= '3.7'", - "version": "==3.8.2" + "version": "==3.12.2" }, "flake8": { "hashes": [ @@ -165,11 +165,11 @@ }, "identify": { "hashes": [ - "sha256:906036344ca769539610436e40a684e170c3648b552194980bb7b617a8daeb9f", - "sha256:a390fb696e164dbddb047a0db26e57972ae52fbd037ae68797e5ae2f4492485d" + "sha256:0aac67d5b4812498056d28a9a512a483f5085cc28640b02b258a59dac34301d4", + "sha256:986dbfb38b1140e763e413e6feb44cd731faf72d1909543178aa79b0e258265d" ], "markers": "python_version >= '3.7'", - "version": "==2.5.9" + "version": "==2.5.24" }, "idna": { "hashes": [ @@ -189,18 +189,19 @@ }, "iniconfig": { "hashes": [ - "sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3", - "sha256:bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32" + "sha256:2d91e135bf72d31a410b17c16da610a82cb55f6b0477d1a902134b24a455b8b3", + "sha256:b6a85871a79d2e3b22d2d1b94ac2824226a63c6b741c88f7ae975f18b6778374" ], - "version": "==1.1.1" + "markers": "python_version >= '3.7'", + "version": "==2.0.0" }, "isort": { "hashes": [ - "sha256:6f62d78e2f89b4500b080fe3a81690850cd254227f27f75c3a0c491a1f351ba7", - "sha256:e8443a5e7a020e9d7f97f1d7d9cd17c88bcb3bc7e218bf9cf5095fe550be2951" + "sha256:8bef7dde241278824a6d83f44a544709b065191b95b6e50894bdc722fcba0504", + "sha256:f84c2818376e66cf843d497486ea8fed8700b340f308f076c6fb1229dff318b6" ], "index": "pypi", - "version": "==5.10.1" + "version": "==5.12.0" }, "jproperties": { "hashes": [ @@ -212,18 +213,17 @@ }, "mbstrdecoder": { "hashes": [ - "sha256:0a99413b92bbaddda89d376f496d710dc7131417e98414a756ebcd41374e068d", - "sha256:37a7739a365f1bf8aa5ff2de2d66b1a84e96dcb41868cc97c480c20b40c3670b" + "sha256:d66c1ed3f2dc4e7c5d87cd44a75be10bc5af4250f95b38bbaedd7851308ce938", + "sha256:dcfd2c759322eb44fe193a9e0b1b86c5b87f3ec5ea8e1bb43b3e9ae423f1e8fe" ], - "markers": "python_version >= '3.6'", - "version": "==1.1.1" + "markers": "python_version >= '3.7'", + "version": "==1.1.3" }, "mccabe": { "hashes": [ "sha256:ab8a6258860da4b6677da4bd2fe5dc2c659cff31b3ee4f7f5d64e79735b80d42", "sha256:dd8d182285a0fe56bace7f45b5e7d1a6ebcbf524e8f3bd87eb0f125271b8831f" ], - "markers": "python_version >= '3.6'", "version": "==0.6.1" }, "mypy": { @@ -257,34 +257,35 @@ }, "mypy-extensions": { "hashes": [ - "sha256:090fedd75945a69ae91ce1303b5824f428daf5a028d2f6ab8a299250a846f15d", - "sha256:2d82818f5bb3e369420cb3c4060a7970edba416647068eb4c5343488a6c604a8" + "sha256:4392f6c0eb8a5668a69e23d168ffa70f0be9ccfd32b5cc2d26a34ae5b844552d", + "sha256:75dbf8955dc00442a438fc4d0666508a9a97b6bd41aa2f0ffe9d2f2725af0782" ], - "version": "==0.4.3" + "markers": "python_version >= '3.5'", + "version": "==1.0.0" }, "nodeenv": { "hashes": [ - "sha256:27083a7b96a25f2f5e1d8cb4b6317ee8aeda3bdd121394e5ac54e498028a042e", - "sha256:e0e7f7dfb85fc5394c6fe1e8fa98131a2473e04311a45afb6508f7cf1836fa2b" + "sha256:d51e0c37e64fbf47d017feac3145cdbb58836d7eee8c6f6d3b6880c5456227d2", + "sha256:df865724bb3c3adc86b3876fa209771517b0cfe596beff01a92700e0e8be4cec" ], "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 3.6'", - "version": "==1.7.0" + "version": "==1.8.0" }, "packaging": { "hashes": [ - "sha256:2198ec20bd4c017b8f9717e00f0c8714076fc2fd93816750ab48e2c41de2cfd3", - "sha256:957e2148ba0e1a3b282772e791ef1d8083648bc131c8ab0c1feba110ce1146c3" + "sha256:994793af429502c4ea2ebf6bf664629d07c1a9fe974af92966e4b8d2df7edc61", + "sha256:a392980d2b6cffa644431898be54b0045151319d1e7ec34f0cfed48767dd334f" ], "markers": "python_version >= '3.7'", - "version": "==22.0" + "version": "==23.1" }, "pathspec": { "hashes": [ - "sha256:88c2606f2c1e818b978540f73ecc908e13999c6c3a383daf3705652ae79807a5", - "sha256:8f6bf73e5758fd365ef5d58ce09ac7c27d2833a8d7da51712eac6e27e35141b0" + "sha256:2798de800fa92780e33acca925945e9a19a133b715067cf165b8866c15a31687", + "sha256:d8af70af76652554bd134c22b3e8a1cc46ed7d91edcdd721ef1a0c51a84a5293" ], "markers": "python_version >= '3.7'", - "version": "==0.10.2" + "version": "==0.11.1" }, "pathvalidate": { "hashes": [ @@ -296,19 +297,19 @@ }, "platformdirs": { "hashes": [ - "sha256:1a89a12377800c81983db6be069ec068eee989748799b946cce2a6e80dcc54ca", - "sha256:b46ffafa316e6b83b47489d240ce17173f123a9b9c83282141c3daf26ad9ac2e" + "sha256:87fbf6473e87c078d536980ba970a472422e94f17b752cfad17024c18876d481", + "sha256:cfd065ba43133ff103ab3bd10aecb095c2a0035fcd1f07217c9376900d94ba07" ], "markers": "python_version >= '3.7'", - "version": "==2.6.0" + "version": "==3.7.0" }, "pluggy": { "hashes": [ - "sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159", - "sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3" + "sha256:c2fd55a7d7a3863cba1a013e4e2414658b1d07b6bc57b3919e0c63c9abb99849", + "sha256:d12f0c4b579b15f5e054301bb226ee85eeeba08ffec228092f8defbaa3a4c4b3" ], - "markers": "python_version >= '3.6'", - "version": "==1.0.0" + "markers": "python_version >= '3.7'", + "version": "==1.2.0" }, "pre-commit": { "hashes": [ @@ -320,41 +321,23 @@ }, "psutil": { "hashes": [ - "sha256:14b29f581b5edab1f133563272a6011925401804d52d603c5c606936b49c8b97", - "sha256:256098b4f6ffea6441eb54ab3eb64db9ecef18f6a80d7ba91549195d55420f84", - "sha256:39ec06dc6c934fb53df10c1672e299145ce609ff0611b569e75a88f313634969", - "sha256:404f4816c16a2fcc4eaa36d7eb49a66df2d083e829d3e39ee8759a411dbc9ecf", - "sha256:42638876b7f5ef43cef8dcf640d3401b27a51ee3fa137cb2aa2e72e188414c32", - "sha256:4642fd93785a29353d6917a23e2ac6177308ef5e8be5cc17008d885cb9f70f12", - "sha256:4fb54941aac044a61db9d8eb56fc5bee207db3bc58645d657249030e15ba3727", - "sha256:561dec454853846d1dd0247b44c2e66a0a0c490f937086930ec4b8f83bf44f06", - "sha256:5d39e3a2d5c40efa977c9a8dd4f679763c43c6c255b1340a56489955dbca767c", - "sha256:614337922702e9be37a39954d67fdb9e855981624d8011a9927b8f2d3c9625d9", - "sha256:67b33f27fc0427483b61563a16c90d9f3b547eeb7af0ef1b9fe024cdc9b3a6ea", - "sha256:68b35cbff92d1f7103d8f1db77c977e72f49fcefae3d3d2b91c76b0e7aef48b8", - "sha256:7cbb795dcd8ed8fd238bc9e9f64ab188f3f4096d2e811b5a82da53d164b84c3f", - "sha256:8f024fbb26c8daf5d70287bb3edfafa22283c255287cf523c5d81721e8e5d82c", - "sha256:91aa0dac0c64688667b4285fa29354acfb3e834e1fd98b535b9986c883c2ce1d", - "sha256:94e621c6a4ddb2573d4d30cba074f6d1aa0186645917df42c811c473dd22b339", - "sha256:9770c1d25aee91417eba7869139d629d6328a9422ce1cdd112bd56377ca98444", - "sha256:b1928b9bf478d31fdffdb57101d18f9b70ed4e9b0e41af751851813547b2a9ab", - "sha256:b2f248ffc346f4f4f0d747ee1947963613216b06688be0be2e393986fe20dbbb", - "sha256:b315febaebae813326296872fdb4be92ad3ce10d1d742a6b0c49fb619481ed0b", - "sha256:b3591616fa07b15050b2f87e1cdefd06a554382e72866fcc0ab2be9d116486c8", - "sha256:b4018d5f9b6651f9896c7a7c2c9f4652e4eea53f10751c4e7d08a9093ab587ec", - "sha256:d75291912b945a7351d45df682f9644540d564d62115d4a20d45fa17dc2d48f8", - "sha256:dc9bda7d5ced744622f157cc8d8bdd51735dafcecff807e928ff26bdb0ff097d", - "sha256:e3ac2c0375ef498e74b9b4ec56df3c88be43fe56cac465627572dbfb21c4be34", - "sha256:e4c4a7636ffc47b7141864f1c5e7d649f42c54e49da2dd3cceb1c5f5d29bfc85", - "sha256:ed29ea0b9a372c5188cdb2ad39f937900a10fb5478dc077283bf86eeac678ef1", - "sha256:f40ba362fefc11d6bea4403f070078d60053ed422255bd838cd86a40674364c9", - "sha256:f4cb67215c10d4657e320037109939b1c1d2fd70ca3d76301992f89fe2edb1f1", - "sha256:f7929a516125f62399d6e8e026129c8835f6c5a3aab88c3fff1a05ee8feb840d", - "sha256:fd331866628d18223a4265371fd255774affd86244fc307ef66eaf00de0633d5", - "sha256:feb861a10b6c3bb00701063b37e4afc754f8217f0f09c42280586bd6ac712b5c" + "sha256:104a5cc0e31baa2bcf67900be36acde157756b9c44017b86b2c049f11957887d", + "sha256:3c6f686f4225553615612f6d9bc21f1c0e305f75d7d8454f9b46e901778e7217", + "sha256:4aef137f3345082a3d3232187aeb4ac4ef959ba3d7c10c33dd73763fbc063da4", + "sha256:5410638e4df39c54d957fc51ce03048acd8e6d60abc0f5107af51e5fb566eb3c", + "sha256:5b9b8cb93f507e8dbaf22af6a2fd0ccbe8244bf30b1baad6b3954e935157ae3f", + "sha256:7a7dd9997128a0d928ed4fb2c2d57e5102bb6089027939f3b722f3a210f9a8da", + "sha256:89518112647f1276b03ca97b65cc7f64ca587b1eb0278383017c2a0dcc26cbe4", + "sha256:8c5f7c5a052d1d567db4ddd231a9d27a74e8e4a9c3f44b1032762bd7b9fdcd42", + "sha256:ab8ed1a1d77c95453db1ae00a3f9c50227ebd955437bcf2a574ba8adbf6a74d5", + "sha256:acf2aef9391710afded549ff602b5887d7a2349831ae4c26be7c807c0a39fac4", + "sha256:b258c0c1c9d145a1d5ceffab1134441c4c5113b2417fafff7315a917a026c3c9", + "sha256:be8929ce4313f9f8146caad4272f6abb8bf99fc6cf59344a3167ecd74f4f203f", + "sha256:c607bb3b57dc779d55e1554846352b4e358c10fff3abf3514a7a6601beebdb30", + "sha256:ea8518d152174e1249c4f2a1c89e3e6065941df2fa13a1ab45327716a23c2b48" ], "index": "pypi", - "version": "==5.9.2" + "version": "==5.9.5" }, "py": { "hashes": [ @@ -413,10 +396,10 @@ }, "pytz": { "hashes": [ - "sha256:222439474e9c98fced559f1709d89e6c9cbf8d79c794ff3eb9f8800064291427", - "sha256:e89512406b793ca39f5971bc999cc538ce125c0e51c27941bef4568b460095e2" + "sha256:1d8ce29db189191fb55338ee6d0387d82ab59f3d00eac103412d64e0ebd0c588", + "sha256:a151b3abb88eda1d4e34a9814df37de2a80e301e68ba0fd856fb9b46bfbbbffb" ], - "version": "==2022.6" + "version": "==2023.3" }, "pyyaml": { "hashes": [ @@ -471,17 +454,18 @@ }, "ruamel-yaml": { "hashes": [ - "sha256:742b35d3d665023981bd6d16b3d24248ce5df75fdb4e2924e93a05c1f8b61ca7", - "sha256:8b7ce697a2f212752a35c1ac414471dc16c424c9573be4926b56ff3f5d23b7af" + "sha256:23cd2ed620231677564646b0c6a89d138b6822a0d78656df7abda5879ec4f447", + "sha256:ec939063761914e14542972a5cba6d33c23b0859ab6342f61cf070cfc600efc2" ], "index": "pypi", - "version": "==0.17.21" + "version": "==0.17.32" }, "ruamel.yaml.clib": { "hashes": [ "sha256:045e0626baf1c52e5527bd5db361bc83180faaba2ff586e763d3d5982a876a9e", "sha256:15910ef4f3e537eea7fe45f8a5d19997479940d9196f357152a09031c5be59f3", "sha256:184faeaec61dbaa3cace407cffc5819f7b977e75360e8d5ca19461cd851a5fc5", + "sha256:1a6391a7cabb7641c32517539ca42cf84b87b667bad38b78d4d42dd23e957c81", "sha256:1f08fd5a2bea9c4180db71678e850b995d2a5f4537be0e94557668cf0f5f9497", "sha256:2aa261c29a5545adfef9296b7e33941f46aa5bbd21164228e833412af4c9c75f", "sha256:3110a99e0f94a4a3470ff67fc20d3f96c25b13d24c6980ff841e82bafe827cac", @@ -492,13 +476,13 @@ "sha256:4a4d8d417868d68b979076a9be6a38c676eca060785abaa6709c7b31593c35d1", "sha256:4b3a93bb9bc662fc1f99c5c3ea8e623d8b23ad22f861eb6fce9377ac07ad6072", "sha256:5bc0667c1eb8f83a3752b71b9c4ba55ef7c7058ae57022dd9b29065186a113d9", - "sha256:721bc4ba4525f53f6a611ec0967bdcee61b31df5a56801281027a3a6d1c2daf5", "sha256:763d65baa3b952479c4e972669f679fe490eee058d5aa85da483ebae2009d231", "sha256:7bdb4c06b063f6fd55e472e201317a3bb6cdeeee5d5a38512ea5c01e1acbdd93", "sha256:8831a2cedcd0f0927f788c5bdf6567d9dc9cc235646a434986a852af1cb54b4b", "sha256:91a789b4aa0097b78c93e3dc4b40040ba55bef518f84a40d4442f713b4094acb", "sha256:92460ce908546ab69770b2e576e4f99fbb4ce6ab4b245345a3869a0a0410488f", "sha256:99e77daab5d13a48a4054803d052ff40780278240a902b880dd37a51ba01a307", + "sha256:9c7617df90c1365638916b98cdd9be833d31d337dbcd722485597b43c4a215bf", "sha256:a234a20ae07e8469da311e182e70ef6b199d0fbeb6c6cc2901204dd87fb867e8", "sha256:a7b301ff08055d73223058b5c46c55638917f04d21577c95e00e0c4d79201a6b", "sha256:be2a7ad8fd8f7442b24323d24ba0b56c51219513cfa45b9ada3b87b76c374d4b", @@ -507,14 +491,16 @@ "sha256:d000f258cf42fec2b1bbf2863c61d7b8918d31ffee905da62dede869254d3b8a", "sha256:d5859983f26d8cd7bb5c287ef452e8aacc86501487634573d260968f753e1d71", "sha256:d5e51e2901ec2366b79f16c2299a03e74ba4531ddcfacc1416639c557aef0ad8", + "sha256:da538167284de58a52109a9b89b8f6a53ff8437dd6dc26d33b57bf6699153122", "sha256:debc87a9516b237d0466a711b18b6ebeb17ba9f391eb7f91c649c5c4ec5006c7", "sha256:df5828871e6648db72d1c19b4bd24819b80a755c4541d3409f0f7acd0f335c80", "sha256:ecdf1a604009bd35c674b9225a8fa609e0282d9b896c03dd441a91e5f53b534e", "sha256:efa08d63ef03d079dcae1dfe334f6c8847ba8b645d08df286358b1f5293d24ab", "sha256:f01da5790e95815eb5a8a138508c01c758e5f5bc0ce4286c4f7028b8dd7ac3d0", - "sha256:f34019dced51047d6f70cb9383b2ae2853b7fc4dce65129a5acd49f4f9256646" + "sha256:f34019dced51047d6f70cb9383b2ae2853b7fc4dce65129a5acd49f4f9256646", + "sha256:f6d3d39611ac2e4f62c3128a9eed45f19a6608670c5a2f4f07f24e8de3441d38" ], - "markers": "python_version < '3.11' and platform_python_implementation == 'CPython'", + "markers": "python_version < '3.12' and platform_python_implementation == 'CPython'", "version": "==0.2.7" }, "ruyaml": { @@ -527,11 +513,11 @@ }, "setuptools": { "hashes": [ - "sha256:57f6f22bde4e042978bcd50176fdb381d7c21a9efa4041202288d3737a0c6a54", - "sha256:a7620757bf984b58deaf32fc8a4577a9bbc0850cf92c20e1ce41c38c19e5fb75" + "sha256:11e52c67415a381d10d6b462ced9cfb97066179f0e871399e006c4ab101fc85f", + "sha256:baf1fdb41c6da4cd2eae722e135500da913332ab3f2f5c7d33af9b492acb5235" ], "markers": "python_version >= '3.7'", - "version": "==65.6.3" + "version": "==68.0.0" }, "six": { "hashes": [ @@ -551,19 +537,19 @@ }, "tabledata": { "hashes": [ - "sha256:2016fa561552bbf2266682fe328e9161359e605620084bac4754e91c238880f1", - "sha256:54541b0c9e58f8fa38251ea0a60965dbaf95737027fa80e6ab56f98d7e4d61e9" + "sha256:6608f86171f3285f16251ed6649dcf6e953d4fe6a8e622d39b80d1954b9e7711", + "sha256:73e610c378670a2b9bb80e56cece24427d18c8672a36c80fcdf2a3753b19642b" ], "markers": "python_version >= '3.6'", - "version": "==1.3.0" + "version": "==1.3.1" }, "tcolorpy": { "hashes": [ - "sha256:88b1a5c1f4d14fa0a3c9fb97d93f84f0540c7a0e3f3957b1967b1b8ea93dbdbc", - "sha256:8a669c29aada6e6715048ae04116e6b620f0864541fecb8722ede568f403b76e" + "sha256:43c1afe908f9968ff5ce59f129b62e392049b8e7cd6a8d3f416bd3d372bb5c7a", + "sha256:4ba9e4d52696a36dc16a55c20317115fb46e4b8e02796e8e270132719bcefad4" ], - "markers": "python_version >= '3.6'", - "version": "==0.1.2" + "markers": "python_version >= '3.7'", + "version": "==0.1.3" }, "toml": { "hashes": [ @@ -578,7 +564,7 @@ "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc", "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f" ], - "markers": "python_version >= '3.7'", + "markers": "python_version < '3.11'", "version": "==2.0.1" }, "typed-ast": { @@ -616,11 +602,11 @@ "datetime" ], "hashes": [ - "sha256:96788530614083164993d1443959f6c58e6bb8e2da839812ddf462c203e4b84c", - "sha256:cf1913982969cf6348152c4a5feec08e324addd99670999e57cdb3ad87a61e9a" + "sha256:892566bff279368d63f02901aba0a3ce78cd7a319ec1f2bf6c8baab3520207a3", + "sha256:dfc37b888d6eed8542208389efa60ec8454e06fd84b276b45b2e33897f9d7825" ], - "markers": "python_version >= '3.6'", - "version": "==1.3.0" + "markers": "python_version >= '3.7'", + "version": "==1.3.1" }, "types-pyyaml": { "hashes": [ @@ -632,34 +618,34 @@ }, "types-requests": { "hashes": [ - "sha256:45b485725ed58752f2b23461252f1c1ad9205b884a1e35f786bb295525a3e16a", - "sha256:97d8f40aa1ffe1e58c3726c77d63c182daea9a72d9f1fa2cafdea756b2a19f2c" + "sha256:3de667cffa123ce698591de0ad7db034a5317457a596eb0b4944e5a9d9e8d1ac", + "sha256:afb06ef8f25ba83d59a1d424bd7a5a939082f94b94e90ab5e6116bd2559deaa3" ], "index": "pypi", - "version": "==2.28.10" + "version": "==2.31.0.1" }, "types-urllib3": { "hashes": [ - "sha256:ed6b9e8a8be488796f72306889a06a3fc3cb1aa99af02ab8afb50144d7317e49", - "sha256:eec5556428eec862b1ac578fb69aab3877995a99ffec9e5a12cf7fbd0cc9daee" + "sha256:3300538c9dc11dad32eae4827ac313f5d986b8b21494801f1bf97a1ac6c03ae5", + "sha256:5dbd1d2bef14efee43f5318b5d36d805a489f6600252bb53626d4bfafd95e27c" ], - "version": "==1.26.25.4" + "version": "==1.26.25.13" }, "typing-extensions": { "hashes": [ - "sha256:1511434bb92bf8dd198c12b1cc812e800d4181cfcb867674e0f8279cc93087aa", - "sha256:16fa4864408f655d35ec496218b85f79b3437c829e93320c7c9215ccfd92489e" + "sha256:88a4153d8505aabbb4e13aacb7c486c2b4a33ca3b3f807914a9b4c844c471c26", + "sha256:d91d5919357fe7f681a9f2b5b4cb2a5f1ef0a1e9f59c4d8ff0d3491e05c0ffd5" ], - "markers": "python_version < '3.8'", - "version": "==4.4.0" + "markers": "python_version >= '3.7'", + "version": "==4.6.3" }, "urllib3": { "hashes": [ - "sha256:47cc05d99aaa09c9e72ed5809b60e7ba354e64b59c9c173ac3018642d8bb41fc", - "sha256:c083dd0dce68dbfbe1129d5271cb90f9447dea7d52097c6e0126120c521ddea8" + "sha256:8d36afa7616d8ab714608411b4a3b13e58f463aee519024578e062e141dce20f", + "sha256:8f135f6502756bde6b2a9b28989df5fbe87c9970cecaa69041edcce7f0589b14" ], "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'", - "version": "==1.26.13" + "version": "==1.26.16" }, "validators": { "hashes": [ @@ -670,11 +656,11 @@ }, "virtualenv": { "hashes": [ - "sha256:ce3b1684d6e1a20a3e5ed36795a97dfc6af29bc3970ca8dab93e11ac6094b3c4", - "sha256:f8b927684efc6f1cc206c9db297a570ab9ad0e51c16fa9e45487d36d1905c058" + "sha256:34da10f14fea9be20e0fd7f04aba9732f84e593dac291b757ce42e3368a39419", + "sha256:8ff19a38c1021c742148edc4f81cb43d7f8c6816d2ede2ab72af5b84c749ade1" ], - "markers": "python_version >= '3.6'", - "version": "==20.17.1" + "markers": "python_version >= '3.7'", + "version": "==20.23.1" }, "yamlfix": { "hashes": [ diff --git a/jenkins/cross-cluster-replication/perf-test.jenkinsfile b/jenkins/cross-cluster-replication/perf-test.jenkinsfile index 5871d02274..edf5ae5c1b 100644 --- a/jenkins/cross-cluster-replication/perf-test.jenkinsfile +++ b/jenkins/cross-cluster-replication/perf-test.jenkinsfile @@ -10,7 +10,7 @@ pipeline { } environment { AGENT_LABEL = 'Jenkins-Agent-AL2-X64-M52xlarge-Docker-Host-Perf-Test' - AGENT_IMAGE = 'opensearchstaging/ci-runner:ci-runner-centos7-performance-test-v2' + AGENT_IMAGE = 'opensearchstaging/ci-runner:ci-runner-centos7-performance-test-v3' BUNDLE_MANIFEST = 'bundle-manifest.yml' JOB_NAME = 'ccr-perf-test' } diff --git a/jenkins/data-prepper/release-data-prepper-all-artifacts.jenkinsfile b/jenkins/data-prepper/release-data-prepper-all-artifacts.jenkinsfile index 21db46e7d8..e5e254f1e3 100644 --- a/jenkins/data-prepper/release-data-prepper-all-artifacts.jenkinsfile +++ b/jenkins/data-prepper/release-data-prepper-all-artifacts.jenkinsfile @@ -26,7 +26,7 @@ pipeline { agent { docker { label 'Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host' - image 'opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v2' + image 'opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3' args '-e JAVA_HOME=/opt/java/openjdk-11' registryUrl 'https://public.ecr.aws/' alwaysPull true @@ -172,7 +172,7 @@ pipeline { agent { docker { label 'Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host' - image 'opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v2' + image 'opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3' args '-e JAVA_HOME=/opt/java/openjdk-11' registryUrl 'https://public.ecr.aws/' alwaysPull true diff --git a/jenkins/manifests-update.jenkinsFile b/jenkins/manifests-update.jenkinsFile index 38fa934957..2e16bf956f 100644 --- a/jenkins/manifests-update.jenkinsFile +++ b/jenkins/manifests-update.jenkinsFile @@ -12,7 +12,7 @@ pipeline { agent { docker { label 'Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host' - image 'opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v2' + image 'opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3' args '-e JAVA_HOME=/opt/java/openjdk-11' registryUrl 'https://public.ecr.aws/' alwaysPull true diff --git a/jenkins/opensearch-dashboards/distribution-build.jenkinsfile b/jenkins/opensearch-dashboards/distribution-build.jenkinsfile index 5d4b819b79..e66559ba6a 100644 --- a/jenkins/opensearch-dashboards/distribution-build.jenkinsfile +++ b/jenkins/opensearch-dashboards/distribution-build.jenkinsfile @@ -11,8 +11,8 @@ pipeline { environment { AGENT_X64 = 'Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host' AGENT_ARM64 = 'Jenkins-Agent-AL2-Arm64-C6g4xlarge-Docker-Host' - IMAGE_RPM = 'opensearchstaging/ci-runner:ci-runner-rockylinux8-opensearch-build-v2' // required for rpm to create digest sha256 correctly with rpm 4.12+ - IMAGE_DEB = 'opensearchstaging/ci-runner:ci-runner-ubuntu2004-opensearch-build-v1' // required for deb to create pkg using debmake/debuild/debhelper + IMAGE_RPM = 'opensearchstaging/ci-runner:ci-runner-rockylinux8-opensearch-build-v3' // required for rpm to create digest sha256 correctly with rpm 4.12+ + IMAGE_DEB = 'opensearchstaging/ci-runner:ci-runner-ubuntu2004-opensearch-build-v2' // required for deb to create pkg using debmake/debuild/debhelper JOB_NAME_OPENSEARCH = 'distribution-build-opensearch' } parameters { diff --git a/jenkins/opensearch-dashboards/integ-test.jenkinsfile b/jenkins/opensearch-dashboards/integ-test.jenkinsfile index 0a15d04606..ef94acfda8 100644 --- a/jenkins/opensearch-dashboards/integ-test.jenkinsfile +++ b/jenkins/opensearch-dashboards/integ-test.jenkinsfile @@ -4,9 +4,9 @@ lib = library(identifier: 'jenkins@4.2.2', retriever: modernSCM([ ])) def docker_images = [ - "tar": "opensearchstaging/ci-runner:ci-runner-rockylinux8-opensearch-dashboards-integtest-v3", - "rpm": "opensearchstaging/ci-runner:ci-runner-rockylinux8-systemd-base-integtest-v2", - "deb": "opensearchstaging/ci-runner:ci-runner-ubuntu2004-systemd-base-integtest-v2", + "tar": "opensearchstaging/ci-runner:ci-runner-rockylinux8-opensearch-dashboards-integtest-v4", + "rpm": "opensearchstaging/ci-runner:ci-runner-rockylinux8-systemd-base-integtest-v3", + "deb": "opensearchstaging/ci-runner:ci-runner-ubuntu2004-systemd-base-integtest-v3", ] def docker_args = [ diff --git a/jenkins/opensearch/distribution-build.jenkinsfile b/jenkins/opensearch/distribution-build.jenkinsfile index a8b026aebe..ae6bd567be 100644 --- a/jenkins/opensearch/distribution-build.jenkinsfile +++ b/jenkins/opensearch/distribution-build.jenkinsfile @@ -11,8 +11,8 @@ pipeline { environment { AGENT_X64 = 'Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host' AGENT_ARM64 = 'Jenkins-Agent-AL2-Arm64-C6g4xlarge-Docker-Host' - IMAGE_RPM = 'opensearchstaging/ci-runner:ci-runner-rockylinux8-opensearch-build-v2' // required for rpm to create digest sha256 correctly with rpm 4.12+ - IMAGE_DEB = 'opensearchstaging/ci-runner:ci-runner-ubuntu2004-opensearch-build-v1' // required for deb to create pkg using debmake/debuild/debhelper + IMAGE_RPM = 'opensearchstaging/ci-runner:ci-runner-rockylinux8-opensearch-build-v3' // required for rpm to create digest sha256 correctly with rpm 4.12+ + IMAGE_DEB = 'opensearchstaging/ci-runner:ci-runner-ubuntu2004-opensearch-build-v2' // required for deb to create pkg using debmake/debuild/debhelper } parameters { string( diff --git a/jenkins/opensearch/integ-test.jenkinsfile b/jenkins/opensearch/integ-test.jenkinsfile index 17dee6d150..43aa8a6ca5 100644 --- a/jenkins/opensearch/integ-test.jenkinsfile +++ b/jenkins/opensearch/integ-test.jenkinsfile @@ -4,9 +4,9 @@ lib = library(identifier: 'jenkins@4.2.2', retriever: modernSCM([ ])) def docker_images = [ - "tar": "opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v2", - "rpm": "opensearchstaging/ci-runner:ci-runner-rockylinux8-systemd-base-integtest-v2", - "deb": "opensearchstaging/ci-runner:ci-runner-ubuntu2004-systemd-base-integtest-v2", + "tar": "opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3", + "rpm": "opensearchstaging/ci-runner:ci-runner-rockylinux8-systemd-base-integtest-v3", + "deb": "opensearchstaging/ci-runner:ci-runner-ubuntu2004-systemd-base-integtest-v3", ] def docker_args = [ diff --git a/jenkins/opensearch/perf-test.jenkinsfile b/jenkins/opensearch/perf-test.jenkinsfile index 6d215cbe7a..cf31751e16 100644 --- a/jenkins/opensearch/perf-test.jenkinsfile +++ b/jenkins/opensearch/perf-test.jenkinsfile @@ -10,7 +10,7 @@ pipeline { } environment { AGENT_LABEL = 'Jenkins-Agent-AL2-X64-M52xlarge-Docker-Host-Perf-Test' - AGENT_IMAGE = 'opensearchstaging/ci-runner:ci-runner-centos7-performance-test-v2' + AGENT_IMAGE = 'opensearchstaging/ci-runner:ci-runner-centos7-performance-test-v3' BUNDLE_MANIFEST = 'bundle-manifest.yml' JOB_NAME = 'perf-test' } diff --git a/jenkins/promotion/promote-repos.jenkinsfile b/jenkins/promotion/promote-repos.jenkinsfile index 0ca26ae68a..fade4af90a 100644 --- a/jenkins/promotion/promote-repos.jenkinsfile +++ b/jenkins/promotion/promote-repos.jenkinsfile @@ -4,8 +4,8 @@ lib = library(identifier: 'jenkins@2.0.2', retriever: modernSCM([ ])) def docker_images = [ - "yum": "opensearchstaging/ci-runner:ci-runner-rockylinux8-opensearch-build-v2", - "apt": "opensearchstaging/ci-runner:ci-runner-ubuntu2004-opensearch-build-v1", + "yum": "opensearchstaging/ci-runner:ci-runner-rockylinux8-opensearch-build-v3", + "apt": "opensearchstaging/ci-runner:ci-runner-ubuntu2004-opensearch-build-v2", ] pipeline { diff --git a/jenkins/rpm-validation/rpm-validation.jenkinsfile b/jenkins/rpm-validation/rpm-validation.jenkinsfile index 365433a7fb..cf8fd8bd41 100644 --- a/jenkins/rpm-validation/rpm-validation.jenkinsfile +++ b/jenkins/rpm-validation/rpm-validation.jenkinsfile @@ -27,7 +27,7 @@ pipeline { agent { docker { label AGENT_LABEL - image 'opensearchstaging/ci-runner:ci-runner-rockylinux8-systemd-base-integtest-v2' + image 'opensearchstaging/ci-runner:ci-runner-rockylinux8-systemd-base-integtest-v3' args '--entrypoint=/usr/sbin/init -u root --privileged -v /sys/fs/cgroup:/sys/fs/cgroup:ro' registryUrl 'https://public.ecr.aws/' alwaysPull true diff --git a/jenkins/sign-artifacts/sign-standalone-artifacts.jenkinsfile b/jenkins/sign-artifacts/sign-standalone-artifacts.jenkinsfile index 46df57fd6d..f3ae7f8dd6 100644 --- a/jenkins/sign-artifacts/sign-standalone-artifacts.jenkinsfile +++ b/jenkins/sign-artifacts/sign-standalone-artifacts.jenkinsfile @@ -7,7 +7,7 @@ pipeline { agent { docker { label 'Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host' - image 'opensearchstaging/ci-runner:ci-runner-rockylinux8-opensearch-build-v2' + image 'opensearchstaging/ci-runner:ci-runner-rockylinux8-opensearch-build-v3' registryUrl 'https://public.ecr.aws/' alwaysPull true } diff --git a/jenkins/validate-artifacts/validate-artifacts.jenkinsfile b/jenkins/validate-artifacts/validate-artifacts.jenkinsfile index 72056d4181..9fcae55443 100644 --- a/jenkins/validate-artifacts/validate-artifacts.jenkinsfile +++ b/jenkins/validate-artifacts/validate-artifacts.jenkinsfile @@ -4,9 +4,9 @@ lib = library(identifier: 'jenkins@4.2.2', retriever: modernSCM([ ])) def docker_images = [ - "tar": "opensearchstaging/ci-runner:ci-runner-rockylinux8-opensearch-dashboards-integtest-v2", - "rpm": "opensearchstaging/ci-runner:ci-runner-rockylinux8-systemd-base-integtest-v1", - "yum": "opensearchstaging/ci-runner:ci-runner-rockylinux8-systemd-base-integtest-v1", + "tar": "opensearchstaging/ci-runner:ci-runner-rockylinux8-opensearch-dashboards-integtest-v4", + "rpm": "opensearchstaging/ci-runner:ci-runner-rockylinux8-systemd-base-integtest-v3", + "yum": "opensearchstaging/ci-runner:ci-runner-rockylinux8-systemd-base-integtest-v3", ] def docker_args = [ diff --git a/manifests/2.7.1/opensearch-dashboards-2.7.1.yml b/manifests/2.7.1/opensearch-dashboards-2.7.1.yml index 03d1414c00..0c7f145f56 100644 --- a/manifests/2.7.1/opensearch-dashboards-2.7.1.yml +++ b/manifests/2.7.1/opensearch-dashboards-2.7.1.yml @@ -5,7 +5,7 @@ build: version: 2.7.1 ci: image: - name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-dashboards-build-v3 + name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-dashboards-build-v4 components: - name: OpenSearch-Dashboards repository: https://github.com/opensearch-project/OpenSearch-Dashboards.git diff --git a/manifests/2.8.0/opensearch-dashboards-2.8.0.yml b/manifests/2.8.0/opensearch-dashboards-2.8.0.yml index c6faf09712..8aa569b2fb 100644 --- a/manifests/2.8.0/opensearch-dashboards-2.8.0.yml +++ b/manifests/2.8.0/opensearch-dashboards-2.8.0.yml @@ -5,7 +5,7 @@ build: version: 2.8.0 ci: image: - name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-dashboards-build-v3 + name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-dashboards-build-v4 components: - name: OpenSearch-Dashboards repository: https://github.com/opensearch-project/OpenSearch-Dashboards.git diff --git a/manifests/2.8.1/opensearch-2.8.1.yml b/manifests/2.8.1/opensearch-2.8.1.yml index 65d5540ece..76427b297e 100644 --- a/manifests/2.8.1/opensearch-2.8.1.yml +++ b/manifests/2.8.1/opensearch-2.8.1.yml @@ -5,7 +5,7 @@ build: version: 2.8.1 ci: image: - name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v2 + name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3 args: -e JAVA_HOME=/opt/java/openjdk-17 components: - name: OpenSearch diff --git a/manifests/2.8.1/opensearch-dashboards-2.8.1.yml b/manifests/2.8.1/opensearch-dashboards-2.8.1.yml index 8d71fc034d..44aa559bfb 100644 --- a/manifests/2.8.1/opensearch-dashboards-2.8.1.yml +++ b/manifests/2.8.1/opensearch-dashboards-2.8.1.yml @@ -5,7 +5,7 @@ build: version: 2.8.1 ci: image: - name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-dashboards-build-v3 + name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-dashboards-build-v4 components: - name: OpenSearch-Dashboards repository: https://github.com/opensearch-project/OpenSearch-Dashboards.git diff --git a/manifests/2.9.0/opensearch-2.9.0-seg-rep-test.yml b/manifests/2.9.0/opensearch-2.9.0-seg-rep-test.yml index 06b67e3d63..a7a426ccb1 100644 --- a/manifests/2.9.0/opensearch-2.9.0-seg-rep-test.yml +++ b/manifests/2.9.0/opensearch-2.9.0-seg-rep-test.yml @@ -3,7 +3,7 @@ schema-version: '1.0' name: OpenSearch ci: image: - name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v2 + name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3 args: -e JAVA_HOME=/opt/java/openjdk-17 components: - name: index-management diff --git a/manifests/2.9.0/opensearch-2.9.0-test.yml b/manifests/2.9.0/opensearch-2.9.0-test.yml index 353e7f6b32..2b21360cf4 100644 --- a/manifests/2.9.0/opensearch-2.9.0-test.yml +++ b/manifests/2.9.0/opensearch-2.9.0-test.yml @@ -3,7 +3,7 @@ schema-version: '1.0' name: OpenSearch ci: image: - name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v2 + name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3 args: -e JAVA_HOME=/opt/java/openjdk-17 components: - name: alerting diff --git a/manifests/2.9.0/opensearch-2.9.0.yml b/manifests/2.9.0/opensearch-2.9.0.yml index e8cad51ceb..94b78005d7 100644 --- a/manifests/2.9.0/opensearch-2.9.0.yml +++ b/manifests/2.9.0/opensearch-2.9.0.yml @@ -5,7 +5,7 @@ build: version: 2.9.0 ci: image: - name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v2 + name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3 args: -e JAVA_HOME=/opt/java/openjdk-17 components: - name: OpenSearch diff --git a/manifests/2.9.0/opensearch-dashboards-2.9.0-test.yml b/manifests/2.9.0/opensearch-dashboards-2.9.0-test.yml index a325979ad1..3a3ac1c35f 100644 --- a/manifests/2.9.0/opensearch-dashboards-2.9.0-test.yml +++ b/manifests/2.9.0/opensearch-dashboards-2.9.0-test.yml @@ -3,7 +3,7 @@ schema-version: '1.0' name: OpenSearch Dashboards ci: image: - name: opensearchstaging/ci-runner:ci-runner-rockylinux8-opensearch-dashboards-integtest-v3 + name: opensearchstaging/ci-runner:ci-runner-rockylinux8-opensearch-dashboards-integtest-v4 components: - name: OpenSearch-Dashboards integ-test: diff --git a/manifests/2.9.0/opensearch-dashboards-2.9.0.yml b/manifests/2.9.0/opensearch-dashboards-2.9.0.yml index c934a36f4e..e33aee449e 100644 --- a/manifests/2.9.0/opensearch-dashboards-2.9.0.yml +++ b/manifests/2.9.0/opensearch-dashboards-2.9.0.yml @@ -5,7 +5,7 @@ build: version: 2.9.0 ci: image: - name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-dashboards-build-v3 + name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-dashboards-build-v4 components: - name: OpenSearch-Dashboards repository: https://github.com/opensearch-project/OpenSearch-Dashboards.git diff --git a/manifests/3.0.0/opensearch-3.0.0-test.yml b/manifests/3.0.0/opensearch-3.0.0-test.yml index 06a9411abd..c355a5af43 100644 --- a/manifests/3.0.0/opensearch-3.0.0-test.yml +++ b/manifests/3.0.0/opensearch-3.0.0-test.yml @@ -3,7 +3,7 @@ schema-version: '1.0' name: OpenSearch ci: image: - name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v2 + name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3 args: -e JAVA_HOME=/opt/java/openjdk-20 components: - name: cross-cluster-replication diff --git a/manifests/3.0.0/opensearch-3.0.0.yml b/manifests/3.0.0/opensearch-3.0.0.yml index a32b9565b2..b4cba5fd74 100644 --- a/manifests/3.0.0/opensearch-3.0.0.yml +++ b/manifests/3.0.0/opensearch-3.0.0.yml @@ -5,7 +5,7 @@ build: version: 3.0.0 ci: image: - name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v2 + name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3 args: -e JAVA_HOME=/opt/java/openjdk-20 components: - name: OpenSearch diff --git a/manifests/3.0.0/opensearch-dashboards-3.0.0.yml b/manifests/3.0.0/opensearch-dashboards-3.0.0.yml index ee615e7b5b..8984e9e141 100644 --- a/manifests/3.0.0/opensearch-dashboards-3.0.0.yml +++ b/manifests/3.0.0/opensearch-dashboards-3.0.0.yml @@ -5,7 +5,7 @@ build: version: 3.0.0 ci: image: - name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-dashboards-build-v3 + name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-dashboards-build-v4 components: - name: OpenSearch-Dashboards repository: https://github.com/opensearch-project/OpenSearch-Dashboards.git diff --git a/manifests/templates/opensearch-dashboards/1.x/manifest.yml b/manifests/templates/opensearch-dashboards/1.x/manifest.yml index 548516212d..53cb99df31 100644 --- a/manifests/templates/opensearch-dashboards/1.x/manifest.yml +++ b/manifests/templates/opensearch-dashboards/1.x/manifest.yml @@ -5,7 +5,7 @@ build: version: 'replace' ci: image: - name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-dashboards-build-v3 + name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-dashboards-build-v4 components: - name: OpenSearch-Dashboards repository: https://github.com/opensearch-project/OpenSearch-Dashboards.git diff --git a/manifests/templates/opensearch-dashboards/2.x/manifest.yml b/manifests/templates/opensearch-dashboards/2.x/manifest.yml index 9d33c0691c..af61ffb303 100644 --- a/manifests/templates/opensearch-dashboards/2.x/manifest.yml +++ b/manifests/templates/opensearch-dashboards/2.x/manifest.yml @@ -5,7 +5,7 @@ build: version: 'replace' ci: image: - name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-dashboards-build-v3 + name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-dashboards-build-v4 components: - name: OpenSearch-Dashboards repository: https://github.com/opensearch-project/OpenSearch-Dashboards.git diff --git a/manifests/templates/opensearch-dashboards/3.x/manifest.yml b/manifests/templates/opensearch-dashboards/3.x/manifest.yml index 548516212d..53cb99df31 100644 --- a/manifests/templates/opensearch-dashboards/3.x/manifest.yml +++ b/manifests/templates/opensearch-dashboards/3.x/manifest.yml @@ -5,7 +5,7 @@ build: version: 'replace' ci: image: - name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-dashboards-build-v3 + name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-dashboards-build-v4 components: - name: OpenSearch-Dashboards repository: https://github.com/opensearch-project/OpenSearch-Dashboards.git diff --git a/manifests/templates/opensearch-dashboards/default/manifest.yml b/manifests/templates/opensearch-dashboards/default/manifest.yml index 9d33c0691c..af61ffb303 100644 --- a/manifests/templates/opensearch-dashboards/default/manifest.yml +++ b/manifests/templates/opensearch-dashboards/default/manifest.yml @@ -5,7 +5,7 @@ build: version: 'replace' ci: image: - name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-dashboards-build-v3 + name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-dashboards-build-v4 components: - name: OpenSearch-Dashboards repository: https://github.com/opensearch-project/OpenSearch-Dashboards.git diff --git a/manifests/templates/opensearch/1.x/manifest.yml b/manifests/templates/opensearch/1.x/manifest.yml index a1934229d4..4e7f401925 100644 --- a/manifests/templates/opensearch/1.x/manifest.yml +++ b/manifests/templates/opensearch/1.x/manifest.yml @@ -5,7 +5,7 @@ build: version: 'replace' ci: image: - name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v2 + name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3 args: -e JAVA_HOME=/opt/java/openjdk-11 components: - name: OpenSearch diff --git a/manifests/templates/opensearch/2.x/manifest.yml b/manifests/templates/opensearch/2.x/manifest.yml index d798342efe..2db16e6b43 100644 --- a/manifests/templates/opensearch/2.x/manifest.yml +++ b/manifests/templates/opensearch/2.x/manifest.yml @@ -5,7 +5,7 @@ build: version: 'replace' ci: image: - name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v2 + name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3 args: -e JAVA_HOME=/opt/java/openjdk-17 components: - name: OpenSearch diff --git a/manifests/templates/opensearch/3.x/manifest.yml b/manifests/templates/opensearch/3.x/manifest.yml index d798342efe..2db16e6b43 100644 --- a/manifests/templates/opensearch/3.x/manifest.yml +++ b/manifests/templates/opensearch/3.x/manifest.yml @@ -5,7 +5,7 @@ build: version: 'replace' ci: image: - name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v2 + name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3 args: -e JAVA_HOME=/opt/java/openjdk-17 components: - name: OpenSearch diff --git a/manifests/templates/opensearch/default/manifest.yml b/manifests/templates/opensearch/default/manifest.yml index d798342efe..2db16e6b43 100644 --- a/manifests/templates/opensearch/default/manifest.yml +++ b/manifests/templates/opensearch/default/manifest.yml @@ -5,7 +5,7 @@ build: version: 'replace' ci: image: - name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v2 + name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3 args: -e JAVA_HOME=/opt/java/openjdk-17 components: - name: OpenSearch diff --git a/tests/jenkins/jenkinsjob-regression-files/sign-standalone-artifacts/sign-standalone-artifacts.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/sign-standalone-artifacts/sign-standalone-artifacts.jenkinsfile.txt index c6aacc9cc5..a813b52cc6 100644 --- a/tests/jenkins/jenkinsjob-regression-files/sign-standalone-artifacts/sign-standalone-artifacts.jenkinsfile.txt +++ b/tests/jenkins/jenkinsjob-regression-files/sign-standalone-artifacts/sign-standalone-artifacts.jenkinsfile.txt @@ -3,7 +3,7 @@ sign-standalone-artifacts.library({identifier=jenkins@1.0.4, retriever=null}) sign-standalone-artifacts.pipeline(groovy.lang.Closure) sign-standalone-artifacts.credentials(jenkins-artifact-bucket-name) - sign-standalone-artifacts.echo(Executing on agent [docker:[alwaysPull:true, args:, containerPerStageRoot:false, label:Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host, image:opensearchstaging/ci-runner:ci-runner-rockylinux8-opensearch-build-v2, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]]) + sign-standalone-artifacts.echo(Executing on agent [docker:[alwaysPull:true, args:, containerPerStageRoot:false, label:Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host, image:opensearchstaging/ci-runner:ci-runner-rockylinux8-opensearch-build-v3, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]]) sign-standalone-artifacts.stage(sign, groovy.lang.Closure) sign-standalone-artifacts.script(groovy.lang.Closure) sign-standalone-artifacts.sh(mkdir /tmp/workspace/artifacts) diff --git a/tests/test_run_assemble.py b/tests/test_run_assemble.py index 0149f21fa5..f618395ad8 100644 --- a/tests/test_run_assemble.py +++ b/tests/test_run_assemble.py @@ -51,5 +51,5 @@ def test_main(self, mock_recorder: Mock, mock_bundles: Mock, getcwd: Mock, makeD call(os.path.join("curdir", "tar", "dist", "opensearch")) ]) # manifest included in package - self.assertEqual(getcwd.call_count, 2) + self.assertTrue(getcwd.called) makeDirs.assert_called_once_with(ANY, exist_ok=True) diff --git a/tests/tests_manifests_workflow/test_input_manifests.py b/tests/tests_manifests_workflow/test_input_manifests.py index 3ab8a9b764..09e6b8064c 100644 --- a/tests/tests_manifests_workflow/test_input_manifests.py +++ b/tests/tests_manifests_workflow/test_input_manifests.py @@ -47,7 +47,7 @@ def test_create_manifest_opensearch(self) -> None: { "schema-version": "1.0", "build": {"name": "OpenSearch", "version": "1.2.3"}, - "ci": {"image": {"name": "opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v2", + "ci": {"image": {"name": "opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3", "args": "-e JAVA_HOME=/opt/java/openjdk-11"}}, }, ) @@ -60,7 +60,7 @@ def test_create_manifest_opensearch_from_default(self) -> None: { "schema-version": "1.0", "build": {"name": "OpenSearch", "version": "0.2.3"}, - "ci": {"image": {"name": "opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v2", + "ci": {"image": {"name": "opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3", "args": "-e JAVA_HOME=/opt/java/openjdk-17"}}, }, ) @@ -73,7 +73,7 @@ def test_create_manifest_opensearch_dashboards(self) -> None: { "schema-version": "1.0", "build": {"name": "OpenSearch Dashboards", "version": "1.2.3"}, - "ci": {"image": {"name": "opensearchstaging/ci-runner:ci-runner-centos7-opensearch-dashboards-build-v3", }}, + "ci": {"image": {"name": "opensearchstaging/ci-runner:ci-runner-centos7-opensearch-dashboards-build-v4", }}, }, ) @@ -85,7 +85,7 @@ def test_create_manifest_opensearch_dashboards_from_default(self) -> None: { "schema-version": "1.0", "build": {"name": "OpenSearch Dashboards", "version": "4.2.3"}, - "ci": {"image": {"name": "opensearchstaging/ci-runner:ci-runner-centos7-opensearch-dashboards-build-v3", }}, + "ci": {"image": {"name": "opensearchstaging/ci-runner:ci-runner-centos7-opensearch-dashboards-build-v4", }}, }, ) diff --git a/tests/tests_system/test_process.py b/tests/tests_system/test_process.py index 4803fce1f3..3a5ff5da0a 100644 --- a/tests/tests_system/test_process.py +++ b/tests/tests_system/test_process.py @@ -26,7 +26,12 @@ def test(self) -> None: return_code = process_handler.terminate() - self.assertIsNone(return_code) + # In Python 3.9 it seems that Process Termination is not as stable in 3.7. + # With low hardware specs the result can be None + # While on a much beefier server the termination can be instant + # We even observed the same success on CentOS7 but fail on Ubuntu out of nowhere + # Adding sleep time is not very efficient and it is very random, thus allow 2 return values here. + assert return_code in [None, 1] self.assertIsNotNone(process_handler.stdout_data) self.assertIsNotNone(process_handler.stderr_data)