chore: small changes

wireapp · Nov 18, 2024 · f981404 · f981404
1 parent 3b26a7c
commit f981404
Show file tree

Hide file tree

Showing 2 changed files with 88 additions and 111 deletions.
diff --git a/.github/workflows/precommit.yml b/.github/workflows/precommit.yml
@@ -14,6 +14,11 @@ jobs:
     if: github.event_name == 'pull_request' && github.event.action == 'opened' && github.actor != 'dependabot[bot]' && github.event.pull_request.additions > 100
     runs-on: buildjet-8vcpu-ubuntu-2204
 
+    env:
+      DEPLOYMENT_RECOVERY_TIMEOUT_SECONDS: 150
+      AWS_APPLICATION_NAME: Webapp
+      AWS_BUILD_ZIP_PATH: server/dist/s3/ebs.zip
+
     steps:
       - name: Checkout
         uses: actions/checkout@v4

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,140 +1,112 @@
 pipeline {
     agent {
         node {
-            label 'built-in'
+      label 'built-in'
         }
     }
 
     options { disableConcurrentBuilds(abortPrevious: true) }
 
-    environment { 
+    environment {
         CREDENTIALS = credentials('GITHUB_TOKEN_WEB')
         WIRE_BOT_SECRET = credentials('JENKINSBOT_WEBAPP_QA')
     }
 
     stages {
-        stage("Wait for GitHub action to finish") {
-            when {
-                expression { BRANCH_NAME ==~ /PR-[0-9]+/ }
-            }
-            steps {
-                script {
-                    def commit_hash = sh(script: 'git rev-parse HEAD', returnStdout: true).trim()
-                    def pr_number = BRANCH_NAME.replaceAll(/\D/, '')
-                    def changeTargetBranch = env.CHANGE_TARGET
+        stage('Wait for GitHub action to finish') {
+      when {
+        expression { BRANCH_NAME ==~ /PR-[0-9]+/ }
+      }
+      steps {
+        script {
+          def commit_hash = sh(script: 'git rev-parse HEAD', returnStdout: true).trim()
+          def pr_number = BRANCH_NAME.replaceAll(/\D/, '')
+          def changeTargetBranch = env.CHANGE_TARGET
 
-                    def targetWorkflowUrl
-                    switch(changeTargetBranch) {
+          def targetWorkflowUrl
+          switch (changeTargetBranch) {
                       case ['dev']:
-                        targetWorkflowUrl = 'https://api.github.com/repos/wireapp/wire-webapp/actions/workflows/99460303/runs'
-                        break
+              targetWorkflowUrl = 'https://api.github.com/repos/wireapp/wire-webapp/actions/workflows/128602012/runs'
+              break
                       default:
-                        targetWorkflowUrl = 'https://api.github.com/repos/wireapp/wire-webapp/actions/workflows/98603098/runs'
-                        break
-                    }
-
-                    echo("Wait for github actions to start for ${BRANCH_NAME} against ${changeTargetBranch}")
-                    timeout(time: 45, unit: 'MINUTES') {
-                       waitUntil {
-                           def output = sh label: 'Get runs', returnStdout: true, script: "curl -s -L -H 'Accept: application/vnd.github+json' -H 'Authorization: Bearer ${CREDENTIALS}' -H 'X-GitHub-Api-Version: 2022-11-28' ${targetWorkflowUrl}"
-                           def json = readJSON text: output
-                           if (json['message']) {
-                               echo("Output: " + output)
-                               error("**Trigger script failed:** " + json['message'])
-                           }
-                           def runs = json['workflow_runs']
-                           echo("Looking for PR-" + pr_number + " with hash" + commit_hash)
-                           for (run in runs) {
-                               if (run['head_sha'] == commit_hash) {
-                                   echo("Found " + commit_hash)
-                                   echo("status: " + run['status'])
-                                   env.GITHUB_ACTION_URL = run['url'].replace('api.github.com/repos', 'github.com/')
-                                   // status can be queued, in_progress, or completed
-                                   if (run['status'] == 'queued' || run['status'] == 'in_progress' || run['status'] == 'completed') {
-                                       return true
-                                   }
-                               }
-                           }
-                           sleep(20)
-                           return false
-                       }
-                    }
+                        targetWorkflowUrl = 'https://api.github.com/repos/wireapp/wire-webapp/actions/workflows/128602012/runs'
+              break
+          }
 
-                    echo("Wait for apk to be build for ${BRANCH_NAME}")
-                    timeout(time: 70, unit: 'MINUTES') {
-                       waitUntil {
-                           def output = sh label: 'Get runs', returnStdout: true, script: "curl -s -L -H 'Accept: application/vnd.github+json' -H 'Authorization: Bearer ${CREDENTIALS}' -H 'X-GitHub-Api-Version: 2022-11-28' ${targetWorkflowUrl}"
-                           def json = readJSON text: output
-                           def runs = json['workflow_runs']
-                           echo("Looking for hash " + commit_hash)
-                           for (run in runs) {
-                               if (run['head_sha'] == commit_hash) {
-                                   echo("conclusion: " + run['conclusion'])
-                                   env.GITHUB_ACTION_URL = run['url'].replace('api.github.com/repos', 'github.com/')
-                                   // conclusion can be: success, failure, neutral, cancelled, skipped, timed_out, or action_required
-                                   if (run['conclusion'] == 'success') {
-                                       return true
-                                   } else if (run['conclusion'] == 'failure') {
-                                       error("❌ **Build failed for branch '${BRANCH_NAME}'** See Github Actions: " + env.GITHUB_ACTION_URL)
-                                   } else if (run['conclusion'] == 'cancelled') {
-                                       // mark step as aborted
-                                       currentBuild.result = 'ABORTED'
-                                       error("⚠️ **Build aborted for branch '${BRANCH_NAME}'** See Github Actions: " + env.GITHUB_ACTION_URL)
-                                   }
-                               }
-                           }
-                           sleep(20)
-                           return false;
-                       }
-                   }
-                }
-            }
-            post {
-                failure {
-                    script {
-                        wireSend(secret: env.WIRE_BOT_SECRET, message: "❌ **$BRANCH_NAME**\n[$CHANGE_TITLE](${CHANGE_URL})\nBuild aborted or failed! See [Github Actions](" + env.GITHUB_ACTION_URL + ")")
-                    }
+          echo("Wait for github actions to start for ${BRANCH_NAME} against ${changeTargetBranch}")
+          timeout(time: 45, unit: 'MINUTES') {
+            waitUntil {
+              def output = sh label: 'Get runs', returnStdout: true, script: "curl -s -L -H 'Accept: application/vnd.github+json' -H 'Authorization: Bearer ${CREDENTIALS}' -H 'X-GitHub-Api-Version: 2022-11-28' ${targetWorkflowUrl}"
+              def json = readJSON text: output
+              if (json['message']) {
+                echo('Output: ' + output)
+                error('**Trigger script failed:** ' + json['message'])
+              }
+              def runs = json['workflow_runs']
+              echo('Looking for PR-' + pr_number + ' with hash' + commit_hash)
+              for (run in runs) {
+                if (run['head_sha'] == commit_hash) {
+                  echo('Found ' + commit_hash)
+                  echo('status: ' + run['status'])
+                  env.GITHUB_ACTION_URL = run['url'].replace('api.github.com/repos', 'github.com/')
+                  // status can be queued, in_progress, or completed
+                  if (run['status'] == 'queued' || run['status'] == 'in_progress' || run['status'] == 'completed') {
+                    return true
+                  }
                 }
+              }
+              sleep(20)
+              return false
             }
+          }
+
+        }
+      }
+      post {
+        failure {
+          script {
+            wireSend(secret: env.WIRE_BOT_SECRET, message: "❌ **$BRANCH_NAME**\n[$CHANGE_TITLE](${CHANGE_URL})\nBuild aborted or failed! See [Github Actions](" + env.GITHUB_ACTION_URL + ')')
+          }
+        }
+      }
         }
 
-        stage("Smoke Tests") {
-            when {
-                expression { BRANCH_NAME ==~ /PR-[0-9]+/ }
-            }
-            steps {
-                script {
-                    def files = []
-                    withAWS(region: 'eu-west-1', credentials: "S3_CREDENTIALS") {
-                        files = s3FindFiles bucket: "z-lohika", path: "artifacts/megazord/android/reloaded/staging/compat/$BRANCH_NAME/", onlyFiles: true, glob: '*.apk'
-                    }
-                    files.sort { a, b -> a.lastModified <=> b.lastModified }
-                    if (files.size() < 1) {
-                        error("Could not find any apk at provided location!")
+        stage('Smoke Tests') {
+      when {
+        expression { BRANCH_NAME ==~ /PR-[0-9]+/ }
+      }
+      steps {
+        script {
+          def files = []
+          withAWS(region: 'eu-west-1', credentials: 'S3_CREDENTIALS') {
+            files = s3FindFiles bucket: 'z-lohika', path: "artifacts/megazord/android/reloaded/staging/compat/$BRANCH_NAME/", onlyFiles: true, glob: '*.apk'
+          }
+          files.sort { a, b -> a.lastModified <=> b.lastModified }
+          if (files.size() < 1) {
+            error('Could not find any apk at provided location!')
                     } else {
-                        def lastModifiedFileName = files[-1].name
-                        build job: 'android_reloaded_smoke', parameters: [string(name: 'AppBuildNumber', value: "artifacts/megazord/android/reloaded/staging/compat/$BRANCH_NAME/${lastModifiedFileName}"), string(name: 'TAGS', value: '@smoke'), string(name: 'Branch', value: 'android_dev')]
-                    }
-                }
-            }
-            post {
-                unsuccessful {
-                    script {
-                        wireSend(secret: env.WIRE_BOT_SECRET, message: "❌ **$BRANCH_NAME**\n[$CHANGE_TITLE](${CHANGE_URL})\nQA-Jenkins - Smoke tests failed (see above report)")
-                    }
-                }
-            }
+            def lastModifiedFileName = files[-1].name
+            build job: 'android_reloaded_smoke', parameters: [string(name: 'AppBuildNumber', value: "artifacts/megazord/android/reloaded/staging/compat/$BRANCH_NAME/${lastModifiedFileName}"), string(name: 'TAGS', value: '@smoke'), string(name: 'Branch', value: 'android_dev')]
+          }
+        }
+      }
+      post {
+        unsuccessful {
+          script {
+            wireSend(secret: env.WIRE_BOT_SECRET, message: "❌ **$BRANCH_NAME**\n[$CHANGE_TITLE](${CHANGE_URL})\nQA-Jenkins - Smoke tests failed (see above report)")
+          }
+        }
+      }
         }
-
     }
 
     post {
         success {
-            script {
-                if (env.BRANCH_NAME ==~ /PR-[0-9]+/) {
-                    wireSend(secret: env.WIRE_BOT_SECRET, message: "✅ **$BRANCH_NAME**\n[$CHANGE_TITLE](${CHANGE_URL})\nQA-Jenkins - Smoke tests successful (see above report)")
-                }
-            }
+      script {
+        if (env.BRANCH_NAME ==~ /PR-[0-9]+/) {
+          wireSend(secret: env.WIRE_BOT_SECRET, message: "✅ **$BRANCH_NAME**\n[$CHANGE_TITLE](${CHANGE_URL})\nQA-Jenkins - Smoke tests successful (see above report)")
+        }
+      }
         }
     }
-}
+}