temp: changes for testing (dropme when done)

tutao · Nov 29, 2024 · e34cfec · e34cfec
1 parent f571735
commit e34cfec
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/ci/Release.Jenkinsfile b/ci/Release.Jenkinsfile
@@ -86,7 +86,8 @@ pipeline {
 						stage("Build") {
 							when { expression { return BUILD.toBoolean() } }
 							steps {
-								build job: 'tutanota-3-webapp', parameters: [
+								// #FIXME should use tutanota-3-webapp job once fully tested
+								build job: 'temp-tutanota-3-webapp', parameters: [
 									booleanParam(name: "UPLOAD", value: params.target.equals("buildAndPublishToStaging"))
 								]
 							} // steps
@@ -127,7 +128,8 @@ pipeline {
 							when { expression { return BUILD.toBoolean() } }
 							steps {
 								script {
-									build job: 'tutanota-3-desktop', parameters: [
+									// #FIXME should use tutanota-3-desktop job once fully tested
+									build job: 'temp-tutanota-3-desktop', parameters: [
 										booleanParam(name: "UPLOAD", value: params.target.equals("buildAndPublishToStaging")),
 										booleanParam(name: "WINDOWS", value: true),
 										booleanParam(name: "MAC", value: true),
@@ -161,7 +163,8 @@ pipeline {
 							when { expression { return BUILD.toBoolean() } }
 							steps {
 								script {
-									build job: 'tutanota-3-ios', parameters: [
+									// #FIXME should use tutanota-3-ios job once fully tested
+									build job: 'temp-tutanota-3-ios', parameters: [
 										booleanParam(name: "UPLOAD", value: params.target.equals("buildAndPublishToStaging")),
 										booleanParam(name: "STAGING", value: params.target.equals("buildAndPublishToStaging")),
 										booleanParam(name: "PROD", value: true),
@@ -200,7 +203,8 @@ pipeline {
 							when { expression { return BUILD.toBoolean() } }
 							steps {
 								script {
-									build job: 'tutanota-3-android', parameters: [
+									// #FIXME should use tutanota-3-android job once fully tested
+									build job: 'temp-tutanota-3-android', parameters: [
 										booleanParam(name: "UPLOAD", value: params.target.equals("buildAndPublishToStaging")),
 										booleanParam(name: "STAGING", value: params.target.equals("buildAndPublishToStaging")),
 										booleanParam(name: "PROD", value: true),

diff --git a/ci/jenkins-lib/util.groovy b/ci/jenkins-lib/util.groovy
@@ -26,12 +26,13 @@ def downloadFromNexus(Map params) {
 def checkGithub() {
 	// this fails if the public repository master's tip is not in our master.
 	// we may have more commits, though.
-	sh '''
-		# commit hash of the public repositories master
-		gh=$(git ls-remote [email protected]:tutao/tutanota.git refs/heads/master | awk '{print $1}')
-		# exit with 0 if $gh is an ancestor of the current HEAD, 1 otherwise.
-		git merge-base --is-ancestor $gh HEAD
-	'''
+// 	#FIXME should uncomment lines below once fully tested
+// 	sh '''
+// 		# commit hash of the public repositories master
+// 		gh=$(git ls-remote [email protected]:tutao/tutanota.git refs/heads/master | awk '{print $1}')
+// 		# exit with 0 if $gh is an ancestor of the current HEAD, 1 otherwise.
+// 		git merge-base --is-ancestor $gh HEAD
+// 	'''
 }