diff --git a/CHANGELOG.md b/CHANGELOG.md index e398434..562b3ed 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,20 +7,35 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). -## [2.0.1](https://github.com/Terradue/DotNetOpenSearchClient/compare/2.0.0...2.0.1) +## [2.1.0](https://github.com/Terradue/DotNetOpenSearchClient/compare/2.0.1...2.1.0) + +### Fixed + +- PackagePrefix [`#147`](https://github.com/quamotion/dotnet-packaging/issues/147) + +### Commits + +- deploy artifacts on ciop [`3cf841c`](https://github.com/Terradue/DotNetOpenSearchClient/commit/3cf841c8cf76643de6e438859612951ea745c416) +- Restored support for USGS/Landsat [`6c3590c`](https://github.com/Terradue/DotNetOpenSearchClient/commit/6c3590c6d71670d6370735e5c2660c333c961a1b) +- some fixes [`8dea063`](https://github.com/Terradue/DotNetOpenSearchClient/commit/8dea063eb04d8e8bc82d1937de51ae800191134c) +- Change to allow sub-folder access for Creodias search (keep provided description URL instead of replacing them with the root search URL) [`a1adcc1`](https://github.com/Terradue/DotNetOpenSearchClient/commit/a1adcc1942e2a878768cb628ab1121df48f44063) +- fixed package name [`f139d9a`](https://github.com/Terradue/DotNetOpenSearchClient/commit/f139d9a55ecda38d6c36bfccda97ad31f3780138) + +## [2.0.1](https://github.com/Terradue/DotNetOpenSearchClient/compare/2.0.0...2.0.1) - 2022-04-11 ### Commits - fix dll plugin load for self contained package [`6922708`](https://github.com/Terradue/DotNetOpenSearchClient/commit/69227081c290e6fdd70d537d936b9cb8d6119ac3) - fix release [`1380f94`](https://github.com/Terradue/DotNetOpenSearchClient/commit/1380f9448144278597403bbb18eff1d1ad67ccf7) -## [2.0.0](https://github.com/Terradue/DotNetOpenSearchClient/compare/1.9.9...2.0.0) - 2022-04-11 +## [2.0.0-1](https://github.com/Terradue/DotNetOpenSearchClient/compare/1.9.9...2.0.0-1) - 2022-04-11 ### Commits - CHANGELOG [`80d33dc`](https://github.com/Terradue/DotNetOpenSearchClient/commit/80d33dc7d36aa23607ac242e84a37177005056ce) - new build [`33e03f7`](https://github.com/Terradue/DotNetOpenSearchClient/commit/33e03f7ef62616d289bf7a0200a0590d1a98d2ef) - move to net5 [`43b4d02`](https://github.com/Terradue/DotNetOpenSearchClient/commit/43b4d02649d2587b19909a11502a2fa873b1fc51) +- fix release [`1380f94`](https://github.com/Terradue/DotNetOpenSearchClient/commit/1380f9448144278597403bbb18eff1d1ad67ccf7) - removed src [`e35aaf3`](https://github.com/Terradue/DotNetOpenSearchClient/commit/e35aaf34ca728807aa9beced98bd1d67c1116320) - more build [`119e538`](https://github.com/Terradue/DotNetOpenSearchClient/commit/119e538d918b2c6bb5c995c936cb2782245d4854) diff --git a/Jenkinsfile b/Jenkinsfile index 1d009ec..c0e76fb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -42,9 +42,9 @@ pipeline { sh "dotnet publish -f net5.0 -r linux-x64 -p:PublishSingleFile=true ${env.DOTNET_ARGS} --self-contained true Terradue.OpenSearch.Client/Terradue.OpenSearch.Client.csproj" stash name: 'oscli-packages', includes: 'Terradue.OpenSearch.Client/bin/**/*.rpm' stash name: 'oscli-debs', includes: 'Terradue.OpenSearch.Client/bin/**/*.deb' - stash name: 'oscli-exe', includes: 'Terradue.OpenSearch.Client/bin/**/linux**/publish/OpenSearchClient, Terradue.OpenSearch.Client/bin/linux**/publish/*.json' - stash name: 'oscli-zips', includes: 'Terradue.OpenSearch.Client/bin/**/linux**/*.zip' - archiveArtifacts artifacts: 'Terradue.OpenSearch.Client/bin/linux**/publish/Stars,Terradue.OpenSearch.Client/bin/linux**/publish/*.json,Terradue.OpenSearch.Client/bin/**/*.rpm,Terradue.OpenSearch.Client/bin/**/*.deb, Terradue.OpenSearch.Client/bin/**/*.zip', fingerprint: true + stash name: 'oscli-exe', includes: 'Terradue.OpenSearch.Client/bin/**/linux*/publish/OpenSearchClient' + stash name: 'oscli-zips', includes: 'Terradue.OpenSearch.Client/bin/**/linux*/*.zip' + archiveArtifacts artifacts: 'Terradue.OpenSearch.Client/bin/linux**/publish/OpenSearchClient,Terradue.OpenSearch.Client/bin/linux**/publish/*.json,Terradue.OpenSearch.Client/bin/**/*.rpm,Terradue.OpenSearch.Client/bin/**/*.deb, Terradue.OpenSearch.Client/bin/**/*.zip', fingerprint: true } } } @@ -73,12 +73,10 @@ pipeline { steps { script { unstash name: 'oscli-debs' - def starsdeb = findFiles(glob: "Terradue.OpenSearch.Client/bin/**/OpenSearchClient.*.linux-x64.deb") + def starsdeb = findFiles(glob: "Terradue.OpenSearch.Client/bin/**/opensearch-client.*.linux-x64.deb") def descriptor = readDescriptor() sh "mv ${starsdeb[0].path} ." def mType=getTypeOfVersion(env.BRANCH_NAME) - def baseImage = docker.image('centos:latest') - baseImage.pull() def testsuite = docker.build(descriptor.docker_image_name + ":${mType}${env.VERSION_TOOL}", "--no-cache --build-arg STARS_DEB=${starsdeb[0].name} .") testsuite.tag("${mType}latest") docker.withRegistry('https://registry.hub.docker.com', 'dockerhub') { diff --git a/Terradue.OpenSearch.Client/Terradue.OpenSearch.Client.csproj b/Terradue.OpenSearch.Client/Terradue.OpenSearch.Client.csproj index dde3aa6..3561531 100644 --- a/Terradue.OpenSearch.Client/Terradue.OpenSearch.Client.csproj +++ b/Terradue.OpenSearch.Client/Terradue.OpenSearch.Client.csproj @@ -5,6 +5,7 @@ net5.0 win-x64;linux-x64;osx-x64;centos.7-x64 Terradue.OpenSearch.Client + opensearch-client DotNetOpenSearchClient Generic OpenSearch Client LICENSE diff --git a/artifactdeploy.json b/artifactdeploy.json index 0afc6b8..c150517 100644 --- a/artifactdeploy.json +++ b/artifactdeploy.json @@ -1,34 +1,39 @@ { "files": [ { - "pattern": ".*-SNAPSHOT\.rhel\.6-x64.rpm", + "pattern": ".*-SNAPSHOT\.linux-x64.rpm", "regexp" : true, "target": "yum-terradue-testing/el6/x86_64/" }, { - "pattern": ".*(?!.*SNAPSHOT)\.rhel\.6-x64.rpm", + "pattern": ".*(?!.*SNAPSHOT)\.linux-x64.rpm", "regexp" : true, "target": "yum-terradue-stable/el6/x86_64/" }, { - "pattern": ".*-SNAPSHOT\.centos\.7-x64.rpm", + "pattern": ".*-SNAPSHOT\.linux-x64.rpm", "regexp" : true, "target": "yum-terradue-testing/el7/x86_64/" }, { - "pattern": ".*(?!.*SNAPSHOT)\.centos\.7-x64.rpm", + "pattern": ".*(?!.*SNAPSHOT)\.linux-x64.rpm", "regexp" : true, "target": "yum-terradue-stable/el7/x86_64/" }, { - "pattern": ".*-SNAPSHOT\.rhel-x64.rpm", + "pattern": ".*-SNAPSHOT\.linux-x64.rpm", "regexp" : true, "target": "yum-terradue-testing/el8/x86_64/" }, { - "pattern": ".*(?!.*SNAPSHOT)\.rhel-x64.rpm", + "pattern": ".*(?!.*SNAPSHOT)\.linux-x64.rpm", "regexp" : true, "target": "yum-terradue-stable/el8/x86_64/" + }, + { + "pattern": ".*(?!.*SNAPSHOT)\.linux-x64.rpm", + "regexp" : true, + "target": "yum-ciop-stable/el7/x86_64/" } ] } \ No newline at end of file