feat: improvments to build job (#345)

Author: hoadaniellipniacki

Dockerfile-deploy

@@ -3,7 +3,7 @@ ENV PNPM_HOME="/pnpm"
 ENV PATH="$PNPM_HOME:$PATH"
 RUN corepack enable
 
-RUN apt-get update && apt-get install -y jq
+RUN apt-get update && apt-get install -y jq && apt-get install -y curl
 
 COPY . /app
 WORKDIR /app

Jenkinsfile.build

@@ -1,8 +1,17 @@
 pipeline {
-    agent any
+    agent {
+        dockerfile {
+            filename 'Dockerfile-deploy'
+            reuseNode true
+        }
+    }
+
+    environment {
+        PROJECT_NAME = 'angular-love-client'
+    }
 
     stages {
-        stage('Trigger Builds') {
+        stage('Clearing caches') {
             steps {
                 script {
                     // Sleeps are since we don't watch for end of the process, and jobs only start the process
@@ -12,27 +21,64 @@ pipeline {
                             [$class: 'BooleanParameterValue', name: 'RUN_ON_PROD', value: true]
                         ],
                         wait: true)
-                    sleep(time:3,unit:"MINUTES")
+                    sleep(time:10,unit:"SECONDS")
 
                     build(job: 'angular.love/clear-site-cache', wait: true)
-                    sleep(time:30,unit:"SECONDS")
+                    sleep(time:1,unit:"MINUTES")
+                }
+            }
+        }
+        stage('Trigger Builds') {
+            steps {
+                script {
+                    build(job: 'angular.love/build-new-blog-main', wait: true)
+                }
+            }
+        }
+        stage('Wait for builds to finish') {
+            steps {
+                script {
+                    buildStatus = 'active'
+                    while (buildStatus == 'active') {
+                        sleep(time:1,unit:"MINUTES")
+                        withCredentials([
+                            usernamePassword(credentialsId: 'cf-workers-creds', usernameVariable: 'CLOUDFLARE_ACCOUNT_ID', passwordVariable: 'CLOUDFLARE_API_TOKEN'),
+                        ]) {
+                            buildStatus = sh(script: """
+                            ./scripts/get_last_build_status.sh -a $CLOUDFLARE_ACCOUNT_ID -p $PROJECT_NAME -t $CLOUDFLARE_API_TOKEN
+                            """, returnStdout: true).trim()
+                        }
+                        echo "Build status: ${buildStatus}"
+                    }
+
 
-                    build(job: 'angular.love/build-new-blog-main', wait: false)
-                    sleep(time:20,unit:"MINUTES")
+                    if (buildStatus != 'success') {
+                        error("Build failed")
+                    }
 
+                    // Clear caches again to make sure they are cleared
                     build(job: 'angular.love/clear-site-cache', wait: true)
+                    build(job: 'angular.love/clear-bff-cache', 
+                        parameters: [
+                            [$class: 'BooleanParameterValue', name: 'RUN_ON_DEV', value: true],
+                            [$class: 'BooleanParameterValue', name: 'RUN_ON_PROD', value: true]
+                        ],
+                        wait: true)
+
+                        withCredentials([
+                            usernamePassword(credentialsId: 'cf-workers-creds', usernameVariable: 'CLOUDFLARE_ACCOUNT_ID', passwordVariable: 'CLOUDFLARE_API_TOKEN'),
+                        ]) {
+                            buildUrl = sh(script: """
+                                ./scripts/get_last_builds_url.sh -a $CLOUDFLARE_ACCOUNT_ID -p $PROJECT_NAME -t $CLOUDFLARE_API_TOKEN
+                            """, returnStdout: true).trim()
+                        }
+
+                    echo "Build URL: ${buildUrl}"
+                    currentBuild.description = "Build URL: ${buildUrl}"
+                    currentBuild.displayName = "${buildUrl}"
                 }
             }
         }
     }
-
-    post {
-        failure {
-            echo "Failed to trigger builds"
-        }
-        success {
-            echo "Successfully triggered all builds"
-        }
-    }
 }
 

Jenkinsfile.purge_kv

@@ -34,7 +34,7 @@ pipeline {
                     usernamePassword(credentialsId: 'cf-workers-creds', usernameVariable: 'CLOUDFLARE_ACCOUNT_ID', passwordVariable: 'CLOUDFLARE_API_TOKEN'),
                 ]) {
                     sh """
-                        ./purge_kv.sh $KV_DEV
+                        ./scripts/purge_kv.sh $KV_DEV
                     """   
                 }
             }
@@ -48,7 +48,7 @@ pipeline {
                     usernamePassword(credentialsId: 'cf-workers-creds', usernameVariable: 'CLOUDFLARE_ACCOUNT_ID', passwordVariable: 'CLOUDFLARE_API_TOKEN'),
                 ]) {
                     sh """
-                        ./purge_kv.sh $KV_PROD
+                        ./scripts/purge_kv.sh $KV_PROD
                     """   
                 }
             }

scripts/get_last_build_status.sh

@@ -0,0 +1,39 @@
+#!/bin/bash
+
+while getopts "a:p:t:" opt; do
+ case $opt in
+   a) ACCOUNT_ID="$OPTARG";;
+   p) PROJECT_NAME="$OPTARG";;
+   t) API_TOKEN="$OPTARG";;
+   \?) echo "Invalid option -$OPTARG" >&2; exit 1;;
+ esac
+done
+
+if [ -z "$ACCOUNT_ID" ] || [ -z "$PROJECT_NAME" ] || [ -z "$API_TOKEN" ]; then
+   echo "Usage: $0 -a ACCOUNT_ID -p PROJECT_NAME -t API_TOKEN"
+   exit 1
+fi
+
+get_latest_status() {
+   response=$(curl -s -X GET \
+       "https://api.cloudflare.com/client/v4/accounts/${ACCOUNT_ID}/pages/projects/${PROJECT_NAME}/deployments" \
+       -H "Authorization: Bearer ${API_TOKEN}" \
+       -H "Content-Type: application/json")
+
+   if [ "$(echo "$response" | jq -r '.success')" != "true" ]; then
+       echo "Error: $(echo "$response" | jq -r '.errors[0].message')"
+       exit 1
+   fi
+
+   echo "$response" | jq -r '.result[] | select(.environment == "production") | .latest_stage.status' | head -n1
+}
+
+
+if ! command -v jq &> /dev/null; then
+   echo "Error: jq is required but not installed. Please install it first."
+   exit 1
+fi
+
+# Get and display status
+status=$(get_latest_status)
+echo "$status"

scripts/get_last_builds_url.sh

@@ -0,0 +1,39 @@
+#!/bin/bash
+
+while getopts "a:p:t:" opt; do
+ case $opt in
+   a) ACCOUNT_ID="$OPTARG";;
+   p) PROJECT_NAME="$OPTARG";;
+   t) API_TOKEN="$OPTARG";;
+   \?) echo "Invalid option -$OPTARG" >&2; exit 1;;
+ esac
+done
+
+if [ -z "$ACCOUNT_ID" ] || [ -z "$PROJECT_NAME" ] || [ -z "$API_TOKEN" ]; then
+   echo "Usage: $0 -a ACCOUNT_ID -p PROJECT_NAME -t API_TOKEN"
+   exit 1
+fi
+
+get_latest_status() {
+   response=$(curl -s -X GET \
+       "https://api.cloudflare.com/client/v4/accounts/${ACCOUNT_ID}/pages/projects/${PROJECT_NAME}/deployments" \
+       -H "Authorization: Bearer ${API_TOKEN}" \
+       -H "Content-Type: application/json")
+
+   if [ "$(echo "$response" | jq -r '.success')" != "true" ]; then
+       echo "Error: $(echo "$response" | jq -r '.errors[0].message')"
+       exit 1
+   fi
+
+   echo "$response" | jq -r '.result[] | select(.environment == "production") | .url' | head -n1
+}
+
+
+if ! command -v jq &> /dev/null; then
+   echo "Error: jq is required but not installed. Please install it first."
+   exit 1
+fi
+
+# Get and display status
+status=$(get_latest_status)
+echo "$status"