From 0cb40dde36980376396861046c7d05cb0c15174a Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 21 Sep 2021 17:53:44 +0200 Subject: [PATCH 1/8] Modifica conf installer Land x profili --- .../PublishProfiles/FolderProfile.pubxml | 16 +++++++++++ .../Properties/PublishProfiles/IIS01.pubxml | 28 +++++++++++++++++++ .../Properties/PublishProfiles/IIS02.pubxml | 27 ++++++++++++++++++ .../PublishProfiles/IISProfile.pubxml | 21 ++++++++++++++ .../W2019-IIS-DEVProfile.pubxml | 27 ++++++++++++++++++ 5 files changed, 119 insertions(+) create mode 100644 MP.Land/Properties/PublishProfiles/FolderProfile.pubxml create mode 100644 MP.Land/Properties/PublishProfiles/IIS01.pubxml create mode 100644 MP.Land/Properties/PublishProfiles/IIS02.pubxml create mode 100644 MP.Land/Properties/PublishProfiles/IISProfile.pubxml create mode 100644 MP.Land/Properties/PublishProfiles/W2019-IIS-DEVProfile.pubxml diff --git a/MP.Land/Properties/PublishProfiles/FolderProfile.pubxml b/MP.Land/Properties/PublishProfiles/FolderProfile.pubxml new file mode 100644 index 00000000..cb2062ae --- /dev/null +++ b/MP.Land/Properties/PublishProfiles/FolderProfile.pubxml @@ -0,0 +1,16 @@ + + + + + False + False + True + Release + Any CPU + FileSystem + bin\publish\net5.0\ + FileSystem + + \ No newline at end of file diff --git a/MP.Land/Properties/PublishProfiles/IIS01.pubxml b/MP.Land/Properties/PublishProfiles/IIS01.pubxml new file mode 100644 index 00000000..8770d4a4 --- /dev/null +++ b/MP.Land/Properties/PublishProfiles/IIS01.pubxml @@ -0,0 +1,28 @@ + + + + + MSDeploy + True + Release + Any CPU + + + False + d9901b50-e61c-400c-b62c-fa060cf72c29 + false + https://IIS01:8172/MsDeploy.axd + Default Web Site/MP/PROG + + False + WMSVC + True + jenkins + <_SavePWD>True + net5.0 + True + + \ No newline at end of file diff --git a/MP.Land/Properties/PublishProfiles/IIS02.pubxml b/MP.Land/Properties/PublishProfiles/IIS02.pubxml new file mode 100644 index 00000000..414f1262 --- /dev/null +++ b/MP.Land/Properties/PublishProfiles/IIS02.pubxml @@ -0,0 +1,27 @@ + + + + + MSDeploy + True + Release + Any CPU + + + False + d9901b50-e61c-400c-b62c-fa060cf72c29 + false + https://IIS02:8172/MsDeploy.axd + Default Web Site/MP/PROG + + False + WMSVC + True + jenkins + <_SavePWD>True + net5.0 + + \ No newline at end of file diff --git a/MP.Land/Properties/PublishProfiles/IISProfile.pubxml b/MP.Land/Properties/PublishProfiles/IISProfile.pubxml new file mode 100644 index 00000000..dac2b6bb --- /dev/null +++ b/MP.Land/Properties/PublishProfiles/IISProfile.pubxml @@ -0,0 +1,21 @@ + + + + + Package + Release + Any CPU + + True + False + d9901b50-e61c-400c-b62c-fa060cf72c29 + bin\publish\MP.Land.zip + true + Default Web Site/MP/PROG + net5.0 + false + + \ No newline at end of file diff --git a/MP.Land/Properties/PublishProfiles/W2019-IIS-DEVProfile.pubxml b/MP.Land/Properties/PublishProfiles/W2019-IIS-DEVProfile.pubxml new file mode 100644 index 00000000..e4965fb0 --- /dev/null +++ b/MP.Land/Properties/PublishProfiles/W2019-IIS-DEVProfile.pubxml @@ -0,0 +1,27 @@ + + + + + MSDeploy + True + Release + Any CPU + + + False + d9901b50-e61c-400c-b62c-fa060cf72c29 + false + https://w2019-iis-dev:8172/MsDeploy.axd + Default Web Site/MP/PROG + + False + WMSVC + True + jenkins + <_SavePWD>True + net5.0 + + \ No newline at end of file From b4af3bfd6152131c3bb9824d7b7e26228408e119 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 21 Sep 2021 17:53:52 +0200 Subject: [PATCH 2/8] COmpletato modifica x test nuovo installer --- .gitlab-ci.yml | 49 +++++++++++++------ .../Properties/PublishProfiles/IIS01.pubxml | 42 ++++++++-------- .../Properties/PublishProfiles/IIS02.pubxml | 2 +- .../PublishProfiles/IISProfile.pubxml | 2 +- .../W2019-IIS-DEVProfile.pubxml | 2 +- MP.Land/Properties/launchSettings.json | 4 +- 6 files changed, 60 insertions(+), 41 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7bb23fe2..98c3756d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -99,12 +99,10 @@ IIS01:deploy: only: - develop needs: ["test"] - # before_script: - # - *nuget-fix - # - dotnet restore script: - - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true MP.Stats/MP.Stats.csproj + - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true MP.Land/MP.Land.csproj - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true MP.Prog/MP.Prog.csproj + - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true MP.Stats/MP.Stats.csproj IIS02:deploy: @@ -114,16 +112,15 @@ IIS02:deploy: only: - master needs: ["build"] - # before_script: - # - *nuget-fix - # - dotnet restore script: - - dotnet publish -p:PublishProfile=IIS02.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true MP.Stats/MP.Stats.csproj - - dotnet publish -p:PublishProfile=W2019-IIS-DEVProfile.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true MP.Stats/MP.Stats.csproj + - dotnet publish -p:PublishProfile=IIS02.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true MP.Land/MP.Land.csproj + - dotnet publish -p:PublishProfile=W2019-IIS-DEVProfile.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true MP.Land/MP.Land.csproj - dotnet publish -p:PublishProfile=IIS02.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true MP.Prog/MP.Prog.csproj - dotnet publish -p:PublishProfile=W2019-IIS-DEVProfile.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true MP.Prog/MP.Prog.csproj + - dotnet publish -p:PublishProfile=IIS02.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true MP.Stats/MP.Stats.csproj + - dotnet publish -p:PublishProfile=W2019-IIS-DEVProfile.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true MP.Stats/MP.Stats.csproj -STA:installer: +LAND:installer: stage: installer tags: - win @@ -132,18 +129,18 @@ STA:installer: - master needs: ["build"] variables: - APP_NAME: MP.Stats - NEXUS_PATH: MP-STATS + APP_NAME: MP.Land + NEXUS_PATH: MP-LAND before_script: # - *nuget-fix # - dotnet restore script: - - dotnet publish -p:PublishProfile=IISProfile.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release MP.Stats/MP.Stats.csproj -o:publish + - dotnet publish -p:PublishProfile=IISProfile.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release MP.Land/MP.Land.csproj -o:publish # qui il deploy su nexus... - *hashBuild - *nexusUpload -PRG:installer: +PROG:installer: stage: installer tags: - win @@ -163,6 +160,27 @@ PRG:installer: - *hashBuild - *nexusUpload +STAT:installer: + stage: installer + tags: + - win + only: + - develop + - master + needs: ["build"] + variables: + APP_NAME: MP.Stats + NEXUS_PATH: MP-STATS + before_script: + # - *nuget-fix + # - dotnet restore + script: + - dotnet publish -p:PublishProfile=IISProfile.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release MP.Stats/MP.Stats.csproj -o:publish + # qui il deploy su nexus... + - *hashBuild + - *nexusUpload + + release: stage: release tags: @@ -178,7 +196,8 @@ release: paths: - publish/ script: - - dotnet publish -c Release -o ./publish MP.Stats/MP.Stats.csproj + - dotnet publish -c Release -o ./publish MP.Land/MP.Land.csproj - dotnet publish -c Release -o ./publish MP.Prog/MP.Prog.csproj + - dotnet publish -c Release -o ./publish MP.Stats/MP.Stats.csproj diff --git a/MP.Land/Properties/PublishProfiles/IIS01.pubxml b/MP.Land/Properties/PublishProfiles/IIS01.pubxml index 8770d4a4..b96ae492 100644 --- a/MP.Land/Properties/PublishProfiles/IIS01.pubxml +++ b/MP.Land/Properties/PublishProfiles/IIS01.pubxml @@ -4,25 +4,25 @@ This file is used by the publish/package process of your Web project. You can cu by editing this MSBuild file. In order to learn more about this please visit https://go.microsoft.com/fwlink/?LinkID=208121. --> - - MSDeploy - True - Release - Any CPU - - - False - d9901b50-e61c-400c-b62c-fa060cf72c29 - false - https://IIS01:8172/MsDeploy.axd - Default Web Site/MP/PROG - - False - WMSVC - True - jenkins - <_SavePWD>True - net5.0 - True - + + MSDeploy + True + Release + Any CPU + + + False + d9901b50-e61c-400c-b62c-fa060cf72c29 + false + https://IIS01:8172/MsDeploy.axd + Default Web Site/MP/LAND + + False + WMSVC + True + jenkins + <_SavePWD>True + net5.0 + True + \ No newline at end of file diff --git a/MP.Land/Properties/PublishProfiles/IIS02.pubxml b/MP.Land/Properties/PublishProfiles/IIS02.pubxml index 414f1262..fab9f1d8 100644 --- a/MP.Land/Properties/PublishProfiles/IIS02.pubxml +++ b/MP.Land/Properties/PublishProfiles/IIS02.pubxml @@ -15,7 +15,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt d9901b50-e61c-400c-b62c-fa060cf72c29 false https://IIS02:8172/MsDeploy.axd - Default Web Site/MP/PROG + Default Web Site/MP/LAND False WMSVC diff --git a/MP.Land/Properties/PublishProfiles/IISProfile.pubxml b/MP.Land/Properties/PublishProfiles/IISProfile.pubxml index dac2b6bb..aad930b6 100644 --- a/MP.Land/Properties/PublishProfiles/IISProfile.pubxml +++ b/MP.Land/Properties/PublishProfiles/IISProfile.pubxml @@ -14,7 +14,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt d9901b50-e61c-400c-b62c-fa060cf72c29 bin\publish\MP.Land.zip true - Default Web Site/MP/PROG + Default Web Site/MP/LAND net5.0 false diff --git a/MP.Land/Properties/PublishProfiles/W2019-IIS-DEVProfile.pubxml b/MP.Land/Properties/PublishProfiles/W2019-IIS-DEVProfile.pubxml index e4965fb0..18e61f7a 100644 --- a/MP.Land/Properties/PublishProfiles/W2019-IIS-DEVProfile.pubxml +++ b/MP.Land/Properties/PublishProfiles/W2019-IIS-DEVProfile.pubxml @@ -15,7 +15,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt d9901b50-e61c-400c-b62c-fa060cf72c29 false https://w2019-iis-dev:8172/MsDeploy.axd - Default Web Site/MP/PROG + Default Web Site/MP/LAND False WMSVC diff --git a/MP.Land/Properties/launchSettings.json b/MP.Land/Properties/launchSettings.json index 924a8e2b..aeaf5b5b 100644 --- a/MP.Land/Properties/launchSettings.json +++ b/MP.Land/Properties/launchSettings.json @@ -3,8 +3,8 @@ "windowsAuthentication": false, "anonymousAuthentication": true, "iisExpress": { - "applicationUrl": "http://localhost:7312", - "sslPort": 44309 + "applicationUrl": "http://localhost:7314", + "sslPort": 44311 } }, "profiles": { From 82f6d5a0c7c76a1e0c6c524b60d41b7f29170ce7 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 21 Sep 2021 17:54:43 +0200 Subject: [PATCH 3/8] test deploy feature CI-CD --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 98c3756d..93315d6f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -96,8 +96,8 @@ IIS01:deploy: stage: deploy tags: - win - only: - - develop + # only: + # - develop needs: ["test"] script: - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true MP.Land/MP.Land.csproj From 54b384cb92963f442a1b8f6f2718af43b1f21dae Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 21 Sep 2021 17:55:47 +0200 Subject: [PATCH 4/8] aggiunto test stage x feature --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 93315d6f..7ddcd3ff 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -85,8 +85,8 @@ test: stage: test tags: - win - only: - - develop + # only: + # - develop needs: ["build"] script: - dotnet test MP.Stats/MP.Stats.csproj From 535cf8ecf2419c8f797cb0cc3fb1b6aa9dd79983 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 21 Sep 2021 18:00:49 +0200 Subject: [PATCH 5/8] Test separazione in 3 task deploy --- .gitlab-ci.yml | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7ddcd3ff..aa090936 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -92,7 +92,19 @@ test: - dotnet test MP.Stats/MP.Stats.csproj - dotnet test MP.Prog/MP.Prog.csproj -IIS01:deploy: +# IIS01:deploy: +# stage: deploy +# tags: +# - win +# # only: +# # - develop +# needs: ["test"] +# script: +# - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true MP.Land/MP.Land.csproj +# - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true MP.Prog/MP.Prog.csproj +# - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true MP.Stats/MP.Stats.csproj + +LAND:IIS01:deploy: stage: deploy tags: - win @@ -101,10 +113,31 @@ IIS01:deploy: needs: ["test"] script: - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true MP.Land/MP.Land.csproj + +PROG:IIS01:deploy: + stage: deploy + tags: + - win + # only: + # - develop + needs: ["test"] + script: - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true MP.Prog/MP.Prog.csproj + + +STAT:IIS01:deploy: + stage: deploy + tags: + - win + # only: + # - develop + needs: ["test"] + script: - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true MP.Stats/MP.Stats.csproj + + IIS02:deploy: stage: deploy tags: From e5a611c8446faedcd88ecef006891a82bf37741a Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 21 Sep 2021 18:06:51 +0200 Subject: [PATCH 6/8] Separato anche build e test --- .gitlab-ci.yml | 70 +++++++++++++++++++++++++++++++++----------------- 1 file changed, 46 insertions(+), 24 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index aa090936..9f349ab4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -69,40 +69,65 @@ stages: - installer - release -build: +LAND:build: + stage: build + tags: + - win + before_script: + - *nuget-fix + - dotnet restore MP-LAND.sln + script: + - dotnet build MP.Land/MP.Land.csproj + +PROG:build: + stage: build + tags: + - win + before_script: + - *nuget-fix + - dotnet restore MP-PROG.sln + script: + - dotnet build MP.Prog/MP.Prog.csproj + +STAT:build: stage: build tags: - win before_script: - *nuget-fix - dotnet restore MP-STATS.sln - - dotnet restore MP-PROG.sln script: - dotnet build MP.Stats/MP.Stats.csproj - - dotnet build MP.Prog/MP.Prog.csproj -test: +LAND:test: stage: test tags: - win # only: # - develop - needs: ["build"] + needs: ["LAND:build"] + script: + - dotnet test MP.Land/MP.Land.csproj + +PROG:test: + stage: test + tags: + - win + # only: + # - develop + needs: ["PROG:build"] + script: + - dotnet test MP.Prog/MP.Prog.csproj + +STAT:test: + stage: test + tags: + - win + # only: + # - develop + needs: ["STAT:build"] script: - dotnet test MP.Stats/MP.Stats.csproj - - dotnet test MP.Prog/MP.Prog.csproj - -# IIS01:deploy: -# stage: deploy -# tags: -# - win -# # only: -# # - develop -# needs: ["test"] -# script: -# - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true MP.Land/MP.Land.csproj -# - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true MP.Prog/MP.Prog.csproj -# - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true MP.Stats/MP.Stats.csproj LAND:IIS01:deploy: stage: deploy @@ -110,7 +135,7 @@ LAND:IIS01:deploy: - win # only: # - develop - needs: ["test"] + needs: ["LAND:test"] script: - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true MP.Land/MP.Land.csproj @@ -120,7 +145,7 @@ PROG:IIS01:deploy: - win # only: # - develop - needs: ["test"] + needs: ["PROG:test"] script: - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true MP.Prog/MP.Prog.csproj @@ -131,13 +156,10 @@ STAT:IIS01:deploy: - win # only: # - develop - needs: ["test"] + needs: ["STAT:test"] script: - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true MP.Stats/MP.Stats.csproj - - - IIS02:deploy: stage: deploy tags: From 93e13da83bdf75558b41b17db1faa80f5513c66a Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 21 Sep 2021 18:09:57 +0200 Subject: [PATCH 7/8] splitattato ogni step --- .gitlab-ci.yml | 68 ++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 61 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9f349ab4..7904e90e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -160,18 +160,36 @@ STAT:IIS01:deploy: script: - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true MP.Stats/MP.Stats.csproj -IIS02:deploy: +LAND:IIS02:deploy: stage: deploy tags: - win only: - master - needs: ["build"] + needs: ["LAND:build"] script: - dotnet publish -p:PublishProfile=IIS02.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true MP.Land/MP.Land.csproj - dotnet publish -p:PublishProfile=W2019-IIS-DEVProfile.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true MP.Land/MP.Land.csproj + +PROG:IIS02:deploy: + stage: deploy + tags: + - win + only: + - master + needs: ["PROG:build"] + script: - dotnet publish -p:PublishProfile=IIS02.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true MP.Prog/MP.Prog.csproj - dotnet publish -p:PublishProfile=W2019-IIS-DEVProfile.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true MP.Prog/MP.Prog.csproj + +STAT:IIS02:deploy: + stage: deploy + tags: + - win + only: + - master + needs: ["STAT:build"] + script: - dotnet publish -p:PublishProfile=IIS02.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true MP.Stats/MP.Stats.csproj - dotnet publish -p:PublishProfile=W2019-IIS-DEVProfile.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true MP.Stats/MP.Stats.csproj @@ -182,7 +200,7 @@ LAND:installer: only: - develop - master - needs: ["build"] + needs: ["LAND:build"] variables: APP_NAME: MP.Land NEXUS_PATH: MP-LAND @@ -202,7 +220,7 @@ PROG:installer: only: - develop - master - needs: ["build"] + needs: ["PROG:build"] variables: APP_NAME: MP.Prog NEXUS_PATH: MP-PROG @@ -222,7 +240,7 @@ STAT:installer: only: - develop - master - needs: ["build"] + needs: ["STAT:build"] variables: APP_NAME: MP.Stats NEXUS_PATH: MP-STATS @@ -236,7 +254,7 @@ STAT:installer: - *nexusUpload -release: +LAND:release: stage: release tags: - win @@ -246,7 +264,43 @@ release: - tags except: - branches - needs: ["build"] + needs: ["LAND:build"] + artifacts: + paths: + - publish/ + script: + - dotnet publish -c Release -o ./publish MP.Land/MP.Land.csproj + + +PROG:release: + stage: release + tags: + - win + only: + #- feature/Deploy_CI_CD + # - master + - tags + except: + - branches + needs: ["PROG:build"] + artifacts: + paths: + - publish/ + script: + - dotnet publish -c Release -o ./publish MP.Prog/MP.Prog.csproj + + +STAT:release: + stage: release + tags: + - win + only: + #- feature/Deploy_CI_CD + # - master + - tags + except: + - branches + needs: ["STAT:build"] artifacts: paths: - publish/ From c348652291c08442565ed946e82d61cbc54d745c Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 21 Sep 2021 18:13:26 +0200 Subject: [PATCH 8/8] Sistemato coda compilazione x develop --- .gitlab-ci.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7904e90e..15e81b2e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -103,8 +103,8 @@ LAND:test: stage: test tags: - win - # only: - # - develop + only: + - develop needs: ["LAND:build"] script: - dotnet test MP.Land/MP.Land.csproj @@ -113,8 +113,8 @@ PROG:test: stage: test tags: - win - # only: - # - develop + only: + - develop needs: ["PROG:build"] script: - dotnet test MP.Prog/MP.Prog.csproj @@ -123,8 +123,8 @@ STAT:test: stage: test tags: - win - # only: - # - develop + only: + - develop needs: ["STAT:build"] script: - dotnet test MP.Stats/MP.Stats.csproj @@ -133,8 +133,8 @@ LAND:IIS01:deploy: stage: deploy tags: - win - # only: - # - develop + only: + - develop needs: ["LAND:test"] script: - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true MP.Land/MP.Land.csproj @@ -143,8 +143,8 @@ PROG:IIS01:deploy: stage: deploy tags: - win - # only: - # - develop + only: + - develop needs: ["PROG:test"] script: - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true MP.Prog/MP.Prog.csproj @@ -154,8 +154,8 @@ STAT:IIS01:deploy: stage: deploy tags: - win - # only: - # - develop + only: + - develop needs: ["STAT:test"] script: - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true MP.Stats/MP.Stats.csproj