Skip to content

Commit 9329571

Browse files
committed
Merge branch 'develop' of https://bitbucket.microchip.com/scm/ebe/pic18f47q10-curiosity-hpc-demo-code into feature/mccPorting
* 'develop' of https://bitbucket.microchip.com/scm/ebe/pic18f47q10-curiosity-hpc-demo-code: MPAE-11924 Metadata Update MCU8QA-467 added new CICD files # Conflicts: # .main-meta/main.json
2 parents f9312b4 + fb88389 commit 9329571

File tree

4 files changed

+110
-210
lines changed

4 files changed

+110
-210
lines changed

.citd/Jenkinsfilek8s

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
// Jenkinsfile v2.0.0
2+
pipeline {
3+
agent {
4+
kubernetes {
5+
6+
defaultContainer 'xc8-mplabx'
7+
yamlFile '.citd/cloudprovider.yml'
8+
}
9+
}
10+
parameters {
11+
string( name: 'NOTIFICATION_EMAIL',
12+
defaultValue: 'PICAVR_Examples_GateKeepers@microchip.com',
13+
description: "Email to send build failure and fixed notifications.")
14+
}
15+
16+
environment {
17+
GITHUB_OWNER = 'microchip-pic-avr-examples'
18+
GITHUB_URL ='https://github.com/microchip-pic-avr-examples/pic18f47q10-curiosity-hpc-demo-code'
19+
BITBUCKET_URL = 'https://bitbucket.microchip.com/scm/ebe/pic18f47q10-curiosity-hpc-demo-code.git'
20+
SEMVER_REGEX = '^(0|[1-9]\\d*)+\\.(0|[1-9]\\d*)+\\.(0|[1-9]\\d*)+$'
21+
ARTIFACTORY_SERVER = 'https://artifacts.microchip.com:7999/artifactory'
22+
}
23+
options {
24+
timestamps()
25+
timeout(time: 30, unit: 'MINUTES')
26+
}
27+
28+
stages {
29+
stage('setup') {
30+
steps {
31+
script {
32+
execute("git clone https://bitbucket.microchip.com/scm/citd/mpae-buildpipeline-groovy-scripts.git")
33+
def buildPipeline = load ('mpae-buildpipeline-groovy-scripts/xc8mplabx-buildpipeline.groovy')
34+
buildPipeline.runStages()
35+
}
36+
}
37+
}
38+
}
39+
40+
post {
41+
failure {
42+
script {
43+
sendPipelineFailureEmail()
44+
}
45+
}
46+
}
47+
}
48+
def execute(String cmd) {
49+
if(isUnix()) {
50+
sh cmd
51+
} else {
52+
bat cmd
53+
}
54+
}
55+
def sendPipelineFailureEmail() {
56+
mail to: "${env.EMAILLIST},${params.NOTIFICATION_EMAIL}",
57+
subject: "Failed Pipeline: ${currentBuild.fullDisplayName}",
58+
body: "Pipeline failure. ${env.BUILD_URL}"
59+
}

cloudprovider.yml renamed to .citd/cloudprovider.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ spec:
1111
tty: true
1212
resources:
1313
requests:
14-
cpu: 1
15-
memory: 4Gi
14+
cpu: 0.25
15+
memory: 500Mi
1616
limits:
17-
cpu: 2
18-
memory: 8Gi
17+
cpu: 0.5
18+
memory: 750Mi

.main-meta/main.json

Lines changed: 47 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"projectName": "pic18f47q10-curiosity-hpc-demo-code",
1010
"shortDescription": "Demo code for HPC board for PIC18-Q10 devices",
1111
"ide": {
12-
"name": "MPLABX",
12+
"name": "MPLAB X",
1313
"semverRange": ">=5.45.0"
1414
},
1515
"compiler": [
@@ -39,30 +39,41 @@
3939
"author": "Microchip",
4040
"subcategories": [
4141
"MCC",
42-
[
43-
"Peripherals", "ADCC"
44-
],
45-
[
46-
"Peripherals", "UART"
47-
],
48-
[
49-
"Peripherals", "Timer"
50-
],
51-
[
52-
"Peripherals", "Interrupts"
53-
],
54-
[
55-
"Peripherals", "Watchdog"
56-
],
57-
[
58-
"Peripherals", "Sleep"
59-
],
60-
[
61-
"Peripherals", "PWM"
62-
]
42+
[
43+
"Peripherals",
44+
"ADCC"
45+
],
46+
[
47+
"Peripherals",
48+
"UART"
49+
],
50+
[
51+
"Peripherals",
52+
"Timer"
53+
],
54+
[
55+
"Peripherals",
56+
"Interrupts"
57+
],
58+
[
59+
"Peripherals",
60+
"Watchdog"
61+
],
62+
[
63+
"Peripherals",
64+
"Sleep"
65+
],
66+
[
67+
"Peripherals",
68+
"PWM"
69+
]
6370
],
6471
"peripherals": [
65-
"ADCC","UART","WWDT","TMR1","PWM"
72+
"ADCC",
73+
"UART",
74+
"WWDT",
75+
"TMR1",
76+
"PWM"
6677
],
6778
"keywords": [
6879
"Demo Code",
@@ -72,16 +83,16 @@
7283
"Curiosity Board",
7384
"Melody"
7485
],
75-
"additionalData": {
76-
"longDescription": {
77-
"metaDataVersion": "1.0.0",
78-
"category": "com.microchip.portal.fileRef",
79-
"content": {
80-
"metaDataVersion": "1.0.0",
81-
"fileName": "./README.md",
82-
"mimeType": "text/markdown"
83-
}
84-
}
85-
}
86-
}
87-
}
86+
"additionalData": {
87+
"longDescription": {
88+
"metaDataVersion": "1.0.0",
89+
"category": "com.microchip.portal.fileRef",
90+
"content": {
91+
"metaDataVersion": "1.0.0",
92+
"fileName": "./README.md",
93+
"mimeType": "text/markdown"
94+
}
95+
}
96+
}
97+
}
98+
}

Jenkinsfilek8s

Lines changed: 0 additions & 170 deletions
This file was deleted.

0 commit comments

Comments
 (0)