Skip to content

Commit

Permalink
Merge pull request #7 from Sitecore/master
Browse files Browse the repository at this point in the history
fr
  • Loading branch information
vtml authored Oct 29, 2020
2 parents 6246563 + d784eb8 commit 071aebf
Show file tree
Hide file tree
Showing 9 changed files with 3,639 additions and 878 deletions.
18 changes: 13 additions & 5 deletions build-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,22 @@ schedules:
always: true

stages:

- stage: Build_Windows_Images
jobs:
- job: Build_Windows_Images
strategy:
matrix:
windows2004:
poolName: 'docker-2004-agents'
osVersion: '2004'
ltsc2019:
poolName: 'docker-ltsc2019-agents'
osVersion: 'ltsc2019'

timeoutInMinutes: 720
displayName: "Build Windows Images"
pool:
name: $(azure.agentPoolName)
name: $(poolName)
steps:
- powershell: |
Test-NetConnection -ComputerName "$(assets.shared.folder.server)" -Port 445
Expand All @@ -91,7 +99,7 @@ stages:
RegistryPassword = "$(container.registry.password)"
SitecoreVersion = "$(build.sitecoreVersion)"
Topology = $topology
OSVersion = "$(build.WindowsOSVersion)"
OSVersion = "$(osVersion)"
IncludeSpe = [System.Convert]::ToBoolean($(build.includeSpe))
IncludeSxa = [System.Convert]::ToBoolean($(build.includeSxa))
IncludeJss = [System.Convert]::ToBoolean($(build.includeJss))
Expand Down Expand Up @@ -192,7 +200,7 @@ stages:
useSameSourceVersion: false
useCustomSourceVersion: false
useSameBranch: false
branchToUse: 'master'
branchToUse: 'main'
waitForQueuedBuildsToFinish: false
storeInEnvironmentVariable: false
buildParameters: 'namespace: community, groupName: xp, tag:""'
Expand All @@ -214,7 +222,7 @@ stages:
useSameSourceVersion: false
useCustomSourceVersion: false
useSameBranch: false
branchToUse: 'master'
branchToUse: 'main'
waitForQueuedBuildsToFinish: false
storeInEnvironmentVariable: false
buildParameters: 'namespace: community, groupName: xm, tag:""'
Expand Down
2 changes: 1 addition & 1 deletion build/Download-Module-Prerequisites.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ $packages = @{"Sitecore Azure Toolkit 2.5.0-r02519.1061.zip"
"Sitecore Connect for Salesforce Marketing Cloud - Behavioral Data Exchange 5.0.0 rev. 00294.zip" = "https://dev.sitecore.net/~/media/B63D767DD031462D9BECC39C0F19CCA6.ashx"
"Sitecore Connect for Salesforce Marketing Cloud - Content Exchange 5.0.0 rev. 00162.zip" = "https://dev.sitecore.net/~/media/F6D8B71478FD4A26A9807ABB0E83DAA5.ashx"
"Sitecore Connect for Salesforce CRM 5.0.0 rev. 01431.zip" = "https://dev.sitecore.net/~/media/674BCDC0ED504EF5BD741757ADE657A2.ashx"
"Sitecore Connect for Microsoft Dynamics 365 for Sales 5.0.0 rev. 01438.zip" = "https://dev.sitecore.net/~/media/FCED12D64FF74CA88FB2C8A0C92D7CF2.ashx"
"Sitecore Connect for Microsoft Dynamics 365 for Sales 5.0.0 rev. 01439.zip" = "https://dev.sitecore.net/~/media/FCED12D64FF74CA88FB2C8A0C92D7CF2.ashx"
"Sitecore Connect for CMP XP for 10.0 v. 3.0.0 rev. 00134.zip" = "https://dev.sitecore.net/~/media/8443DB808C834186B40D66D58499355B.ashx"
"Sitecore Connect for CMP XM for 10.0 v. 3.0.0 rev. 00134.zip" = "https://dev.sitecore.net/~/media/36489D794FA5489CBBB78653F03F81A3.ashx"
"Sitecore Connect for Sitecore DAM-2.0.0.zip" = "https://dev.sitecore.net/~/media/7F118478CF78478087A1DB3EBDF9FBFE.ashx"
Expand Down
2 changes: 1 addition & 1 deletion build/linux/10.0.0/modules/def-d365-assets/build.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
}
],
"sources": [
"Sitecore Connect for Microsoft Dynamics 365 for Sales 5.0.0 rev. 01438.scwdp.zip"
"Sitecore Connect for Microsoft Dynamics 365 for Sales 5.0.0 rev. 01439.scwdp.zip"
]
}
15 changes: 15 additions & 0 deletions build/linux/10.0.0/modules/sfcrm-assets/build.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"tags": [
{
"tag": "community/modules/custom-sfcrm-assets:10.0.0-linux",
"build-options": [
"--build-arg BASE_IMAGE=mcr.microsoft.com/powershell:lts-alpine-3.10",
"--build-arg ROLES=cm",
"--file linux/10.0.0/modules/Dockerfile"
]
}
],
"sources": [
"Sitecore Connect for Salesforce CRM 5.0.0 rev. 01431.scwdp.zip"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
[CmdletBinding()]
param (
[Parameter(Mandatory=$true)]
[string]$Roles,
[Parameter(Mandatory=$true)]
[string]$SourceFolder,
[Parameter(Mandatory=$true)]
[string]$DestinationFolder
)

New-Item -Path $DestinationFolder -ItemType Directory -Force

$Roles -Split ',' | ForEach-Object {
$role = $_

$sourceRoleFolder = Join-Path -Path $SourceFolder -ChildPath $role
$extractFolder = Join-Path -Path $sourceRoleFolder -ChildPath "temp"
$extractWebsiteFolder = Join-Path -Path $extractFolder -ChildPath "Content\Website"
$destinationRoleContentFolder = Join-Path -Path $DestinationFolder -ChildPath "$role\content"

$wdp = Get-ChildItem -Path $sourceRoleFolder -Filter *.scwdp.zip
Expand-Archive -Path $wdp.FullName -DestinationPath $extractFolder

New-Item -Path $destinationRoleContentFolder -ItemType Directory -Force
Move-Item -Path "$extractWebsiteFolder\*" -Destination $destinationRoleContentFolder -Force -ErrorAction SilentlyContinue

$dbs = Get-ChildItem -Path $extractFolder -Filter *.dacpac

if (($dbs | Measure-Object).Count -gt 0) {
$destinationDBFolder = Join-Path -Path $DestinationFolder -ChildPath "db"

if (!(Test-Path -Path $destinationDBFolder -PathType Container)) {
New-Item -Path $destinationDBFolder -ItemType Directory -Force
}

$dbs | ForEach-Object {
$db = $_

$destinationDBPath = Join-Path -Path $destinationDBFolder -ChildPath "Sitecore.$($db.Name)"
Move-Item -Path $_.FullName -Destination $destinationDBPath
}
}

$sourceSolrSchemaPath = Join-Path -Path $destinationRoleContentFolder -ChildPath "App_Data\SolrSchema\managed-schema"
if (Test-Path -Path $sourceSolrSchemaPath -PathType Leaf) {
$solrSchema = Get-Item -Path $sourceSolrSchemaPath
$destinationSolrSchemaFolder = Join-Path -Path $DestinationFolder -ChildPath "solr"

if (!(Test-Path -Path $destinationSolrSchemaFolder -PathType Container)) {
New-Item -Path $destinationSolrSchemaFolder -ItemType Directory -Force
}

Move-Item -Path $solrSchema.FullName -Destination $destinationSolrSchemaFolder
}
}
2 changes: 1 addition & 1 deletion build/sitecore-packages.json
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@
"url":"https://dev.sitecore.net/~/media/279A2A5330794778A59D91258D51DA69.ashx",
"hash":"3E80D5839CA33332B9E3FD2843F0FC18EDC04C803E9005AD5E3F10B50B3C4483"
},
"Sitecore Connect for Microsoft Dynamics 365 for Sales 5.0.0 rev. 01438.scwdp.zip": {
"Sitecore Connect for Microsoft Dynamics 365 for Sales 5.0.0 rev. 01439.scwdp.zip": {
"url": "",
"hash": ""
},
Expand Down
2 changes: 1 addition & 1 deletion build/windows/10.0.0/modules/def-d365-assets/build.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
}
],
"sources": [
"Sitecore Connect for Microsoft Dynamics 365 for Sales 5.0.0 rev. 01438.scwdp.zip"
"Sitecore Connect for Microsoft Dynamics 365 for Sales 5.0.0 rev. 01439.scwdp.zip"
]
}
Loading

0 comments on commit 071aebf

Please sign in to comment.