Fix starting on MacOS
Change-Id: Ia9ea70e2aefa50a23f877b0d0e1c5aab280a3222
diff --git a/Jenkinsfile b/Jenkinsfile
index e45113b..1dfc41e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -22,7 +22,7 @@
stage('Launch agent') {
agent {
kubernetes {
- label 'rcptt-build-agent'
+ label 'rcptt-build-agent-3.5.4'
yaml "${env.YAML_BUILD_AGENT}"
}
}
diff --git a/releng/Jenkinsfile b/releng/Jenkinsfile
index 8c0e1d7..a018386 100644
--- a/releng/Jenkinsfile
+++ b/releng/Jenkinsfile
@@ -27,7 +27,7 @@
stage('Launch agent') {
agent {
kubernetes {
- label 'rcptt-build-and-deploy-agent'
+ label 'rcptt-build-and-deploy-agent-3.5.4'
yaml "${env.YAML_BUILD_AND_DEPLOY_AGENT}"
}
}
diff --git a/releng/Jenkinsfile.groovy b/releng/Jenkinsfile.groovy
index 29fbdad..2eb193e 100644
--- a/releng/Jenkinsfile.groovy
+++ b/releng/Jenkinsfile.groovy
@@ -12,7 +12,7 @@
BUILD_CONTAINER_NAME="ubuntu"
BUILD_CONTAINER="""
- name: $BUILD_CONTAINER_NAME
- image: dudaevar/ubuntu-rcptt
+ image: dudaevar/ubuntu-rcptt:3.5.4
tty: true
resources:
limits:
@@ -29,10 +29,6 @@
mountPath: /home/jenkins/.m2/settings.xml
subPath: settings.xml
readOnly: true
- - name: toolchains-xml
- mountPath: /home/jenkins/.m2/toolchains.xml
- subPath: toolchains.xml
- readOnly: true
- name: settings-security-xml
mountPath: /home/jenkins/.m2/settings-security.xml
subPath: settings-security.xml
@@ -46,12 +42,6 @@
items:
- key: settings.xml
path: settings.xml
- - name: toolchains-xml
- configMap:
- name: m2-dir
- items:
- - key: toolchains.xml
- path: toolchains.xml
- name: settings-security-xml
secret:
secretName: m2-secret-dir
@@ -135,7 +125,8 @@
def build(Boolean sign) {
container(BUILD_CONTAINER_NAME) {
- sh "./build.sh -Dmaven.repo.local=$WORKSPACE/m2 -B -e ${sign ? "-P sign" : ""}"
+ sh "mvn --version"
+ sh "./fast-build.sh -Dmaven.repo.local=$WORKSPACE/m2 -U -B -e ${sign ? "-P sign" : ""}"
sh "./build_runner.sh -Dmaven.repo.local=$WORKSPACE/m2 -B -e"
sh "mvn -f maven-plugin/pom.xml clean verify -Dmaven.repo.local=$WORKSPACE/m2 -B -e"
sh "./$DOC_DIR/generate-doc.sh -Dmaven.repo.local=$WORKSPACE/m2 -B -e"
@@ -231,14 +222,14 @@
def qualifiedDecoration = "-N$qualifier"
container(SSH_DEPLOY_CONTAINER_NAME) {
- copy_files(type, version, qualifier, qualifiedDecoration, true)
def storageFolder = get_version_storage_folder(type, version)
sshagent(["projects-storage.eclipse.org-bot-ssh"]) {
- def oldBuilds = sh_with_return("$SSH_CLIENT ls -r $storageFolder | grep -v latest | tail -n +${buildsToKeep + 1}")
+ def oldBuilds = sh_with_return("$SSH_CLIENT ls -r $storageFolder | grep -v latest | tail -n +${buildsToKeep}")
for(old in oldBuilds.split("\n")) {
sh "$SSH_CLIENT rm -r $storageFolder/$old"
}
}
+ copy_files(type, version, qualifier, qualifiedDecoration, true)
def storageFolderLatest = get_storage_folder(type, version, "latest")
sshagent(["projects-storage.eclipse.org-bot-ssh"]) {
diff --git a/releng/buildenv/ubuntu/Dockerfile b/releng/buildenv/ubuntu/Dockerfile
index eee453f..ecabd3b 100644
--- a/releng/buildenv/ubuntu/Dockerfile
+++ b/releng/buildenv/ubuntu/Dockerfile
@@ -11,7 +11,7 @@
openjfx
## Install a maven
-ARG MAVEN_VERSION=3.6.1
+ARG MAVEN_VERSION=3.5.4
ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
ARG MAVEN_HOME=/usr/share/maven
@@ -19,7 +19,8 @@
&& mkdir ${MAVEN_HOME} \
&& tar -xzf /tmp/apache-maven.tar.gz -C ${MAVEN_HOME} --strip-components=1 \
&& rm -f /tmp/apache-maven.tar.gz \
- && ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn
+ && ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn \
+ && apt-get clean
ENV MAVEN_HOME ${MAVEN_HOME}
diff --git a/releng/pom.xml b/releng/pom.xml
index 9b605b0..5f0da3c 100644
--- a/releng/pom.xml
+++ b/releng/pom.xml
@@ -16,7 +16,7 @@
<version>2.5.0-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
- <tycho-version>1.4.0</tycho-version>
+ <tycho-version>1.5.1</tycho-version>
<tycho-groupid>org.eclipse.tycho</tycho-groupid>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<ajdt37repository>http://download.eclipse.org/tools/ajdt/37/update/</ajdt37repository>
@@ -26,7 +26,7 @@
<ajJavaSource>1.7</ajJavaSource>
<ajJavaTarget>1.7</ajJavaTarget>
<ajJavaCompilance>1.7</ajJavaCompilance>
- <cbi-version>1.1.5</cbi-version>
+ <cbi-version>1.1.8-SNAPSHOT</cbi-version>
</properties>
<distributionManagement>
<repository>
@@ -273,7 +273,6 @@
<plugin>
<groupId>org.eclipse.cbi.maven.plugins</groupId>
<artifactId>eclipse-jarsigner-plugin</artifactId>
- <version>${cbi-version}</version>
<executions>
<execution>
<id>sign</id>
@@ -323,12 +322,12 @@
<pluginRepositories>
<pluginRepository>
<id>cbi</id>
- <url>https://repo.eclipse.org/content/repositories/cbi-releases/</url>
+ <url>https://repo.eclipse.org/content/repositories/cbi/</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
- <enabled>false</enabled>
+ <enabled>true</enabled>
</snapshots>
</pluginRepository>
<!-- <pluginRepository><id>tycho-enhancements-snapshots</id><name>Tycho Enhancements Snapshots repository</name><snapshots><updatePolicy>always</updatePolicy></snapshots><url>https://haiodo.github.io/tycho/repository/</url></pluginRepository>-->
diff --git a/repository/full/pom.xml b/repository/full/pom.xml
index 7ce1724..6b4abc7 100644
--- a/repository/full/pom.xml
+++ b/repository/full/pom.xml
@@ -144,6 +144,9 @@
<fileNames>
<fileName>rcptt.app</fileName>
</fileNames>
+ <timeoutMillis>300000</timeoutMillis> <!-- 5 min -->
+ <entitlements>${project.basedir}/rcptt.entitlements</entitlements>
+ <signerUrl>http://172.30.206.146:8282/macosx-signing-service/1.0.1-SNAPSHOT</signerUrl>
</configuration>
</execution>
</executions>
diff --git a/repository/full/rcptt.entitlements b/repository/full/rcptt.entitlements
new file mode 100644
index 0000000..6fdb9d3
--- /dev/null
+++ b/repository/full/rcptt.entitlements
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>com.apple.security.cs.allow-jit</key>
+ <true/>
+ <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+ <true/>
+ <key>com.apple.security.cs.disable-executable-page-protection</key>
+ <true/>
+ <key>com.apple.security.cs.allow-dyld-environment-variables</key>
+ <true/>
+ <key>com.apple.security.cs.disable-library-validation</key>
+ <true/>
+ <key>com.apple.security.cs.debugger</key>
+ <true/>
+</dict>
+</plist>
\ No newline at end of file
