Add maven deploy for nightly
Signed-off-by: Alexander Dudaev <Aleksandr.Dudayev@xored.com>
Change-Id: Ifa69550b2a763df7fb7ff20380002e44e9236c34
diff --git a/releng/Jenkinsfile b/releng/Jenkinsfile
index eac793f..8346a2f 100644
--- a/releng/Jenkinsfile
+++ b/releng/Jenkinsfile
@@ -4,8 +4,8 @@
agent none
parameters {
- choice(name: 'MODE', choices: ['Release', 'Milestone'], description: 'The deploy mode', ),
- string(name: 'MILESTONE_VERSION', defaultValue: 'MO', description: 'Only for milestone build'
+ choice(name: 'MODE', choices: ['Release', 'Milestone'], description: 'The deploy mode')
+ string(name: 'MILESTONE_VERSION', defaultValue: 'MO', description: 'Only for milestone build')
}
stages {
@@ -27,7 +27,7 @@
stage('Launch agent') {
agent {
kubernetes {
- label 'rcptt-build-agent'
+ label 'rcptt-build-and-deploy-agent'
yaml "${env.YAML_BUILD_AND_DEPLOY_AGENT}"
}
}
diff --git a/releng/Jenkinsfile.groovy b/releng/Jenkinsfile.groovy
index 261d262..557caac 100644
--- a/releng/Jenkinsfile.groovy
+++ b/releng/Jenkinsfile.groovy
@@ -1,3 +1,4 @@
+// The container does not start under the Jenkins user. /home/jenkins is mounted in a container and is a single file space
BUILD_CONTAINER_NAME="ubuntu"
BUILD_CONTAINER="""
- name: $BUILD_CONTAINER_NAME
@@ -10,6 +11,9 @@
requests:
memory: "4Gi"
cpu: "1"
+ env:
+ - name: "MAVEN_OPTS"
+ value: "-Duser.home=/home/jenkins"
volumeMounts:
- name: settings-xml
mountPath: /home/jenkins/.m2/settings.xml
@@ -19,13 +23,16 @@
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
+ readOnly: true
- name: m2-repo
- mountPath: /home/jenkins/.m2/repository
-"""
+ mountPath: /home/jenkins/.m2/repository"""
BUILD_CONTAINER_VOLUMES="""
- name: settings-xml
- configMap:
- name: m2-dir
+ secret:
+ secretName: m2-secret-dir
items:
- key: settings.xml
path: settings.xml
@@ -35,21 +42,24 @@
items:
- key: toolchains.xml
path: toolchains.xml
+ - name: settings-security-xml
+ secret:
+ secretName: m2-secret-dir
+ items:
+ - key: settings-security.xml
+ path: settings-security.xml
- name: m2-repo
- emptyDir: {}
-"""
-DEPLOY_CONTAINER_NAME="jnlp"
-DEPLOY_CONTAINER="""
- - name: $DEPLOY_CONTAINER_NAME
+ emptyDir: {}"""
+SSH_DEPLOY_CONTAINER_NAME="jnlp"
+SSH_DEPLOY_CONTAINER="""
+ - name: $SSH_DEPLOY_CONTAINER_NAME
volumeMounts:
- name: volume-known-hosts
- mountPath: /home/jenkins/.ssh
-"""
-DEPLOY_CONTAINER_VOLUMES="""
+ mountPath: /home/jenkins/.ssh"""
+SSH_DEPLOY_CONTAINER_VOLUMES="""
- name: volume-known-hosts
configMap:
- name: known-hosts
-"""
+ name: known-hosts"""
env.YAML_BUILD_AGENT="""
apiVersion: v1
@@ -67,10 +77,10 @@
spec:
containers:
$BUILD_CONTAINER
-$DEPLOY_CONTAINER
+$SSH_DEPLOY_CONTAINER
volumes:
$BUILD_CONTAINER_VOLUMES
-$DEPLOY_CONTAINER_VOLUMES
+$SSH_DEPLOY_CONTAINER_VOLUMES
"""
CREDENTIAL="genie.rcptt@projects-storage.eclipse.org"
@@ -108,10 +118,10 @@
def build(Boolean sign) {
container(BUILD_CONTAINER_NAME) {
- sh "./build.sh -Dmaven.repo.local=$WORKSPACE/m2 -e ${sign ? "-P sign" : ""}"
- sh "./build_runner.sh -Dmaven.repo.local=$WORKSPACE/m2 -e"
- sh "mvn -f maven-plugin/pom.xml clean verify -Dmaven.repo.local=$WORKSPACE/m2 -e"
- sh "./$DOC_DIR/generate-doc.sh -Dmaven.repo.local=$WORKSPACE/m2 -e"
+ sh "./build.sh -Dmaven.repo.local=$WORKSPACE/m2 -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"
}
}
@@ -152,20 +162,22 @@
def mockup_tests() {
container(BUILD_CONTAINER_NAME) {
def version = get_version()
- git "https://github.com/DudaevAR/q7.quality.mockups.git"
- sh "mvn clean verify -B -f tests/pom.xml \
- -Dmaven.repo.local=$WORKSPACE/m2 -e \
- -Dci-maven-version=2.0.0-SNAPSHOT \
- -DexplicitRunner=`readlink -f $WORKSPACE/$RUNNER_DIR/rcptt.runner-$version-SNAPSHOT.zip` \
- -DmockupsRepository=https://ci-staging.eclipse.org/rcptt/view/migration/job/mockups/lastSuccessfulBuild/artifact/repository/target/repository/ \
- || true"
- sh "test -f $WORKSPACE/tests/target/results/tests.html"
+ dir('mockups') {
+ git "https://github.com/DudaevAR/q7.quality.mockups.git"
+ sh "mvn clean verify -B -f tests/pom.xml \
+ -Dmaven.repo.local=$WORKSPACE/m2 -e \
+ -Dci-maven-version=2.0.0-SNAPSHOT \
+ -DexplicitRunner=`readlink -f $WORKSPACE/$RUNNER_DIR/rcptt.runner-$version-SNAPSHOT.zip` \
+ -DmockupsRepository=https://ci-staging.eclipse.org/rcptt/view/migration/job/mockups/lastSuccessfulBuild/artifact/repository/target/repository/ \
+ || true"
+ sh "test -f $WORKSPACE/mockups/tests/target/results/tests.html"
+ }
}
}
def post_build_actions() {
junit "**/target/*-reports/*.xml"
- archiveArtifacts allowEmptyArchive: true, artifacts: "*ests/target/results/**/*, *ests/target/**/*err*log, *ests/target/runner/configuration/*.log, *ests/target/runner-workspace/**/*, *ests/target/**/.log"
+ archiveArtifacts allowEmptyArchive: true, artifacts: "rcpttTests/target/results/**/*, rcpttTests/target/**/*err*log, rcpttTests/target/runner/configuration/*.log, rcpttTests/target/runner-workspace/**/*, rcpttTests/target/**/.log, mockups/tests/target/results/**/*, mockups/tests/target/**/*err*log, mockups/tests/target/runner/configuration/*.log, mockups/tests/target/runner-workspace/**/*, mockups/tests/target/**/.log"
sh "dd if=/dev/zero of=file.txt count=100 bs=1048576" // 1048576 bytes = 1Mb
sh "rm file.txt"
@@ -174,12 +186,10 @@
}
def deploy(String mode, String arg = "M0") {
- container(DEPLOY_CONTAINER_NAME) {
- switch(mode) {
- case "Release": release(); break;
- case "Milestone": milestone(arg); break;
- case "Nightly": nightly(); break;
- }
+ switch(mode) {
+ case "Release": release(); break;
+ case "Milestone": milestone(arg); break;
+ case "Nightly": nightly(); break;
}
}
@@ -199,20 +209,24 @@
def qualifier = get_qualifier()
def qualifiedDecoration = "-N$qualifier"
- 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}")
- for(old in oldBuilds.split("\n")) {
- sh "$SSH_CLIENT rm -r $storageFolder/$old"
+ 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}")
+ for(old in oldBuilds.split("\n")) {
+ sh "$SSH_CLIENT rm -r $storageFolder/$old"
+ }
}
+
+ def storageFolderLatest = get_storage_folder(type, version, "latest")
+ sshagent(["projects-storage.eclipse.org-bot-ssh"]) {
+ sh "$SSH_CLIENT rm -rf ${storageFolderLatest}"
+ }
+ copy_files(type, version, "latest", "-nightly", true)
}
- def storageFolderLatest = get_storage_folder(type, version, "latest")
- sshagent(["projects-storage.eclipse.org-bot-ssh"]) {
- sh "$SSH_CLIENT rm -rf ${storageFolderLatest}"
- }
- copy_files(type, version, "latest", "-nightly", true)
+ maven_deploy_nightly()
}
def milestone(String milestone) {
@@ -220,10 +234,11 @@
def version = get_version()
def qualifiedDecoration = "-$milestone"
- copy_files(type, version, milestone, qualifiedDecoration, false)
+ container(SSH_DEPLOY_CONTAINER_NAME) {
+ copy_files(type, version, milestone, qualifiedDecoration, false)
+ }
- maven_deploy_runner("$version-$milestone", type, milestone)
- meven_deploy_maven_plugin(version)
+ maven_deploy("$version-$milestone")
}
def release() {
@@ -231,10 +246,11 @@
def version = get_version()
def qualifiedDecoration = ""
- copy_files(type, version, "", qualifiedDecoration, false)
+ container(SSH_DEPLOY_CONTAINER_NAME) {
+ copy_files(type, version, "", qualifiedDecoration, false)
+ }
- maven_deploy_runner(version, type, "")
- meven_deploy_maven_plugin(version)
+ maven_deploy(version)
}
def copy_files(String type, String version, String subfolder, String qualifiedDecoration, Boolean copy_full) { // subfolder is empty for type == release
@@ -267,19 +283,35 @@
}
}
-def maven_deploy_runner(String version, String type, String subfolder) {
- sh "mvn deploy:deploy-file \
- -Dversion=$version -Durl=https://repo.eclipse.org/content/repositories/rcptt-releases/ \
- -DgroupId=org.eclipse.rcptt.runner \
- -DrepositoryId=repo.eclipse.org \
- -DgeneratePom=true \
- -DartifactId=rcptt.runner \
- -Dfile=https://download.eclipse.org/rcptt/${type}/${version}/${subfolder}/runner/rcptt.runner-${version}.zip"
+def maven_deploy_nightly() {
+ container(BUILD_CONTAINER_NAME) {
+ sh "mvn -f releng/runner/pom.xml clean deploy -Dmaven.repo.local=$WORKSPACE/m2 -e -B"
+ sh "mvn -f maven-plugin/pom.xml clean deploy -Dmaven.repo.local=$WORKSPACE/m2 -e -B"
+ }
}
-def meven_deploy_maven_plugin(String version){
- sh "mvn -f maven-plugin/pom.xml clean versions:set -DnewVersion=$version"
- sh "mvn -f maven-plugin/pom.xml clean deploy -DnewVersion=$version"
+def maven_deploy(String version) {
+ maven_deploy_runner(version)
+ maven_deploy_maven_plugin(version)
+}
+
+def maven_deploy_runner(String version) {
+ container(BUILD_CONTAINER_NAME) {
+ sh "mvn deploy:deploy-file \
+ -Dversion=$version -Durl=https://repo.eclipse.org/content/repositories/rcptt-releases/ \
+ -DgroupId=org.eclipse.rcptt.runner \
+ -DrepositoryId=repo.eclipse.org \
+ -DgeneratePom=true \
+ -DartifactId=rcptt.runner \
+ -Dfile=`readlink -f $WORKSPACE/$RUNNER_DIR/rcptt.runner-*.zip`"
+ }
+}
+
+def maven_deploy_maven_plugin(String version){
+ container(BUILD_CONTAINER_NAME) {
+ sh "mvn -f maven-plugin/pom.xml clean versions:set -DnewVersion=$version"
+ sh "mvn -f maven-plugin/pom.xml clean deploy"
+ }
}
return this
\ No newline at end of file
diff --git a/releng/buildenv/ubuntu/Dockerfile b/releng/buildenv/ubuntu/Dockerfile
index 3ffdc8e..eee453f 100644
--- a/releng/buildenv/ubuntu/Dockerfile
+++ b/releng/buildenv/ubuntu/Dockerfile
@@ -11,13 +11,17 @@
openjfx
## Install a maven
-ENV MAVEN_VER="3.6.0"
-RUN wget http://www-eu.apache.org/dist/maven/maven-3/${MAVEN_VER}/binaries/apache-maven-${MAVEN_VER}-bin.tar.gz \
- && tar xvf apache-maven-${MAVEN_VER}-bin.tar.gz \
- && rm apache-maven-${MAVEN_VER}-bin.tar.gz \
- && mv apache-maven-${MAVEN_VER} /opt/maven
-ENV MAVEN_HOME=/opt/maven
-ENV PATH=${PATH}:${MAVEN_HOME}/bin
+ARG MAVEN_VERSION=3.6.1
+ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
+ARG MAVEN_HOME=/usr/share/maven
+
+RUN wget -O /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz \
+ && 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
+
+ENV MAVEN_HOME ${MAVEN_HOME}
## switch back to default user
USER 1000
diff --git a/releng/nightly/Jenkinsfile b/releng/nightly/Jenkinsfile
index 27e2171..6c79f12 100644
--- a/releng/nightly/Jenkinsfile
+++ b/releng/nightly/Jenkinsfile
@@ -22,7 +22,7 @@
stage('Launch agent') {
agent {
kubernetes {
- label 'rcptt-build-agent'
+ label 'rcptt-build-and-deploy-agent'
yaml "${env.YAML_BUILD_AND_DEPLOY_AGENT}"
}
}
diff --git a/releng/pom.xml b/releng/pom.xml
index fcb062e..115660a 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.3.0</tycho-version>
+ <tycho-version>1.4.0</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>
