Egalware/MoonPro.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test nuova modalità controllo IIS

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-02-27 12:33:31 +01:00
parent 9ca2caf028
commit 46160c9f34
5 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+16 -16
View File
@@ -2,9 +2,9 @@ pipeline {
// Declarative Pipeline MODE con Scripted Pipeline Syntax entro le chiamate script { }
agent none
environment {
EMAIL_RECIPIENTS = 'samuele@steamware.net'
enableIIS01 = true
enableIIS02 = false
EMAIL_RECIPIENTS = 'samuele@steamware.net'
enableIIS01 = 'Y'
enableIIS02 = 'N'
}
stages {
stage('Checkout') {
@@ -17,7 +17,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=642']) {
withEnv(['NEXT_BUILD_NUMBER=643']) {
// env.versionNumber = VersionNumber(versionNumberString : '4.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '4.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO'
@@ -95,72 +95,72 @@ pipeline {
if (env.BRANCH_NAME == "master") {
parallel (
LANDING: {
if(env.enableIIS01 == true)
if(env.enableIIS01 == "Y")
{
sleep 0
bat "\"${tool 'MSBuild-14.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:VisualStudioVersion=14.0 /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ MP/MP.csproj"
}
if(env.enableIIS02 == true)
if(env.enableIIS02 == "Y")
{
sleep 1
bat "\"${tool 'MSBuild-14.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:VisualStudioVersion=14.0 /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ MP/MP.csproj"
}
},
ADMIN: {
if(env.enableIIS01 == true)
if(env.enableIIS01 == "Y")
{
sleep 2
bat "\"${tool 'MSBuild-14.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:VisualStudioVersion=14.0 /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ MP-Admin/MP-Admin.csproj"
}
if(env.enableIIS02 == true)
if(env.enableIIS02 == "Y")
{
sleep 3
bat "\"${tool 'MSBuild-14.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:VisualStudioVersion=14.0 /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ MP-Admin/MP-Admin.csproj"
}
},
IO: {
if(env.enableIIS01 == true)
if(env.enableIIS01 == "Y")
{
sleep 4
bat "\"${tool 'MSBuild-14.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:VisualStudioVersion=14.0 /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ MP-IO/MP-IO.csproj"
}
if(env.enableIIS02 == true)
if(env.enableIIS02 == "Y")
{
sleep 5
bat "\"${tool 'MSBuild-14.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:VisualStudioVersion=14.0 /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ MP-IO/MP-IO.csproj"
}
},
MON: {
if(env.enableIIS01 == true)
if(env.enableIIS01 == "Y")
{
sleep 6
bat "\"${tool 'MSBuild-14.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:VisualStudioVersion=14.0 /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ MP-MON/MP-MON.csproj"
}
if(env.enableIIS02 == true)
if(env.enableIIS02 == "Y")
{
sleep 7
bat "\"${tool 'MSBuild-14.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:VisualStudioVersion=14.0 /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ MP-MON/MP-MON.csproj"
}
},
SITE: {
if(env.enableIIS01 == true)
if(env.enableIIS01 == "Y")
{
sleep 1
bat "\"${tool 'MSBuild-14.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:VisualStudioVersion=14.0 /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ MP-Site/MP-Site.csproj"
}
if(env.enableIIS02 == true)
if(env.enableIIS02 == "Y")
{
sleep 1
bat "\"${tool 'MSBuild-14.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:VisualStudioVersion=14.0 /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ MP-Site/MP-Site.csproj"
}
},
TABLET: {
if(env.enableIIS01 == true)
if(env.enableIIS01 == "Y")
{
sleep 8
bat "\"${tool 'MSBuild-14.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:VisualStudioVersion=14.0 /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ MP-Tablet/MP-Tablet.csproj"
}
if(env.enableIIS02 == true)
if(env.enableIIS02 == "Y")
{
// sleep 9
// bat "\"${tool 'MSBuild-14.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:VisualStudioVersion=14.0 /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ MP-Tablet/MP-Tablet.csproj"
MP-Tablet/Content/baseStyle.css
+1
View File
@@ -22,6 +22,7 @@ body .ui-overlay-c {
color: #FFF;
background-image: linear-gradient(#111, #000);
box-shadow: 0 15px 30px 0 rgba(150, 150, 150, 0.2), 0 10px 20px 0 rgba(200, 200, 200, 0.39);
min-height: 15em;
}
.labelTopDx {
padding: 0.1em 0.4em;
MP-Tablet/Content/baseStyle.less
+1 -1
View File
@@ -24,7 +24,7 @@ body {
color: #FFF;
background-image: linear-gradient(#111, #000);
box-shadow: 0 15px 30px 0 rgba(150, 150, 150, 0.2), 0 10px 20px 0 rgba(200, 200, 200, 0.39);
min-height: 15em;
}
.labelTopDx {
MP-Tablet/Content/baseStyle.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
MP-Tablet/WebUserControls/mod_mappaStato.ascx
+2 -2
View File
@@ -15,8 +15,8 @@
</p>
</div>
<div class="card bg-black px-1 py-3">
<h5 class="text-left">
<asp:Label runat="server" ID="lblTitle" Text='<%# Eval("Nome") %>' /></h5>
<h3 class="text-left">
<asp:Label runat="server" ID="lblTitle" Text='<%# Eval("Nome") %>' /></h3>
<span class='<%# Eval("Semaforo") %>' style="width: 100%; display: block; padding-right: 0px;"><span style="float: left;">
<b>
<asp:Label runat="server" ID="lblStato" Text='<%# Eval("DescrizioneStato") %>' /></b></span> <span style="float: right; padding-right: 8px;">