Skip to content

Commit 941adaf

Browse files
authored
build: updated deployment system with new shared library plugin pipeline (#36)
* build: updated deployment system with new shared library plugin Signed-off-by: SimoneFiorani <[email protected]> * fix: tests Signed-off-by: SimoneFiorani <[email protected]> --------- Signed-off-by: SimoneFiorani <[email protected]>
1 parent ab91bab commit 941adaf

17 files changed

Lines changed: 16 additions & 75 deletions

File tree

.jenkins/ci.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@Library('add-ons-shared-libs@develop') _
1+
@Library('add-ons-shared-libs@plugin/apps') _
22

33
node {
44
continuousIntegrationPipeline(

kura-addon-prototypes/tests/pom.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,6 @@
166166
<argLine>
167167
${tycho.testArgLine}
168168
-Dosgi.console=5002
169-
-Declipse.security=osgi
170-
-Dorg.osgi.framework.security=osgi
171169
-Dosgi.signedcontent.support=all
172170
-XX:HeapDumpPath=/dev/null
173171
-Dorg.eclipse.kura.mode=emulator
@@ -399,4 +397,4 @@
399397
<module>example-factory-component.bundle.test</module>
400398
</modules>
401399

402-
</project>
400+
</project>

kura-apps-distrib/kura-addon-prototypes/pom.xml

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -60,30 +60,12 @@
6060

6161
<properties>
6262

63-
<!--
64-
With n being the start level, config.ini will be populated depending on which plugins directory the
65-
bundle is put:
66-
n => bundle.name:@n;
67-
ns => bundle.name:@n:start;
68-
-->
69-
<addon.installation.dir>/opt/eclipse/kura/plugins/6s</addon.installation.dir>
70-
7163
<!-- name of the JAR produced in bundles/target -->
7264
<jar.name>kura-addon-prototypes.bundle-1.0.0-SNAPSHOT.jar</jar.name>
7365

74-
<!--
75-
Available DEB architectures:
76-
all, amd64, arm64
77-
-->
78-
<deb.architecture>all</deb.architecture>
79-
8066
<!-- final name of the generated debian package -->
8167
<package.name>kura-addon-prototypes</package.name>
8268

83-
<!-- properties used for artifact upload on artifactory repository -->
84-
<kura.repo.distribution>kura-6</kura.repo.distribution>
85-
<kura.repo.module>base</kura.repo.module>
86-
8769
<!-- edit following fields and file deb/control/control -->
8870
<summary>Eclipse Kura Addon Prototypes</summary>
8971
<long.description>Set of prototype addons for the Eclipse Kura Framework.</long.description>
@@ -272,4 +254,4 @@
272254
</snapshotRepository>
273255
</distributionManagement>
274256

275-
</project>
257+
</project>

kura-apps-distrib/kura-examples/ble/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,8 @@
7272
</build>
7373

7474
<properties>
75-
<addon.installation.dir>/opt/eclipse/kura/plugins/6s</addon.installation.dir>
7675
<jar.name>kura-ble-examples.bundle--${project.version}.jar</jar.name>
77-
<deb.architecture>all</deb.architecture>
7876
<package.name>kura-ble-examples</package.name>
79-
<kura.repo.distribution>kura-6</kura.repo.distribution>
80-
<kura.repo.module>base</kura.repo.module>
8177
<summary>Eclipse Kura Addon Examples for BLE</summary>
8278
<long.description>Examples of BLE addons for the Eclipse Kura Framework.</long.description>
8379
</properties>

kura-apps-distrib/kura-examples/camel/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,8 @@
4444
</dependencies>
4545

4646
<properties>
47-
<addon.installation.dir>/opt/eclipse/kura/plugins/6s</addon.installation.dir>
4847
<jar.name>kura-camel-example.bundle-${project.version}.jar</jar.name>
49-
<deb.architecture>all</deb.architecture>
5048
<package.name>kura-camel-example</package.name>
51-
<kura.repo.distribution>kura-6</kura.repo.distribution>
52-
<kura.repo.module>base</kura.repo.module>
5349
<summary>Eclipse Kura Addon for Camel</summary>
5450
<long.description>Examples of Camel addons for the Eclipse Kura Framework.</long.description>
5551
</properties>

kura-apps-distrib/kura-examples/can/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,8 @@
3737
</dependencies>
3838

3939
<properties>
40-
<addon.installation.dir>/opt/eclipse/kura/plugins/6s</addon.installation.dir>
4140
<jar.name>kura-can-example.bundle-${project.version}.jar</jar.name>
42-
<deb.architecture>all</deb.architecture>
4341
<package.name>kura-can-example</package.name>
44-
<kura.repo.distribution>kura-6</kura.repo.distribution>
45-
<kura.repo.module>base</kura.repo.module>
4642
<summary>Eclipse Kura Addon for CAN</summary>
4743
<long.description>Examples of CAN addons for the Eclipse Kura Framework.</long.description>
4844
</properties>

kura-apps-distrib/kura-examples/container-validation/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,8 @@
3636
</dependencies>
3737

3838
<properties>
39-
<addon.installation.dir>/opt/eclipse/kura/plugins/6s</addon.installation.dir>
4039
<jar.name>kura-container-validation-example.bundle-${project.version}.jar</jar.name>
41-
<deb.architecture>all</deb.architecture>
4240
<package.name>kura-container-validation-example</package.name>
43-
<kura.repo.distribution>kura-6</kura.repo.distribution>
44-
<kura.repo.module>base</kura.repo.module>
4541
<summary>Eclipse Kura Addon for Container Validation</summary>
4642
<long.description>Examples of Container Validation addons for the Eclipse Kura Framework.</long.description>
4743
</properties>

kura-apps-distrib/kura-examples/gpio/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,8 @@
4040
</dependencies>
4141

4242
<properties>
43-
<addon.installation.dir>/opt/eclipse/kura/plugins/6s</addon.installation.dir>
4443
<jar.name>kura-gpio-example.bundle-${project.version}.jar</jar.name>
45-
<deb.architecture>all</deb.architecture>
4644
<package.name>kura-gpio-example</package.name>
47-
<kura.repo.distribution>kura-6</kura.repo.distribution>
48-
<kura.repo.module>base</kura.repo.module>
4945
<summary>Eclipse Kura Addon for GPIO</summary>
5046
<long.description>Examples of GPIO addons for the Eclipse Kura Framework.</long.description>
5147
</properties>

kura-apps-distrib/kura-examples/heater/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,8 @@
3636
</dependencies>
3737

3838
<properties>
39-
<addon.installation.dir>/opt/eclipse/kura/plugins/6s</addon.installation.dir>
4039
<jar.name>kura-heater-example.bundle-${project.version}.jar</jar.name>
41-
<deb.architecture>all</deb.architecture>
4240
<package.name>kura-heater-example</package.name>
43-
<kura.repo.distribution>kura-6</kura.repo.distribution>
44-
<kura.repo.module>base</kura.repo.module>
4541
<summary>Eclipse Kura Addon for Heater</summary>
4642
<long.description>Examples of Heater addons for the Eclipse Kura Framework.</long.description>
4743
</properties>

kura-apps-distrib/kura-examples/identity/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,8 @@
3636
</dependencies>
3737

3838
<properties>
39-
<addon.installation.dir>/opt/eclipse/kura/plugins/6s</addon.installation.dir>
4039
<jar.name>kura-identity-example.bundle-${project.version}.jar</jar.name>
41-
<deb.architecture>all</deb.architecture>
4240
<package.name>kura-identity-example</package.name>
43-
<kura.repo.distribution>kura-6</kura.repo.distribution>
44-
<kura.repo.module>base</kura.repo.module>
4541
<summary>Eclipse Kura Addon for Identity</summary>
4642
<long.description>Examples of Identity addons for the Eclipse Kura Framework.</long.description>
4743
</properties>

0 commit comments

Comments
 (0)