status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

feat(ci): trigger E2E from meta build for releases 

The method of triggering new E2E builds from the Linux build makes sense
for PRs, but doesn't make as much sense for nightly or release builds.

By triggering it this way we will see the result as part of the whole
build that includes all platforms and all tests.

Signed-off-by: Jakub Sokołowski <jakub@status.im>
This commit is contained in:
Jakub Sokołowski 2023-10-26 13:19:33 +02:00
parent 8cee3f500a
commit cfd82ee094
No known key found for this signature in database
GPG Key ID: FE65CD384D5BF7B4
2 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ci/Jenkinsfile.combined
View File

@ -8,7 +8,7 @@ pipeline {
timestamps() timestamps()
disableConcurrentBuilds() disableConcurrentBuilds()
/* Prevent Jenkins jobs from running forever */ /* Prevent Jenkins jobs from running forever */
timeout(time: 60, unit: 'MINUTES') timeout(time: 90, unit: 'MINUTES')
/* Limit builds retained */ /* Limit builds retained */
buildDiscarder(logRotator( buildDiscarder(logRotator(
numToKeepStr: '30', numToKeepStr: '30',
@ -28,20 +28,30 @@ pipeline {
stages { stages {
stage('Build') { stage('Build') {
parallel { parallel {
stage('Linux/E2E') { steps { script {
linux_e2e = jenkins.Build('status-desktop/systems/linux/x86_64/tests-e2e')
} } }
stage('Linux/x86_64') { steps { script { stage('Linux/x86_64') { steps { script {
linux_x86_64 = jenkins.Build('status-desktop/systems/linux/x86_64/package') linux_x86_64 = jenkins.Build('status-desktop/systems/linux/x86_64/package')
} } } } } }
stage('Windows/x86_64') { steps { script { stage('Windows/x86_64') { steps { script {
windows_x86_64 = jenkins.Build('status-desktop/systems/windows/x86_64/package') windows_x86_64 = jenkins.Build('status-desktop/systems/windows/x86_64/package')
} } } } } }
stage('MacOS/x86_64') { steps { script { stage('MacOS/x86_64') { steps { script {
macos_x86_64 = jenkins.Build('status-desktop/systems/macos/x86_64/package') macos_x86_64 = jenkins.Build('status-desktop/systems/macos/x86_64/package')
} } } } } }
stage('MacOS/aarch64') { steps { script { stage('MacOS/aarch64') { steps { script {
macos_aarch64 = jenkins.Build('status-desktop/systems/macos/aarch64/package') macos_aarch64 = jenkins.Build('status-desktop/systems/macos/aarch64/package')
} } }
}
}
stage('Tests') {
parallel {
stage('Linux/E2E/old') { steps { script {
linux_e2e = jenkins.Build('status-desktop/systems/linux/x86_64/tests-e2e-old')
} } }
stage('Linux/E2E/new') { steps { script {
linux_e2e = build(
job: 'status-desktop/systems/linux/x86_64/tests-e2e-new',
parameters: jenkins.mapToParams([BUILD_SOURCE: linux_x86_64.fullProjectName]),
)
} } } } } }
} }
} }

12
ci/Jenkinsfile.linux
View File

@ -107,10 +107,10 @@ pipeline {
} }
stage('E2E') { stage('E2E') {
when { expression { getE2EBuildType() != null } } when { expression { utils.isPRBuild() } }
steps { script { steps { script {
build( build(
job: "status-desktop/e2e/${getE2EBuildType()}", job: 'status-desktop/e2e/prs',
parameters: jenkins.mapToParams([BUILD_SOURCE: JOB_NAME]), parameters: jenkins.mapToParams([BUILD_SOURCE: JOB_NAME]),
wait: false wait: false
) )
@ -131,14 +131,6 @@ def getArch() {
} }
} }
def getE2EBuildType() {
if (utils.isPRBuild()) { return 'prs' }
def parent = utils.parentOrCurrentBuild()
if (parent == null) { return null }
if (parent.getFullDisplayName() =~ /nightly/) { return 'nightly' }
return null
}
def getMockedKeycardLibDefault() { def getMockedKeycardLibDefault() {
return utils.isReleaseBuild() ? 'false' : 'true' return utils.isReleaseBuild() ? 'false' : 'true'
} }