From b9683c6380019d3e630063fd7a92cb50b222cdb7 Mon Sep 17 00:00:00 2001
From: johnsamey <johnsamyut@gmail.com>
Date: Sun, 29 Sep 2024 19:39:28 +0300
Subject: [PATCH 01/60] add docker file

---
 Dockerfile         | 23 +++++++++++++++++++++++
 docker-compose.yml | 24 ++++++++++++++++++++++++
 plan.md            |  5 +++++
 3 files changed, 52 insertions(+)
 create mode 100644 Dockerfile
 create mode 100644 docker-compose.yml
 create mode 100644 plan.md

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..0d900bd
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,23 @@
+# Use an official Python runtime as a parent image
+FROM python:3.9-slim
+
+# Set environment variables
+ENV PYTHONUNBUFFERED 1
+
+# Set the working directory
+WORKDIR /app
+
+# Copy the requirements file to the working directory
+COPY requirements.txt .
+
+# Install dependencies
+RUN pip install --no-cache-dir -r requirements.txt
+
+# Copy the rest of the application code to the working directory
+COPY . .
+
+# Expose the port the app runs on
+EXPOSE ${PORT}
+
+# Command to run the application
+CMD ["python", "hello.py"]
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..4846b40
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,24 @@
+version: '3.8'
+
+services:
+  app:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    environment:
+      - ENVIRONMENT=DEV
+      - HOST=0.0.0.0
+      - PORT=8000
+      - REDIS_HOST=redis
+      - REDIS_PORT=6379
+      - REDIS_DB=0
+    ports:
+      - "8000:8000"
+    depends_on:
+      - redis
+    command: python hello.py
+
+  redis:
+    image: "redis:6.0-alpine"
+    ports:
+      - "6379:6379"
diff --git a/plan.md b/plan.md
new file mode 100644
index 0000000..e9c7fa1
--- /dev/null
+++ b/plan.md
@@ -0,0 +1,5 @@
+1. jenkins on an ec2 instance
+2. configure docker & ansible agents in jenkins
+    2.1. docker agent is used to build the image then run tests then push it to an image registry
+    2.2. ansible agent is used to configure the ec2 ( install docker & pull the image )
+3. configure the notification channel in jenkins
\ No newline at end of file

From a5c75520ff59fb622b9af1cdebd1c9990e49d984 Mon Sep 17 00:00:00 2001
From: johnsamey <johnsamyut@gmail.com>
Date: Sun, 29 Sep 2024 19:44:23 +0300
Subject: [PATCH 02/60] Project Documentation

---
 Project DevOps DEPI.docx | Bin 0 -> 18067 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 Project DevOps DEPI.docx

diff --git a/Project DevOps DEPI.docx b/Project DevOps DEPI.docx
new file mode 100644
index 0000000000000000000000000000000000000000..ae9301892194e8da82347b13d8a6c4cde7b9073f
GIT binary patch
literal 18067
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
G*Z&8>6z*XF

literal 0
HcmV?d00001


From 7af7ab0f92fd35db97289126ab1016d22e1d784d Mon Sep 17 00:00:00 2001
From: johnsamey <johnsamyut@gmail.com>
Date: Tue, 1 Oct 2024 03:54:49 +0300
Subject: [PATCH 03/60] update docker-compose file

---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 4846b40..d3ace5c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,7 +17,7 @@ services:
     depends_on:
       - redis
     command: python hello.py
-
+    image: johnsami/dockerized-app-build-app:latest
   redis:
     image: "redis:6.0-alpine"
     ports:

From 7b432bba29834beca903a4a741f9909b4525cd9d Mon Sep 17 00:00:00 2001
From: johnsamey <johnsamyut@gmail.com>
Date: Tue, 1 Oct 2024 04:02:21 +0300
Subject: [PATCH 04/60] update dockerfile

---
 Dockerfile | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 0d900bd..6c65a82 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,23 +1,15 @@
-# Use an official Python runtime as a parent image
 FROM python:3.9-slim
 
-# Set environment variables
 ENV PYTHONUNBUFFERED 1
 
-# Set the working directory
 WORKDIR /app
 
-# Copy the requirements file to the working directory
 COPY requirements.txt .
 
-# Install dependencies
 RUN pip install --no-cache-dir -r requirements.txt
 
-# Copy the rest of the application code to the working directory
 COPY . .
 
-# Expose the port the app runs on
 EXPOSE ${PORT}
 
-# Command to run the application
 CMD ["python", "hello.py"]

From 8ee7237ebaa505ae0725d3af0b25201787f0c410 Mon Sep 17 00:00:00 2001
From: johnsamey <johnsamyut@gmail.com>
Date: Tue, 1 Oct 2024 05:44:26 +0300
Subject: [PATCH 05/60] update docker-compose file

---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index d3ace5c..a20127e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,7 +13,7 @@ services:
       - REDIS_PORT=6379
       - REDIS_DB=0
     ports:
-      - "8000:8000"
+      - "8010:8000"
     depends_on:
       - redis
     command: python hello.py

From d44074e933a136644283cd86935bc51f50c33187 Mon Sep 17 00:00:00 2001
From: Mostafa-Hesham <86481662+MainUseless@users.noreply.github.com>
Date: Tue, 1 Oct 2024 20:47:08 +0300
Subject: [PATCH 06/60] Update plan.md

---
 plan.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plan.md b/plan.md
index e9c7fa1..f1d4126 100644
--- a/plan.md
+++ b/plan.md
@@ -2,4 +2,5 @@
 2. configure docker & ansible agents in jenkins
     2.1. docker agent is used to build the image then run tests then push it to an image registry
     2.2. ansible agent is used to configure the ec2 ( install docker & pull the image )
-3. configure the notification channel in jenkins
\ No newline at end of file
+3. configure the notification channel in jenkins
+4. testing jenkins auto build

From dbc60cf02c79ce5553a0a6a9a4734e70108bee57 Mon Sep 17 00:00:00 2001
From: Khalid Salman <khalid.salman1996@gmail.com>
Date: Tue, 1 Oct 2024 22:01:08 +0300
Subject: [PATCH 07/60] Add Jenkinsfile

---
 jenkinsfile | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 78 insertions(+)
 create mode 100644 jenkinsfile

diff --git a/jenkinsfile b/jenkinsfile
new file mode 100644
index 0000000..9ea7a2e
--- /dev/null
+++ b/jenkinsfile
@@ -0,0 +1,78 @@
+pipeline {
+    agent any
+
+    // Options to configure the pipeline behavior
+    options {
+        // Delete the workspace before the build starts
+        skipDefaultCheckout true
+    }
+
+    // Triggers to start the pipeline
+    triggers {
+        // Trigger the pipeline on GitHub push events
+        githubPush()
+    }
+
+    // Environment variables and credentials
+    environment {
+        // Define Docker Hub credentials (replace with your actual credentials ID)
+        DOCKER_HUB_CREDENTIALS = credentials('docker-hub-credentials-id')
+    }
+
+    stages {
+        stage('Cleanup Workspace') {
+            steps {
+                // Delete the workspace to ensure a clean state
+                deleteDir()
+            }
+        }
+
+        stage('Checkout Code') {
+            steps {
+                // Checkout the repository from GitHub
+                git(
+                    branch: 'master',
+                    url: 'https://github.com/johnsamey/DEPI-Project.git',
+                    credentialsId: 'github-token-credentials-id' // Replace with your GitHub credentials ID
+                )
+            }
+        }
+
+        stage('Build Docker Image') {
+            steps {
+                // Use Docker Compose to build the Docker image
+                sh '''
+                    docker-compose build
+                    docker tag depi-project-app:latest johnsami/depi-project-app:latest
+                '''
+            }
+        }
+
+        stage('Push Docker Image') {
+            steps {
+                // Log in to Docker Hub and push the Docker image
+                sh '''
+                    echo "$DOCKER_HUB_PASSWORD" | docker login -u "$DOCKER_HUB_USERNAME" --password-stdin
+                    docker-compose push
+                '''
+            }
+        }
+    }
+
+    // Environment variables with credentials binding
+    environment {
+        // Bind Docker Hub username and password from the credentials
+        DOCKER_HUB_USERNAME = "${DOCKER_HUB_CREDENTIALS_USR}"
+        DOCKER_HUB_PASSWORD = "${DOCKER_HUB_CREDENTIALS_PSW}"
+    }
+
+    // Post-build actions (optional)
+    post {
+        success {
+            echo 'Build and push completed successfully!'
+        }
+        failure {
+            echo 'Build or push failed.'
+        }
+    }
+}

From e02eaa5836e0d53b332644b0e3dd0eaa259968b8 Mon Sep 17 00:00:00 2001
From: Khalid Salman <khalid.salman1996@gmail.com>
Date: Tue, 1 Oct 2024 22:18:08 +0300
Subject: [PATCH 08/60] Add Jenkinsfile

---
 jenkinsfile | 74 +++++++++++++++++++----------------------------------
 1 file changed, 26 insertions(+), 48 deletions(-)

diff --git a/jenkinsfile b/jenkinsfile
index 9ea7a2e..3e823e9 100644
--- a/jenkinsfile
+++ b/jenkinsfile
@@ -1,78 +1,56 @@
+
 pipeline {
     agent any
 
-    // Options to configure the pipeline behavior
-    options {
-        // Delete the workspace before the build starts
-        skipDefaultCheckout true
-    }
-
-    // Triggers to start the pipeline
-    triggers {
-        // Trigger the pipeline on GitHub push events
-        githubPush()
+    environment {
+        DOCKER_HUB_USERNAME = credentials('docker-hub-username')
+        DOCKER_HUB_PASSWORD = credentials('docker-hub-password')
     }
 
-    // Environment variables and credentials
-    environment {
-        // Define Docker Hub credentials (replace with your actual credentials ID)
-        DOCKER_HUB_CREDENTIALS = credentials('docker-hub-credentials-id')
+    options {
+        // Example to delete the workspace before the build starts, similar to the option in the freestyle job.
+        deleteDir()
     }
 
     stages {
-        stage('Cleanup Workspace') {
+        stage('Checkout') {
             steps {
-                // Delete the workspace to ensure a clean state
-                deleteDir()
-            }
-        }
-
-        stage('Checkout Code') {
-            steps {
-                // Checkout the repository from GitHub
-                git(
-                    branch: 'master',
-                    url: 'https://github.com/johnsamey/DEPI-Project.git',
-                    credentialsId: 'github-token-credentials-id' // Replace with your GitHub credentials ID
-                )
+                git url: 'https://github.com/username/DEPiProject.git', branch: 'master', credentialsId: 'github-personal-access-token'
             }
         }
 
         stage('Build Docker Image') {
             steps {
-                // Use Docker Compose to build the Docker image
-                sh '''
+                script {
+                    sh '''
+                    cd $WORKSPACE
                     docker-compose build
-                    docker tag depi-project-app:latest johnsami/depi-project-app:latest
-                '''
+                    docker tag depi-project-app:latest joshman/depi-project-app:latest
+                    '''
+                }
             }
         }
 
-        stage('Push Docker Image') {
+        stage('Push to Docker Hub') {
             steps {
-                // Log in to Docker Hub and push the Docker image
-                sh '''
+                script {
+                    sh '''
+                    cd $WORKSPACE
                     echo "$DOCKER_HUB_PASSWORD" | docker login -u "$DOCKER_HUB_USERNAME" --password-stdin
                     docker-compose push
-                '''
+                    '''
+                }
             }
         }
     }
 
-    // Environment variables with credentials binding
-    environment {
-        // Bind Docker Hub username and password from the credentials
-        DOCKER_HUB_USERNAME = "${DOCKER_HUB_CREDENTIALS_USR}"
-        DOCKER_HUB_PASSWORD = "${DOCKER_HUB_CREDENTIALS_PSW}"
+    triggers {
+        pollSCM('H/5 * * * *')  // Poll SCM every 5 minutes (adjust as needed)
     }
 
-    // Post-build actions (optional)
     post {
-        success {
-            echo 'Build and push completed successfully!'
-        }
-        failure {
-            echo 'Build or push failed.'
+        always {
+            cleanWs()  // Clean workspace after the build
         }
     }
-}
+}
\ No newline at end of file

From 1f250e0476a27c33b934919976be0fc6e1bba8e4 Mon Sep 17 00:00:00 2001
From: Khalid Salman <khalid.salman1996@gmail.com>
Date: Tue, 1 Oct 2024 22:19:49 +0300
Subject: [PATCH 09/60] Add Jenkinsfile

---
 jenkinsfile | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/jenkinsfile b/jenkinsfile
index 3e823e9..9759a76 100644
--- a/jenkinsfile
+++ b/jenkinsfile
@@ -7,10 +7,7 @@ pipeline {
         DOCKER_HUB_PASSWORD = credentials('docker-hub-password')
     }
 
-    options {
-        // Example to delete the workspace before the build starts, similar to the option in the freestyle job.
-        deleteDir()
-    }
+
 
     stages {
         stage('Checkout') {

From e133c2b37f192edb9feda104a09229641b4daf3f Mon Sep 17 00:00:00 2001
From: Khalid Salman <khalid.salman1996@gmail.com>
Date: Tue, 1 Oct 2024 22:27:54 +0300
Subject: [PATCH 10/60] Add Jenkinsfile

---
 jenkinsfile | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/jenkinsfile b/jenkinsfile
index 9759a76..856426c 100644
--- a/jenkinsfile
+++ b/jenkinsfile
@@ -2,13 +2,11 @@
 pipeline {
     agent any
 
-    environment {
-        DOCKER_HUB_USERNAME = credentials('docker-hub-username')
-        DOCKER_HUB_PASSWORD = credentials('docker-hub-password')
+   environment {
+        DOCKER_HUB_CREDENTIALS = credentials('docker-Hub-credentials')
     }
 
 
-
     stages {
         stage('Checkout') {
             steps {
@@ -33,7 +31,7 @@ pipeline {
                 script {
                     sh '''
                     cd $WORKSPACE
-                    echo "$DOCKER_HUB_PASSWORD" | docker login -u "$DOCKER_HUB_USERNAME" --password-stdin
+                    echo "$DOCKER_HUB_CREDENTIALS_PSW" | docker login -u "$DOCKER_HUB_CREDENTIALS_USR" --password-stdin
                     docker-compose push
                     '''
                 }

From 6acc2c7170808a211c98a0f4c0addbd4bbe716fc Mon Sep 17 00:00:00 2001
From: Khalid Salman <khalid.salman1996@gmail.com>
Date: Tue, 1 Oct 2024 22:29:13 +0300
Subject: [PATCH 11/60] Add Jenkinsfile

---
 jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jenkinsfile b/jenkinsfile
index 856426c..2018c3b 100644
--- a/jenkinsfile
+++ b/jenkinsfile
@@ -3,7 +3,7 @@ pipeline {
     agent any
 
    environment {
-        DOCKER_HUB_CREDENTIALS = credentials('docker-Hub-credentials')
+        DOCKER_HUB_CREDENTIALS = credentials('dockerHub-token')
     }
 
 

From a96162d47d1c2d6633a4aaef453d9e70a2fe95b4 Mon Sep 17 00:00:00 2001
From: Khalid Salman <khalid.salman1996@gmail.com>
Date: Tue, 1 Oct 2024 22:32:26 +0300
Subject: [PATCH 12/60] Add Jenkinsfile

---
 jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jenkinsfile b/jenkinsfile
index 2018c3b..1c46e1d 100644
--- a/jenkinsfile
+++ b/jenkinsfile
@@ -10,7 +10,7 @@ pipeline {
     stages {
         stage('Checkout') {
             steps {
-                git url: 'https://github.com/username/DEPiProject.git', branch: 'master', credentialsId: 'github-personal-access-token'
+                git url: 'https://github.com/username/DEPiProject.git', branch: 'master', credentialsId: 'github-token'
             }
         }
 

From c9b4b84d03368ff1ceba7c03f367a816ba983f5a Mon Sep 17 00:00:00 2001
From: Khalid Salman <khalid.salman1996@gmail.com>
Date: Tue, 1 Oct 2024 22:34:23 +0300
Subject: [PATCH 13/60] Add Jenkinsfile

---
 jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jenkinsfile b/jenkinsfile
index 1c46e1d..aa5e76c 100644
--- a/jenkinsfile
+++ b/jenkinsfile
@@ -10,7 +10,7 @@ pipeline {
     stages {
         stage('Checkout') {
             steps {
-                git url: 'https://github.com/username/DEPiProject.git', branch: 'master', credentialsId: 'github-token'
+                git url: 'https://github.com/johnsamey/DEPI-Project.git', branch: 'master', credentialsId: 'github-token'
             }
         }
 

From 4d975a41db6aa7dc9016dfe9bc9b4e2f579ef64e Mon Sep 17 00:00:00 2001
From: johnsamey <johnsamyut@gmail.com>
Date: Tue, 1 Oct 2024 22:48:36 +0300
Subject: [PATCH 14/60] update jenkinsfile

---
 jenkinsfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jenkinsfile b/jenkinsfile
index aa5e76c..52f3f58 100644
--- a/jenkinsfile
+++ b/jenkinsfile
@@ -3,14 +3,14 @@ pipeline {
     agent any
 
    environment {
-        DOCKER_HUB_CREDENTIALS = credentials('dockerHub-token')
+        DOCKER_HUB_CREDENTIALS = credentials('docker-Hub-credentials')
     }
 
 
     stages {
         stage('Checkout') {
             steps {
-                git url: 'https://github.com/johnsamey/DEPI-Project.git', branch: 'master', credentialsId: 'github-token'
+                git url: 'https://github.com/johnsamey/DEPI-Project.git', branch: 'master', credentialsId: 'github'
             }
         }
 

From 7ebb7e6fc4622f8f71a8a623589f5595b67928dd Mon Sep 17 00:00:00 2001
From: johnsamey <johnsamyut@gmail.com>
Date: Tue, 1 Oct 2024 22:56:16 +0300
Subject: [PATCH 15/60] add email notification to the pipeline

---
 jenkinsfile | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/jenkinsfile b/jenkinsfile
index 52f3f58..2f770a5 100644
--- a/jenkinsfile
+++ b/jenkinsfile
@@ -44,6 +44,40 @@ pipeline {
     }
 
     post {
+        failure {
+            emailext(
+                subject: 'Build failed: ${JOB_NAME} [${BUILD_NUMBER}]',
+                body: '''Build failed in Jenkins:
+                - Job: ${JOB_NAME}
+                - Build number: ${BUILD_NUMBER}
+                - Check console output at: ${BUILD_URL}''',
+                recipientProviders: [[$class: 'DevelopersRecipientProvider'], [$class: 'RequesterRecipientProvider']],
+                to: 'mostafa77744333@gmail.com, johnhana567@gmail.com, khalid.salman1996@gmail.com, andrewadel3322@gmail.com',
+                attachLog: true
+            )
+        }
+        unstable {
+            emailext(
+                subject: 'Build unstable: ${JOB_NAME} [${BUILD_NUMBER}]',
+                body: '''The build is unstable:
+                - Job: ${JOB_NAME}
+                - Build number: ${BUILD_NUMBER}
+                - Check console output at: ${BUILD_URL}''',
+                to: 'mostafa77744333@gmail.com, johnhana567@gmail.com, khalid.salman1996@gmail.com, andrewadel3322@gmail.com',
+                attachLog: true
+            )
+        }
+        success {
+            emailext(
+                subject: 'Build successful: ${JOB_NAME} [${BUILD_NUMBER}]',
+                body: '''The build was successful:
+                - Job: ${JOB_NAME}
+                - Build number: ${BUILD_NUMBER}
+                - Check console output at: ${BUILD_URL}''',
+                to: 'mostafa77744333@gmail.com, johnhana567@gmail.com, khalid.salman1996@gmail.com, andrewadel3322@gmail.com',
+                attachLog: true
+            )
+        }
         always {
             cleanWs()  // Clean workspace after the build
         }

From d939c1c73a321ace4da8ada9f6d6b7c4c2759f37 Mon Sep 17 00:00:00 2001
From: johnsamey <johnsamyut@gmail.com>
Date: Tue, 1 Oct 2024 22:58:16 +0300
Subject: [PATCH 16/60] test failure jenkinsfile

---
 jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jenkinsfile b/jenkinsfile
index 2f770a5..a98664f 100644
--- a/jenkinsfile
+++ b/jenkinsfile
@@ -31,7 +31,7 @@ pipeline {
                 script {
                     sh '''
                     cd $WORKSPACE
-                    echo "$DOCKER_HUB_CREDENTIALS_PSW" | docker login -u "$DOCKER_HUB_CREDENTIALS_USR" --password-stdin
+                    echo "$DOCKER_CREDENTIALS_PSW" | docker login -u "$DOCKER_HUB_CREDENTIALS_USR" --password-stdin
                     docker-compose push
                     '''
                 }

From 26b3f8a92bd0089632d668ae45e22dbaf438b648 Mon Sep 17 00:00:00 2001
From: johnsamey <johnsamyut@gmail.com>
Date: Tue, 1 Oct 2024 23:04:45 +0300
Subject: [PATCH 17/60] test failure jenkinsfile

---
 jenkinsfile | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/jenkinsfile b/jenkinsfile
index a98664f..9bc45f1 100644
--- a/jenkinsfile
+++ b/jenkinsfile
@@ -1,7 +1,9 @@
 
 pipeline {
     agent any
-
+    options {
+        deleteDir()
+    }
    environment {
         DOCKER_HUB_CREDENTIALS = credentials('docker-Hub-credentials')
     }
@@ -78,8 +80,5 @@ pipeline {
                 attachLog: true
             )
         }
-        always {
-            cleanWs()  // Clean workspace after the build
-        }
     }
 }
\ No newline at end of file

From f53c39d61842fb8e5a39968d9cf679f0559deb62 Mon Sep 17 00:00:00 2001
From: johnsamey <johnsamyut@gmail.com>
Date: Tue, 1 Oct 2024 23:07:15 +0300
Subject: [PATCH 18/60] test failure jenkinsfile

---
 jenkinsfile | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/jenkinsfile b/jenkinsfile
index 9bc45f1..519310d 100644
--- a/jenkinsfile
+++ b/jenkinsfile
@@ -1,15 +1,18 @@
 
 pipeline {
     agent any
-    options {
-        deleteDir()
-    }
+
    environment {
         DOCKER_HUB_CREDENTIALS = credentials('docker-Hub-credentials')
     }
 
 
     stages {
+        stage('Cleanup') {
+            steps {
+                deleteDir()
+            }
+        }
         stage('Checkout') {
             steps {
                 git url: 'https://github.com/johnsamey/DEPI-Project.git', branch: 'master', credentialsId: 'github'

From 61e7f1f6c4dfdc6e8b41e3cb31c953f73f8a6bb7 Mon Sep 17 00:00:00 2001
From: johnsamey <johnsamyut@gmail.com>
Date: Tue, 1 Oct 2024 23:11:36 +0300
Subject: [PATCH 19/60] update

---
 jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jenkinsfile b/jenkinsfile
index 519310d..1be719b 100644
--- a/jenkinsfile
+++ b/jenkinsfile
@@ -36,7 +36,7 @@ pipeline {
                 script {
                     sh '''
                     cd $WORKSPACE
-                    echo "$DOCKER_CREDENTIALS_PSW" | docker login -u "$DOCKER_HUB_CREDENTIALS_USR" --password-stdin
+                    echo "$DOCKER_HUB_CREDENTIALS_PSW" | docker login -u "$DOCKER_HUB_CREDENTIALS_USR" --password-stdin
                     docker-compose push
                     '''
                 }

From a5702065e9f1bf49f3b8f2dfc4285bccbc22c577 Mon Sep 17 00:00:00 2001
From: johnsamey <johnsamyut@gmail.com>
Date: Wed, 2 Oct 2024 04:11:23 +0300
Subject: [PATCH 20/60] modify jenkinsfile

---
 jenkinsfile | 91 ++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 58 insertions(+), 33 deletions(-)

diff --git a/jenkinsfile b/jenkinsfile
index 1be719b..adbe756 100644
--- a/jenkinsfile
+++ b/jenkinsfile
@@ -47,41 +47,66 @@ pipeline {
     triggers {
         pollSCM('H/5 * * * *')  // Poll SCM every 5 minutes (adjust as needed)
     }
-
     post {
-        failure {
-            emailext(
-                subject: 'Build failed: ${JOB_NAME} [${BUILD_NUMBER}]',
-                body: '''Build failed in Jenkins:
-                - Job: ${JOB_NAME}
-                - Build number: ${BUILD_NUMBER}
-                - Check console output at: ${BUILD_URL}''',
-                recipientProviders: [[$class: 'DevelopersRecipientProvider'], [$class: 'RequesterRecipientProvider']],
-                to: 'mostafa77744333@gmail.com, johnhana567@gmail.com, khalid.salman1996@gmail.com, andrewadel3322@gmail.com',
-                attachLog: true
-            )
-        }
-        unstable {
-            emailext(
-                subject: 'Build unstable: ${JOB_NAME} [${BUILD_NUMBER}]',
-                body: '''The build is unstable:
-                - Job: ${JOB_NAME}
-                - Build number: ${BUILD_NUMBER}
-                - Check console output at: ${BUILD_URL}''',
-                to: 'mostafa77744333@gmail.com, johnhana567@gmail.com, khalid.salman1996@gmail.com, andrewadel3322@gmail.com',
-                attachLog: true
-            )
+        always {
+            script {
+                emailext subject: "Jenkins Job: ${env.JOB_NAME} #${env.BUILD_NUMBER} - ${currentBuild.currentResult}",
+                         body: """
+                             Job Name: ${env.JOB_NAME}
+                             Build Number: ${env.BUILD_NUMBER}
+                             Build Status: ${currentBuild.currentResult}
+                             Build URL: ${env.BUILD_URL}
+                         """,
+                         recipientProviders: [[$class: 'DevelopersRecipientProvider'], [$class: 'RequesterRecipientProvider']],
+                         to: 'johnhana567@gmail.com'
+            }
         }
         success {
-            emailext(
-                subject: 'Build successful: ${JOB_NAME} [${BUILD_NUMBER}]',
-                body: '''The build was successful:
-                - Job: ${JOB_NAME}
-                - Build number: ${BUILD_NUMBER}
-                - Check console output at: ${BUILD_URL}''',
-                to: 'mostafa77744333@gmail.com, johnhana567@gmail.com, khalid.salman1996@gmail.com, andrewadel3322@gmail.com',
-                attachLog: true
-            )
+            emailext subject: "SUCCESS: ${env.JOB_NAME} #${env.BUILD_NUMBER}",
+                     body: "Good news, the build was successful!",
+                     to: 'johnhana567@gmail.com'
+        }
+        failure {
+            emailext subject: "FAILURE: ${env.JOB_NAME} #${env.BUILD_NUMBER}",
+                     body: "Unfortunately, the build has failed.",
+                     to: 'johnhana567@gmail.com'
         }
     }
-}
\ No newline at end of file
+}
+
+// post {
+//         failure {
+//             emailext(
+//                 subject: 'Build failed: ${JOB_NAME} [${BUILD_NUMBER}]',
+//                 body: '''Build failed in Jenkins:
+//                 - Job: ${JOB_NAME}
+//                 - Build number: ${BUILD_NUMBER}
+//                 - Check console output at: ${BUILD_URL}''',
+//                 recipientProviders: [[$class: 'DevelopersRecipientProvider'], [$class: 'RequesterRecipientProvider']],
+//                 to: 'mostafa77744333@gmail.com, johnhana567@gmail.com, khalid.salman1996@gmail.com, andrewadel3322@gmail.com',
+//                 attachLog: true
+//             )
+//         }
+//         unstable {
+//             emailext(
+//                 subject: 'Build unstable: ${JOB_NAME} [${BUILD_NUMBER}]',
+//                 body: '''The build is unstable:
+//                 - Job: ${JOB_NAME}
+//                 - Build number: ${BUILD_NUMBER}
+//                 - Check console output at: ${BUILD_URL}''',
+//                 to: 'mostafa77744333@gmail.com, johnhana567@gmail.com, khalid.salman1996@gmail.com, andrewadel3322@gmail.com',
+//                 attachLog: true
+//             )
+//         }
+//         success {
+//             emailext(
+//                 subject: 'Build successful: ${JOB_NAME} [${BUILD_NUMBER}]',
+//                 body: '''The build was successful:
+//                 - Job: ${JOB_NAME}
+//                 - Build number: ${BUILD_NUMBER}
+//                 - Check console output at: ${BUILD_URL}''',
+//                 to: 'mostafa77744333@gmail.com, johnhana567@gmail.com, khalid.salman1996@gmail.com, andrewadel3322@gmail.com',
+//                 attachLog: true
+//             )
+//         }
+//     }
\ No newline at end of file

From 553af293732a8e724f21a25d87d705ac2d16255f Mon Sep 17 00:00:00 2001
From: johnsamey <johnsamyut@gmail.com>
Date: Wed, 2 Oct 2024 04:39:08 +0300
Subject: [PATCH 21/60] modify jenkinsfile

---
 jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jenkinsfile b/jenkinsfile
index adbe756..a7a7c6e 100644
--- a/jenkinsfile
+++ b/jenkinsfile
@@ -25,7 +25,7 @@ pipeline {
                     sh '''
                     cd $WORKSPACE
                     docker-compose build
-                    docker tag depi-project-app:latest joshman/depi-project-app:latest
+                    docker tag depi-project-app:latest johnsami/dockerized-app-build-app:latest
                     '''
                 }
             }

From 6c9bf70e65be6f0676d52e6917ee162e837b2acd Mon Sep 17 00:00:00 2001
From: johnsamey <johnsamyut@gmail.com>
Date: Wed, 2 Oct 2024 04:41:44 +0300
Subject: [PATCH 22/60] modify jenkinsfile

---
 jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jenkinsfile b/jenkinsfile
index a7a7c6e..cbafa3d 100644
--- a/jenkinsfile
+++ b/jenkinsfile
@@ -25,7 +25,7 @@ pipeline {
                     sh '''
                     cd $WORKSPACE
                     docker-compose build
-                    docker tag depi-project-app:latest johnsami/dockerized-app-build-app:latest
+                    docker tag dockerized-app-build-app johnsami/dockerized-app-build-app:latest
                     '''
                 }
             }

From 27e455bc2b8d8ca823ad04c1b2fb875280afa29b Mon Sep 17 00:00:00 2001
From: johnsamey <johnsamyut@gmail.com>
Date: Wed, 2 Oct 2024 04:44:40 +0300
Subject: [PATCH 23/60] modify jenkinsfile

---
 jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jenkinsfile b/jenkinsfile
index cbafa3d..3978e2b 100644
--- a/jenkinsfile
+++ b/jenkinsfile
@@ -31,7 +31,7 @@ pipeline {
             }
         }
 
-        stage('Push to Docker Hub') {
+        stage('Push to Docker-Hub') {
             steps {
                 script {
                     sh '''

From 4eff53c1353fb3cbf86afc144638cce3fcf6ad62 Mon Sep 17 00:00:00 2001
From: johnsamey <johnsamyut@gmail.com>
Date: Wed, 2 Oct 2024 04:45:54 +0300
Subject: [PATCH 24/60] modify jenkinsfile

---
 jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jenkinsfile b/jenkinsfile
index 3978e2b..71478d3 100644
--- a/jenkinsfile
+++ b/jenkinsfile
@@ -25,7 +25,7 @@ pipeline {
                     sh '''
                     cd $WORKSPACE
                     docker-compose build
-                    docker tag dockerized-app-build-app johnsami/dockerized-app-build-app:latest
+                    docker tag johnsami/dockerized-app-build-app johnsami/dockerized-app-build-app:latest
                     '''
                 }
             }

From 6b273458792221a6ef1c42037433e23c42f2c20f Mon Sep 17 00:00:00 2001
From: johnsamey <johnsamyut@gmail.com>
Date: Wed, 2 Oct 2024 18:30:08 +0300
Subject: [PATCH 25/60] update jenkinsfile

---
 jenkinsfile | 73 +++++++++++++++++++++++++++++++++++------------------
 1 file changed, 49 insertions(+), 24 deletions(-)

diff --git a/jenkinsfile b/jenkinsfile
index 71478d3..8175147 100644
--- a/jenkinsfile
+++ b/jenkinsfile
@@ -36,7 +36,7 @@ pipeline {
                 script {
                     sh '''
                     cd $WORKSPACE
-                    echo "$DOCKER_HUB_CREDENTIALS_PSW" | docker login -u "$DOCKER_HUB_CREDENTIALS_USR" --password-stdin
+                    echo "$DOCKER_CREDENTIALS_PSW" | docker login -u "$DOCKER_HUB_CREDENTIALS_USR" --password-stdin
                     docker-compose push
                     '''
                 }
@@ -45,31 +45,28 @@ pipeline {
     }
 
     triggers {
-        pollSCM('H/5 * * * *')  // Poll SCM every 5 minutes (adjust as needed)
+        pollSCM('H/5 * * * *') 
     }
     post {
-        always {
-            script {
-                emailext subject: "Jenkins Job: ${env.JOB_NAME} #${env.BUILD_NUMBER} - ${currentBuild.currentResult}",
-                         body: """
-                             Job Name: ${env.JOB_NAME}
-                             Build Number: ${env.BUILD_NUMBER}
-                             Build Status: ${currentBuild.currentResult}
-                             Build URL: ${env.BUILD_URL}
-                         """,
-                         recipientProviders: [[$class: 'DevelopersRecipientProvider'], [$class: 'RequesterRecipientProvider']],
-                         to: 'johnhana567@gmail.com'
-            }
-        }
-        success {
-            emailext subject: "SUCCESS: ${env.JOB_NAME} #${env.BUILD_NUMBER}",
-                     body: "Good news, the build was successful!",
-                     to: 'johnhana567@gmail.com'
-        }
         failure {
-            emailext subject: "FAILURE: ${env.JOB_NAME} #${env.BUILD_NUMBER}",
-                     body: "Unfortunately, the build has failed.",
-                     to: 'johnhana567@gmail.com'
+            emailext(
+                to: 'mostafa777444333@gmail.com, johnhnana567@gmail.com, khalid.salman1996@gmail.com',
+                subject: 'Build failed in Jenkins: ${JOB_NAME} - Build #${BUILD_NUMBER}',
+                body: """<p>Build failed in Jenkins:</p>
+                         <p>Job: ${JOB_NAME} - Build #${BUILD_NUMBER}</p>
+                         <p>Check console output at <a href="${BUILD_URL}">${BUILD_URL}</a></p>""",
+                attachLog: true
+            )
+        }
+        unstable {
+            emailext(
+                to: 'mostafa777444333@gmail.com, johnhnana567@gmail.com, khalid.salman1996@gmail.com',
+                subject: 'Build is unstable: ${JOB_NAME} - Build #${BUILD_NUMBER}',
+                body: """<p>Build is unstable:</p>
+                         <p>Job: ${JOB_NAME} - Build #${BUILD_NUMBER}</p>
+                         <p>Check console output at <a href="${BUILD_URL}">${BUILD_URL}</a></p>""",
+                attachLog: true
+            )
         }
     }
 }
@@ -109,4 +106,32 @@ pipeline {
 //                 attachLog: true
 //             )
 //         }
-//     }
\ No newline at end of file
+//     }
+
+
+
+    // post {
+    //     always {
+    //         script {
+    //             emailext subject: "Jenkins Job: ${env.JOB_NAME} #${env.BUILD_NUMBER} - ${currentBuild.currentResult}",
+    //                      body: """
+    //                          Job Name: ${env.JOB_NAME}
+    //                          Build Number: ${env.BUILD_NUMBER}
+    //                          Build Status: ${currentBuild.currentResult}
+    //                          Build URL: ${env.BUILD_URL}
+    //                      """,
+    //                      recipientProviders: [[$class: 'DevelopersRecipientProvider'], [$class: 'RequesterRecipientProvider']],
+    //                      to: 'johnhana567@gmail.com'
+    //         }
+    //     }
+    //     success {
+    //         emailext subject: "SUCCESS: ${env.JOB_NAME} #${env.BUILD_NUMBER}",
+    //                  body: "Good news, the build was successful!",
+    //                  to: 'johnhana567@gmail.com'
+    //     }
+    //     failure {
+    //         emailext subject: "FAILURE: ${env.JOB_NAME} #${env.BUILD_NUMBER}",
+    //                  body: "Unfortunately, the build has failed.",
+    //                  to: 'johnhana567@gmail.com'
+    //     }
+    // }
\ No newline at end of file

From 11a58eabcbc5d9fbfabce9607690c70745b29206 Mon Sep 17 00:00:00 2001
From: johnsamey <johnsamyut@gmail.com>
Date: Wed, 2 Oct 2024 18:33:11 +0300
Subject: [PATCH 26/60] update jenkinsfile

---
 jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jenkinsfile b/jenkinsfile
index 8175147..dd1665c 100644
--- a/jenkinsfile
+++ b/jenkinsfile
@@ -36,7 +36,7 @@ pipeline {
                 script {
                     sh '''
                     cd $WORKSPACE
-                    echo "$DOCKER_CREDENTIALS_PSW" | docker login -u "$DOCKER_HUB_CREDENTIALS_USR" --password-stdin
+                    echo "$DOCKER_HUB_CREDENTIALS_PSW" | docker login -u "$DOCKER_HUB_CREDENTIALS_USR" --password-stdin
                     docker-compose push
                     '''
                 }

From eefdddf073916d326f80d0cf2ee0fec0a60a8bbe Mon Sep 17 00:00:00 2001
From: johnsamey <johnsamyut@gmail.com>
Date: Wed, 2 Oct 2024 19:14:18 +0300
Subject: [PATCH 27/60] update jenkinsfile

---
 jenkinsfile | 33 ++++++++++++++++++++++++++++-----
 1 file changed, 28 insertions(+), 5 deletions(-)

diff --git a/jenkinsfile b/jenkinsfile
index dd1665c..b504d6d 100644
--- a/jenkinsfile
+++ b/jenkinsfile
@@ -1,31 +1,52 @@
-
 pipeline {
     agent any
 
-   environment {
+    environment {
         DOCKER_HUB_CREDENTIALS = credentials('docker-Hub-credentials')
+        DOCKER_IMAGE_NAME = 'johnsami/dockerized-app-build-app'
+        DOCKER_IMAGE_TAG = 'latest'
     }
 
-
     stages {
         stage('Cleanup') {
             steps {
                 deleteDir()
             }
         }
+
         stage('Checkout') {
             steps {
                 git url: 'https://github.com/johnsamey/DEPI-Project.git', branch: 'master', credentialsId: 'github'
             }
         }
 
+        stage('Prepare Docker Image') {
+            steps {
+                script {
+                    sh '''
+                    cd $WORKSPACE
+                    
+                    # Check if the Docker image exists
+                    IMAGE_EXISTS=$(docker images -q $DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG)
+                    
+                    if [ -n "$IMAGE_EXISTS" ]; then
+                        echo "Docker image exists. Deleting existing image..."
+                        docker rmi $DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG
+                    else
+                        echo "Docker image does not exist. Proceeding to build a new image..."
+                    fi
+                    '''
+                }
+            }
+        }
+
         stage('Build Docker Image') {
             steps {
                 script {
                     sh '''
                     cd $WORKSPACE
                     docker-compose build
-                    docker tag johnsami/dockerized-app-build-app johnsami/dockerized-app-build-app:latest
+                    docker tag $DOCKER_IMAGE_NAME $DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG
                     '''
                 }
             }
@@ -45,8 +66,9 @@ pipeline {
     }
 
     triggers {
-        pollSCM('H/5 * * * *') 
+        pollSCM('H/5 * * * *') // Poll GitHub every 5 minutes
     }
+
     post {
         failure {
             emailext(
@@ -71,6 +93,7 @@ pipeline {
     }
 }
 
+
 // post {
 //         failure {
 //             emailext(

From 2c36fc6dc259b669418dfbde953aadcb8cca6c13 Mon Sep 17 00:00:00 2001
From: johnsamey <johnsamyut@gmail.com>
Date: Wed, 2 Oct 2024 19:17:48 +0300
Subject: [PATCH 28/60] update jenkinsfile

---
 jenkinsfile | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/jenkinsfile b/jenkinsfile
index b504d6d..fbca3ac 100644
--- a/jenkinsfile
+++ b/jenkinsfile
@@ -90,6 +90,17 @@ pipeline {
                 attachLog: true
             )
         }
+        success {
+            emailext(
+                subject: 'Build successful: ${JOB_NAME} [${BUILD_NUMBER}]',
+                body: '''The build was successful:
+                - Job: ${JOB_NAME}
+                - Build number: ${BUILD_NUMBER}
+                - Check console output at: ${BUILD_URL}''',
+                to: 'mostafa77744333@gmail.com, johnhana567@gmail.com, khalid.salman1996@gmail.com, andrewadel3322@gmail.com',
+                attachLog: true
+            )
+        }
     }
 }
 

From b3f5378ed2d201766024b72a8b137140e7c11be0 Mon Sep 17 00:00:00 2001
From: Andrew Adel <andrewadel3322@gmail.com>
Date: Wed, 2 Oct 2024 19:34:20 +0300
Subject: [PATCH 29/60] add always test email

---
 jenkinsfile | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/jenkinsfile b/jenkinsfile
index fbca3ac..3bb6115 100644
--- a/jenkinsfile
+++ b/jenkinsfile
@@ -70,9 +70,18 @@ pipeline {
     }
 
     post {
+        always {
+            emailext(
+                to: 'mostafa77744333@gmail.com, johnhana567@gmail.com, khalid.salman1996@gmail.com, andrewadel3322@gmail.com',
+                subject: 'Test Email from Jenkins',
+                body: 'This is a test email to verify Jenkins email notifications.',
+                attachLog: false
+            )
+        }
+
         failure {
             emailext(
-                to: 'mostafa777444333@gmail.com, johnhnana567@gmail.com, khalid.salman1996@gmail.com',
+                to: 'mostafa77744333@gmail.com, johnhana567@gmail.com, khalid.salman1996@gmail.com, andrewadel3322@gmail.com',
                 subject: 'Build failed in Jenkins: ${JOB_NAME} - Build #${BUILD_NUMBER}',
                 body: """<p>Build failed in Jenkins:</p>
                          <p>Job: ${JOB_NAME} - Build #${BUILD_NUMBER}</p>
@@ -82,8 +91,7 @@ pipeline {
         }
         unstable {
             emailext(
-                to: 'mostafa777444333@gmail.com, johnhnana567@gmail.com, khalid.salman1996@gmail.com',
-                subject: 'Build is unstable: ${JOB_NAME} - Build #${BUILD_NUMBER}',
+                to: 'mostafa77744333@gmail.com, johnhana567@gmail.com, khalid.salman1996@gmail.com, andrewadel3322@gmail.com',
                 body: """<p>Build is unstable:</p>
                          <p>Job: ${JOB_NAME} - Build #${BUILD_NUMBER}</p>
                          <p>Check console output at <a href="${BUILD_URL}">${BUILD_URL}</a></p>""",
@@ -102,6 +110,9 @@ pipeline {
             )
         }
     }
+
+
+
 }
 
 

From e47cda87d81d3d5e3b1b00c13989e7b2c65ef606 Mon Sep 17 00:00:00 2001
From: Andrew Adel <andrewadel3322@gmail.com>
Date: Wed, 2 Oct 2024 19:36:22 +0300
Subject: [PATCH 30/60] add subject for email

---
 jenkinsfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jenkinsfile b/jenkinsfile
index 3bb6115..dbd4fbc 100644
--- a/jenkinsfile
+++ b/jenkinsfile
@@ -92,6 +92,7 @@ pipeline {
         unstable {
             emailext(
                 to: 'mostafa77744333@gmail.com, johnhana567@gmail.com, khalid.salman1996@gmail.com, andrewadel3322@gmail.com',
+                subject: 'Build failed in Jenkins: ${JOB_NAME} - Build #${BUILD_NUMBER}',
                 body: """<p>Build is unstable:</p>
                          <p>Job: ${JOB_NAME} - Build #${BUILD_NUMBER}</p>
                          <p>Check console output at <a href="${BUILD_URL}">${BUILD_URL}</a></p>""",

From 95f2a735d8f803c50c94a1a251fc29970a418668 Mon Sep 17 00:00:00 2001
From: Khalid Salman <khalid.salman1996@gmail.com>
Date: Wed, 2 Oct 2024 19:39:02 +0300
Subject: [PATCH 31/60] Updated Jenkinsfile for testing

---
 jenkinsfile | 212 +++++++++++++++++++++++++++-------------------------
 1 file changed, 112 insertions(+), 100 deletions(-)

diff --git a/jenkinsfile b/jenkinsfile
index dbd4fbc..1445b5c 100644
--- a/jenkinsfile
+++ b/jenkinsfile
@@ -1,119 +1,131 @@
 pipeline {
-    agent any
-
-    environment {
-        DOCKER_HUB_CREDENTIALS = credentials('docker-Hub-credentials')
-        DOCKER_IMAGE_NAME = 'johnsami/dockerized-app-build-app'
-        DOCKER_IMAGE_TAG = 'latest'
+  agent any
+
+  environment {
+    DOCKER_HUB_CREDENTIALS = credentials('docker-Hub-credentials')
+    DOCKER_IMAGE_NAME = 'johnsami/dockerized-app-build-app'
+    DOCKER_IMAGE_TAG = 'latest'
+  }
+
+  stages {
+    stage('Cleanup') {
+      steps {
+        deleteDir()
+      }
     }
 
-    stages {
-        stage('Cleanup') {
-            steps {
-                deleteDir()
-            }
-        }
-
-        stage('Checkout') {
-            steps {
-                git url: 'https://github.com/johnsamey/DEPI-Project.git', branch: 'master', credentialsId: 'github'
-            }
-        }
+    stage('Checkout') {
+      steps {
+        git url: 'https://github.com/johnsamey/DEPI-Project.git', branch: 'master', credentialsId: 'github'
+      }
+    }
 
-        stage('Prepare Docker Image') {
-            steps {
-                script {
-                    sh '''
-                    cd $WORKSPACE
-                    
-                    # Check if the Docker image exists
-                    IMAGE_EXISTS=$(docker images -q $DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG)
-                    
-                    if [ -n "$IMAGE_EXISTS" ]; then
-                        echo "Docker image exists. Deleting existing image..."
-                        docker rmi $DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG
-                    else
-                        echo "Docker image does not exist. Proceeding to build a new image..."
-                    fi
-                    '''
-                }
-            }
+    // Optional Stage for Dependency Installation
+    stage('Install Dependencies (Optional)') {
+      when {
+        expression { // Add a condition to run this stage if needed (e.g., when you have external libraries)
+          return projectHasDependencies() // Replace with your logic to check for dependencies
         }
+      }
+      steps {
+        sh 'pip install -r requirements.txt' // Example for installing dependencies from a requirements file
+      }
+    }
 
-        stage('Build Docker Image') {
-            steps {
-                script {
-                    sh '''
-                    cd $WORKSPACE
-                    docker-compose build
-                    docker tag $DOCKER_IMAGE_NAME $DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG
-                    '''
-                }
-            }
+    stage('Prepare Docker Image (Optional)') {
+      steps {
+        script {
+          """
+          cd $WORKSPACE
+
+          # Check if the Docker image exists (Optional)
+          IMAGE_EXISTS=$(docker images -q $DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG)
+          if [ -n "$IMAGE_EXISTS" ]; then
+            echo "Docker image exists. Skipping build..."
+          else
+            echo "Docker image does not exist. Proceeding to build..."
+          fi
+          """
         }
+      }
+    }
 
-        stage('Push to Docker-Hub') {
-            steps {
-                script {
-                    sh '''
-                    cd $WORKSPACE
-                    echo "$DOCKER_HUB_CREDENTIALS_PSW" | docker login -u "$DOCKER_HUB_CREDENTIALS_USR" --password-stdin
-                    docker-compose push
-                    '''
-                }
-            }
+    stage('Build Docker Image') {
+      steps {
+        script {
+          """
+          cd $WORKSPACE
+          docker-compose build
+          docker tag $DOCKER_IMAGE_NAME $DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG
+          """
         }
+      }
     }
 
-    triggers {
-        pollSCM('H/5 * * * *') // Poll GitHub every 5 minutes
+    stage('Run Unit Tests') {
+      steps {
+        // Assuming your tests are in DEPI-Project/tests
+        sh 'pytest DEPI-Project/tests --junitxml=junit-test-results.xml'  // Generate JUnit XML report
+      }
     }
 
-    post {
-        always {
-            emailext(
-                to: 'mostafa77744333@gmail.com, johnhana567@gmail.com, khalid.salman1996@gmail.com, andrewadel3322@gmail.com',
-                subject: 'Test Email from Jenkins',
-                body: 'This is a test email to verify Jenkins email notifications.',
-                attachLog: false
-            )
-        }
+    stage('Publish Test Results') {
+      steps {
+        // Assuming you have the JUnit Plugin installed
+        junit testResults: 'junit-test-results.xml'
+      }
+    }
 
-        failure {
-            emailext(
-                to: 'mostafa77744333@gmail.com, johnhana567@gmail.com, khalid.salman1996@gmail.com, andrewadel3322@gmail.com',
-                subject: 'Build failed in Jenkins: ${JOB_NAME} - Build #${BUILD_NUMBER}',
-                body: """<p>Build failed in Jenkins:</p>
-                         <p>Job: ${JOB_NAME} - Build #${BUILD_NUMBER}</p>
-                         <p>Check console output at <a href="${BUILD_URL}">${BUILD_URL}</a></p>""",
-                attachLog: true
-            )
-        }
-        unstable {
-            emailext(
-                to: 'mostafa77744333@gmail.com, johnhana567@gmail.com, khalid.salman1996@gmail.com, andrewadel3322@gmail.com',
-                subject: 'Build failed in Jenkins: ${JOB_NAME} - Build #${BUILD_NUMBER}',
-                body: """<p>Build is unstable:</p>
-                         <p>Job: ${JOB_NAME} - Build #${BUILD_NUMBER}</p>
-                         <p>Check console output at <a href="${BUILD_URL}">${BUILD_URL}</a></p>""",
-                attachLog: true
-            )
-        }
-        success {
-            emailext(
-                subject: 'Build successful: ${JOB_NAME} [${BUILD_NUMBER}]',
-                body: '''The build was successful:
-                - Job: ${JOB_NAME}
-                - Build number: ${BUILD_NUMBER}
-                - Check console output at: ${BUILD_URL}''',
-                to: 'mostafa77744333@gmail.com, johnhana567@gmail.com, khalid.salman1996@gmail.com, andrewadel3322@gmail.com',
-                attachLog: true
-            )
+    stage('Push to Docker-Hub') {
+      steps {
+        script {
+          """
+          cd $WORKSPACE
+          echo "$DOCKER_HUB_CREDENTIALS_PSW" | docker login -u "$DOCKER_HUB_CREDENTIALS_USR" --password-stdin
+          docker-compose push
+          """
         }
+      }
     }
-
-
-
+  }
+
+  triggers {
+    pollSCM('H/5 * * * *') // Poll GitHub every 5 minutes
+  }
+
+  post {
+    failure {
+      emailext(
+        to: 'mostafa777444333@gmail.com, johnhnana567@gmail.com, khalid.salman1996@gmail.com',
+        subject: 'Build failed in Jenkins: ${JOB_NAME} - Build #${BUILD_NUMBER}',
+        body: """<p>Build failed in Jenkins:</p>
+                   <p>Job: ${JOB_NAME} - Build #${BUILD_NUMBER}</p>
+                   <p>Check console output at <a href="${BUILD_URL}">${BUILD_URL}</a></p>""",
+        attachLog: true
+      )
+    }
+    unstable {
+      emailext(
+        to: 'mostafa777444333@gmail.com, johnhnana567@gmail.com, khalid.salman1996@gmail.com',
+        subject: 'Build is unstable: ${JOB_NAME} - Build #${BUILD_NUMBER}',
+        body: """<p>Build is unstable:</p>
+                   <p>Job: ${JOB_NAME} - Build #${BUILD_NUMBER}</p>
+                   <p>Check console output at <a href="${BUILD_URL}">${BUILD_URL}</a></p>""",
+        attachLog: true
+      )
+    }
+    success {
+      emailext(
+        subject: 'Build successful: ${JOB_NAME} [${BUILD_NUMBER}]',
+        body: '''The build was successful:
+                   - Job: ${JOB_NAME}
+                   - Build number: ${BUILD_NUMBER}
+                   - Check console output at: ${BUILD_URL}''',
+        to: 'mostafa777444333@gmail.com, johnhana567@gmail.com, khalid.salman1996@gmail.com, andrewadel3322@gmail.com',
+        attachLog: true
+      )
+    }
+  }
 }
 
 

From d5a1d4cb42db98ceeacf613b5f454a84034d1249 Mon Sep 17 00:00:00 2001
From: Andrew Adel <andrewadel3322@gmail.com>
Date: Wed, 2 Oct 2024 19:42:17 +0300
Subject: [PATCH 32/60] return to the LTS

---
 jenkinsfile | 212 +++++++++++++++++++++++++---------------------------
 1 file changed, 100 insertions(+), 112 deletions(-)

diff --git a/jenkinsfile b/jenkinsfile
index 1445b5c..dbd4fbc 100644
--- a/jenkinsfile
+++ b/jenkinsfile
@@ -1,131 +1,119 @@
 pipeline {
-  agent any
-
-  environment {
-    DOCKER_HUB_CREDENTIALS = credentials('docker-Hub-credentials')
-    DOCKER_IMAGE_NAME = 'johnsami/dockerized-app-build-app'
-    DOCKER_IMAGE_TAG = 'latest'
-  }
-
-  stages {
-    stage('Cleanup') {
-      steps {
-        deleteDir()
-      }
-    }
+    agent any
 
-    stage('Checkout') {
-      steps {
-        git url: 'https://github.com/johnsamey/DEPI-Project.git', branch: 'master', credentialsId: 'github'
-      }
+    environment {
+        DOCKER_HUB_CREDENTIALS = credentials('docker-Hub-credentials')
+        DOCKER_IMAGE_NAME = 'johnsami/dockerized-app-build-app'
+        DOCKER_IMAGE_TAG = 'latest'
     }
 
-    // Optional Stage for Dependency Installation
-    stage('Install Dependencies (Optional)') {
-      when {
-        expression { // Add a condition to run this stage if needed (e.g., when you have external libraries)
-          return projectHasDependencies() // Replace with your logic to check for dependencies
+    stages {
+        stage('Cleanup') {
+            steps {
+                deleteDir()
+            }
         }
-      }
-      steps {
-        sh 'pip install -r requirements.txt' // Example for installing dependencies from a requirements file
-      }
-    }
 
-    stage('Prepare Docker Image (Optional)') {
-      steps {
-        script {
-          """
-          cd $WORKSPACE
-
-          # Check if the Docker image exists (Optional)
-          IMAGE_EXISTS=$(docker images -q $DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG)
-          if [ -n "$IMAGE_EXISTS" ]; then
-            echo "Docker image exists. Skipping build..."
-          else
-            echo "Docker image does not exist. Proceeding to build..."
-          fi
-          """
+        stage('Checkout') {
+            steps {
+                git url: 'https://github.com/johnsamey/DEPI-Project.git', branch: 'master', credentialsId: 'github'
+            }
         }
-      }
-    }
 
-    stage('Build Docker Image') {
-      steps {
-        script {
-          """
-          cd $WORKSPACE
-          docker-compose build
-          docker tag $DOCKER_IMAGE_NAME $DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG
-          """
+        stage('Prepare Docker Image') {
+            steps {
+                script {
+                    sh '''
+                    cd $WORKSPACE
+                    
+                    # Check if the Docker image exists
+                    IMAGE_EXISTS=$(docker images -q $DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG)
+                    
+                    if [ -n "$IMAGE_EXISTS" ]; then
+                        echo "Docker image exists. Deleting existing image..."
+                        docker rmi $DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG
+                    else
+                        echo "Docker image does not exist. Proceeding to build a new image..."
+                    fi
+                    '''
+                }
+            }
         }
-      }
-    }
 
-    stage('Run Unit Tests') {
-      steps {
-        // Assuming your tests are in DEPI-Project/tests
-        sh 'pytest DEPI-Project/tests --junitxml=junit-test-results.xml'  // Generate JUnit XML report
-      }
+        stage('Build Docker Image') {
+            steps {
+                script {
+                    sh '''
+                    cd $WORKSPACE
+                    docker-compose build
+                    docker tag $DOCKER_IMAGE_NAME $DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG
+                    '''
+                }
+            }
+        }
+
+        stage('Push to Docker-Hub') {
+            steps {
+                script {
+                    sh '''
+                    cd $WORKSPACE
+                    echo "$DOCKER_HUB_CREDENTIALS_PSW" | docker login -u "$DOCKER_HUB_CREDENTIALS_USR" --password-stdin
+                    docker-compose push
+                    '''
+                }
+            }
+        }
     }
 
-    stage('Publish Test Results') {
-      steps {
-        // Assuming you have the JUnit Plugin installed
-        junit testResults: 'junit-test-results.xml'
-      }
+    triggers {
+        pollSCM('H/5 * * * *') // Poll GitHub every 5 minutes
     }
 
-    stage('Push to Docker-Hub') {
-      steps {
-        script {
-          """
-          cd $WORKSPACE
-          echo "$DOCKER_HUB_CREDENTIALS_PSW" | docker login -u "$DOCKER_HUB_CREDENTIALS_USR" --password-stdin
-          docker-compose push
-          """
+    post {
+        always {
+            emailext(
+                to: 'mostafa77744333@gmail.com, johnhana567@gmail.com, khalid.salman1996@gmail.com, andrewadel3322@gmail.com',
+                subject: 'Test Email from Jenkins',
+                body: 'This is a test email to verify Jenkins email notifications.',
+                attachLog: false
+            )
+        }
+
+        failure {
+            emailext(
+                to: 'mostafa77744333@gmail.com, johnhana567@gmail.com, khalid.salman1996@gmail.com, andrewadel3322@gmail.com',
+                subject: 'Build failed in Jenkins: ${JOB_NAME} - Build #${BUILD_NUMBER}',
+                body: """<p>Build failed in Jenkins:</p>
+                         <p>Job: ${JOB_NAME} - Build #${BUILD_NUMBER}</p>
+                         <p>Check console output at <a href="${BUILD_URL}">${BUILD_URL}</a></p>""",
+                attachLog: true
+            )
+        }
+        unstable {
+            emailext(
+                to: 'mostafa77744333@gmail.com, johnhana567@gmail.com, khalid.salman1996@gmail.com, andrewadel3322@gmail.com',
+                subject: 'Build failed in Jenkins: ${JOB_NAME} - Build #${BUILD_NUMBER}',
+                body: """<p>Build is unstable:</p>
+                         <p>Job: ${JOB_NAME} - Build #${BUILD_NUMBER}</p>
+                         <p>Check console output at <a href="${BUILD_URL}">${BUILD_URL}</a></p>""",
+                attachLog: true
+            )
+        }
+        success {
+            emailext(
+                subject: 'Build successful: ${JOB_NAME} [${BUILD_NUMBER}]',
+                body: '''The build was successful:
+                - Job: ${JOB_NAME}
+                - Build number: ${BUILD_NUMBER}
+                - Check console output at: ${BUILD_URL}''',
+                to: 'mostafa77744333@gmail.com, johnhana567@gmail.com, khalid.salman1996@gmail.com, andrewadel3322@gmail.com',
+                attachLog: true
+            )
         }
-      }
-    }
-  }
-
-  triggers {
-    pollSCM('H/5 * * * *') // Poll GitHub every 5 minutes
-  }
-
-  post {
-    failure {
-      emailext(
-        to: 'mostafa777444333@gmail.com, johnhnana567@gmail.com, khalid.salman1996@gmail.com',
-        subject: 'Build failed in Jenkins: ${JOB_NAME} - Build #${BUILD_NUMBER}',
-        body: """<p>Build failed in Jenkins:</p>
-                   <p>Job: ${JOB_NAME} - Build #${BUILD_NUMBER}</p>
-                   <p>Check console output at <a href="${BUILD_URL}">${BUILD_URL}</a></p>""",
-        attachLog: true
-      )
-    }
-    unstable {
-      emailext(
-        to: 'mostafa777444333@gmail.com, johnhnana567@gmail.com, khalid.salman1996@gmail.com',
-        subject: 'Build is unstable: ${JOB_NAME} - Build #${BUILD_NUMBER}',
-        body: """<p>Build is unstable:</p>
-                   <p>Job: ${JOB_NAME} - Build #${BUILD_NUMBER}</p>
-                   <p>Check console output at <a href="${BUILD_URL}">${BUILD_URL}</a></p>""",
-        attachLog: true
-      )
-    }
-    success {
-      emailext(
-        subject: 'Build successful: ${JOB_NAME} [${BUILD_NUMBER}]',
-        body: '''The build was successful:
-                   - Job: ${JOB_NAME}
-                   - Build number: ${BUILD_NUMBER}
-                   - Check console output at: ${BUILD_URL}''',
-        to: 'mostafa777444333@gmail.com, johnhana567@gmail.com, khalid.salman1996@gmail.com, andrewadel3322@gmail.com',
-        attachLog: true
-      )
     }
-  }
+
+
+
 }
 
 

From 4d4c2b1a086983be694bd02941e62bfa81dcfc0a Mon Sep 17 00:00:00 2001
From: Andrew Adel <andrewadel3322@gmail.com>
Date: Wed, 2 Oct 2024 19:42:57 +0300
Subject: [PATCH 33/60] return to the LTS

---
 jenkinsfile | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/jenkinsfile b/jenkinsfile
index dbd4fbc..02fa83e 100644
--- a/jenkinsfile
+++ b/jenkinsfile
@@ -78,6 +78,12 @@ pipeline {
                 attachLog: false
             )
         }
+        
+        always {
+            mail to: 'mostafa777444333@gmail.com',
+                subject: 'Test Email from Jenkins',
+                body: 'This is a test email to verify Jenkins email notifications.'
+        }
 
         failure {
             emailext(

From 31f7762bd645bb50082fc85ae4cd3217e0f2970d Mon Sep 17 00:00:00 2001
From: Andrew Adel <andrewadel3322@gmail.com>
Date: Wed, 2 Oct 2024 19:45:38 +0300
Subject: [PATCH 34/60] remove second always

---
 jenkinsfile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/jenkinsfile b/jenkinsfile
index 02fa83e..6000df0 100644
--- a/jenkinsfile
+++ b/jenkinsfile
@@ -77,9 +77,7 @@ pipeline {
                 body: 'This is a test email to verify Jenkins email notifications.',
                 attachLog: false
             )
-        }
-        
-        always {
+
             mail to: 'mostafa777444333@gmail.com',
                 subject: 'Test Email from Jenkins',
                 body: 'This is a test email to verify Jenkins email notifications.'

From 8fb93470c64f5248f208d3106a8fe36954e836dd Mon Sep 17 00:00:00 2001
From: Andrew Adel <andrewadel3322@gmail.com>
Date: Wed, 2 Oct 2024 19:49:52 +0300
Subject: [PATCH 35/60] add rest of email to mail

---
 jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jenkinsfile b/jenkinsfile
index 6000df0..069b05d 100644
--- a/jenkinsfile
+++ b/jenkinsfile
@@ -78,7 +78,7 @@ pipeline {
                 attachLog: false
             )
 
-            mail to: 'mostafa777444333@gmail.com',
+            mail to: 'mostafa77744333@gmail.com, johnhana567@gmail.com, khalid.salman1996@gmail.com, andrewadel3322@gmail.com',
                 subject: 'Test Email from Jenkins',
                 body: 'This is a test email to verify Jenkins email notifications.'
         }

From dbb5d62435049036dd52890205d2e534dd97302c Mon Sep 17 00:00:00 2001
From: Andrew Adel <andrewadel3322@gmail.com>
Date: Wed, 2 Oct 2024 20:02:52 +0300
Subject: [PATCH 36/60] use mail instead of emailext

---
 jenkinsfile | 112 ++++++++++++++++++++++++++++++++++------------------
 1 file changed, 74 insertions(+), 38 deletions(-)

diff --git a/jenkinsfile b/jenkinsfile
index 069b05d..4d31685 100644
--- a/jenkinsfile
+++ b/jenkinsfile
@@ -5,6 +5,7 @@ pipeline {
         DOCKER_HUB_CREDENTIALS = credentials('docker-Hub-credentials')
         DOCKER_IMAGE_NAME = 'johnsami/dockerized-app-build-app'
         DOCKER_IMAGE_TAG = 'latest'
+        EMAIL_RECIPIENTS = 'mostafa77744333@gmail.com, johnhana567@gmail.com, khalid.salman1996@gmail.com, andrewadel3322@gmail.com'
     }
 
     stages {
@@ -69,50 +70,85 @@ pipeline {
         pollSCM('H/5 * * * *') // Poll GitHub every 5 minutes
     }
 
+    // post {
+    //     always {
+    //         emailext(
+    //             to: 'mostafa77744333@gmail.com, johnhana567@gmail.com, khalid.salman1996@gmail.com, andrewadel3322@gmail.com',
+    //             subject: 'Test Email from Jenkins',
+    //             body: 'This is a test email to verify Jenkins email notifications.',
+    //             attachLog: false
+    //         )
+
+    //         mail to: 'mostafa77744333@gmail.com, johnhana567@gmail.com, khalid.salman1996@gmail.com, andrewadel3322@gmail.com',
+    //             subject: 'Test Email from Jenkins',
+    //             body: 'This is a test email to verify Jenkins email notifications.'
+    //     }
+
+    //     failure {
+    //         emailext(
+    //             to: 'mostafa77744333@gmail.com, johnhana567@gmail.com, khalid.salman1996@gmail.com, andrewadel3322@gmail.com',
+    //             subject: 'Build failed in Jenkins: ${JOB_NAME} - Build #${BUILD_NUMBER}',
+    //             body: """<p>Build failed in Jenkins:</p>
+    //                      <p>Job: ${JOB_NAME} - Build #${BUILD_NUMBER}</p>
+    //                      <p>Check console output at <a href="${BUILD_URL}">${BUILD_URL}</a></p>""",
+    //             attachLog: true
+    //         )
+    //     }
+    //     unstable {
+    //         emailext(
+    //             to: 'mostafa77744333@gmail.com, johnhana567@gmail.com, khalid.salman1996@gmail.com, andrewadel3322@gmail.com',
+    //             subject: 'Build failed in Jenkins: ${JOB_NAME} - Build #${BUILD_NUMBER}',
+    //             body: """<p>Build is unstable:</p>
+    //                      <p>Job: ${JOB_NAME} - Build #${BUILD_NUMBER}</p>
+    //                      <p>Check console output at <a href="${BUILD_URL}">${BUILD_URL}</a></p>""",
+    //             attachLog: true
+    //         )
+    //     }
+    //     success {
+    //         emailext(
+    //             subject: 'Build successful: ${JOB_NAME} [${BUILD_NUMBER}]',
+    //             body: '''The build was successful:
+    //             - Job: ${JOB_NAME}
+    //             - Build number: ${BUILD_NUMBER}
+    //             - Check console output at: ${BUILD_URL}''',
+    //             to: 'mostafa77744333@gmail.com, johnhana567@gmail.com, khalid.salman1996@gmail.com, andrewadel3322@gmail.com',
+    //             attachLog: true
+    //         )
+    //     }
+    // }
+
     post {
-        always {
-            emailext(
-                to: 'mostafa77744333@gmail.com, johnhana567@gmail.com, khalid.salman1996@gmail.com, andrewadel3322@gmail.com',
-                subject: 'Test Email from Jenkins',
-                body: 'This is a test email to verify Jenkins email notifications.',
-                attachLog: false
-            )
-
-            mail to: 'mostafa77744333@gmail.com, johnhana567@gmail.com, khalid.salman1996@gmail.com, andrewadel3322@gmail.com',
-                subject: 'Test Email from Jenkins',
-                body: 'This is a test email to verify Jenkins email notifications.'
+        success {
+            mail to: "${EMAIL_RECIPIENTS}",
+                 subject: "✅ Build Successful: ${JOB_NAME} - Build #${BUILD_NUMBER}",
+                 body: """<p>Good news! The build was successful.</p>
+                          <p><strong>Job:</strong> ${JOB_NAME}</p>
+                          <p><strong>Build Number:</strong> ${BUILD_NUMBER}</p>
+                          <p>Check the details at <a href="${BUILD_URL}">${BUILD_URL}</a></p>""",
+                 mimeType: 'text/html',
+                 attachLog: true
         }
 
         failure {
-            emailext(
-                to: 'mostafa77744333@gmail.com, johnhana567@gmail.com, khalid.salman1996@gmail.com, andrewadel3322@gmail.com',
-                subject: 'Build failed in Jenkins: ${JOB_NAME} - Build #${BUILD_NUMBER}',
-                body: """<p>Build failed in Jenkins:</p>
-                         <p>Job: ${JOB_NAME} - Build #${BUILD_NUMBER}</p>
-                         <p>Check console output at <a href="${BUILD_URL}">${BUILD_URL}</a></p>""",
-                attachLog: true
-            )
+            mail to: "${EMAIL_RECIPIENTS}",
+                 subject: "❌ Build Failed: ${JOB_NAME} - Build #${BUILD_NUMBER}",
+                 body: """<p>Oops! The build has failed.</p>
+                          <p><strong>Job:</strong> ${JOB_NAME}</p>
+                          <p><strong>Build Number:</strong> ${BUILD_NUMBER}</p>
+                          <p>Check the console output at <a href="${BUILD_URL}">${BUILD_URL}</a></p>""",
+                 mimeType: 'text/html',
+                 attachLog: true
         }
+
         unstable {
-            emailext(
-                to: 'mostafa77744333@gmail.com, johnhana567@gmail.com, khalid.salman1996@gmail.com, andrewadel3322@gmail.com',
-                subject: 'Build failed in Jenkins: ${JOB_NAME} - Build #${BUILD_NUMBER}',
-                body: """<p>Build is unstable:</p>
-                         <p>Job: ${JOB_NAME} - Build #${BUILD_NUMBER}</p>
-                         <p>Check console output at <a href="${BUILD_URL}">${BUILD_URL}</a></p>""",
-                attachLog: true
-            )
-        }
-        success {
-            emailext(
-                subject: 'Build successful: ${JOB_NAME} [${BUILD_NUMBER}]',
-                body: '''The build was successful:
-                - Job: ${JOB_NAME}
-                - Build number: ${BUILD_NUMBER}
-                - Check console output at: ${BUILD_URL}''',
-                to: 'mostafa77744333@gmail.com, johnhana567@gmail.com, khalid.salman1996@gmail.com, andrewadel3322@gmail.com',
-                attachLog: true
-            )
+            mail to: "${EMAIL_RECIPIENTS}",
+                 subject: "⚠️ Build Unstable: ${JOB_NAME} - Build #${BUILD_NUMBER}",
+                 body: """<p>The build is unstable.</p>
+                          <p><strong>Job:</strong> ${JOB_NAME}</p>
+                          <p><strong>Build Number:</strong> ${BUILD_NUMBER}</p>
+                          <p>Check the console output at <a href="${BUILD_URL}">${BUILD_URL}</a></p>""",
+                 mimeType: 'text/html',
+                 attachLog: true
         }
     }
 

From 2bb40852b4d7cb21260fd6d513daea0a8c186328 Mon Sep 17 00:00:00 2001
From: Andrew Adel <andrewadel3322@gmail.com>
Date: Wed, 2 Oct 2024 20:03:44 +0300
Subject: [PATCH 37/60] remove attachLog

---
 jenkinsfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/jenkinsfile b/jenkinsfile
index 4d31685..0bc41ec 100644
--- a/jenkinsfile
+++ b/jenkinsfile
@@ -126,7 +126,7 @@ pipeline {
                           <p><strong>Build Number:</strong> ${BUILD_NUMBER}</p>
                           <p>Check the details at <a href="${BUILD_URL}">${BUILD_URL}</a></p>""",
                  mimeType: 'text/html',
-                 attachLog: true
+                //  attachLog: true
         }
 
         failure {
@@ -137,7 +137,7 @@ pipeline {
                           <p><strong>Build Number:</strong> ${BUILD_NUMBER}</p>
                           <p>Check the console output at <a href="${BUILD_URL}">${BUILD_URL}</a></p>""",
                  mimeType: 'text/html',
-                 attachLog: true
+                //  attachLog: true
         }
 
         unstable {
@@ -148,7 +148,7 @@ pipeline {
                           <p><strong>Build Number:</strong> ${BUILD_NUMBER}</p>
                           <p>Check the console output at <a href="${BUILD_URL}">${BUILD_URL}</a></p>""",
                  mimeType: 'text/html',
-                 attachLog: true
+                //  attachLog: true
         }
     }
 

From 23d2915509e14773e75d43411a8f5679c1d261ff Mon Sep 17 00:00:00 2001
From: Andrew Adel <andrewadel3322@gmail.com>
Date: Wed, 2 Oct 2024 20:04:23 +0300
Subject: [PATCH 38/60] tst

---
 jenkinsfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/jenkinsfile b/jenkinsfile
index 0bc41ec..892c6d8 100644
--- a/jenkinsfile
+++ b/jenkinsfile
@@ -125,7 +125,7 @@ pipeline {
                           <p><strong>Job:</strong> ${JOB_NAME}</p>
                           <p><strong>Build Number:</strong> ${BUILD_NUMBER}</p>
                           <p>Check the details at <a href="${BUILD_URL}">${BUILD_URL}</a></p>""",
-                 mimeType: 'text/html',
+                 mimeType: 'text/html'
                 //  attachLog: true
         }
 
@@ -136,7 +136,7 @@ pipeline {
                           <p><strong>Job:</strong> ${JOB_NAME}</p>
                           <p><strong>Build Number:</strong> ${BUILD_NUMBER}</p>
                           <p>Check the console output at <a href="${BUILD_URL}">${BUILD_URL}</a></p>""",
-                 mimeType: 'text/html',
+                 mimeType: 'text/html'
                 //  attachLog: true
         }
 
@@ -147,7 +147,7 @@ pipeline {
                           <p><strong>Job:</strong> ${JOB_NAME}</p>
                           <p><strong>Build Number:</strong> ${BUILD_NUMBER}</p>
                           <p>Check the console output at <a href="${BUILD_URL}">${BUILD_URL}</a></p>""",
-                 mimeType: 'text/html',
+                 mimeType: 'text/html'
                 //  attachLog: true
         }
     }

From 854d924e90fa1824393f7a0127f5ba039bf0c88d Mon Sep 17 00:00:00 2001
From: Andrew Adel <andrewadel3322@gmail.com>
Date: Wed, 2 Oct 2024 20:07:35 +0300
Subject: [PATCH 39/60] remove mostafa's email

---
 jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jenkinsfile b/jenkinsfile
index 892c6d8..d4c5d73 100644
--- a/jenkinsfile
+++ b/jenkinsfile
@@ -5,7 +5,7 @@ pipeline {
         DOCKER_HUB_CREDENTIALS = credentials('docker-Hub-credentials')
         DOCKER_IMAGE_NAME = 'johnsami/dockerized-app-build-app'
         DOCKER_IMAGE_TAG = 'latest'
-        EMAIL_RECIPIENTS = 'mostafa77744333@gmail.com, johnhana567@gmail.com, khalid.salman1996@gmail.com, andrewadel3322@gmail.com'
+        EMAIL_RECIPIENTS = 'johnhana567@gmail.com, khalid.salman1996@gmail.com, andrewadel3322@gmail.com'
     }
 
     stages {

From c8e6a29f50054d228d852770616812cfa12ea75c Mon Sep 17 00:00:00 2001
From: Andrew Adel <andrewadel3322@gmail.com>
Date: Wed, 2 Oct 2024 20:09:11 +0300
Subject: [PATCH 40/60] test_failure

---
 jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jenkinsfile b/jenkinsfile
index d4c5d73..3f55e50 100644
--- a/jenkinsfile
+++ b/jenkinsfile
@@ -58,7 +58,7 @@ pipeline {
                 script {
                     sh '''
                     cd $WORKSPACE
-                    echo "$DOCKER_HUB_CREDENTIALS_PSW" | docker login -u "$DOCKER_HUB_CREDENTIALS_USR" --password-stdin
+                    echo "$DOCKER_CREDENTIALS_PSW" | docker login -u "$DOCKER_HUB_CREDENTIALS_USR" --password-stdin
                     docker-compose push
                     '''
                 }

From d1e6e5433464843b7b87b6918e80ee7bb3d56b70 Mon Sep 17 00:00:00 2001
From: Andrew Adel <andrewadel3322@gmail.com>
Date: Wed, 2 Oct 2024 20:12:09 +0300
Subject: [PATCH 41/60] return_the_correct_credential

---
 jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jenkinsfile b/jenkinsfile
index 3f55e50..d4c5d73 100644
--- a/jenkinsfile
+++ b/jenkinsfile
@@ -58,7 +58,7 @@ pipeline {
                 script {
                     sh '''
                     cd $WORKSPACE
-                    echo "$DOCKER_CREDENTIALS_PSW" | docker login -u "$DOCKER_HUB_CREDENTIALS_USR" --password-stdin
+                    echo "$DOCKER_HUB_CREDENTIALS_PSW" | docker login -u "$DOCKER_HUB_CREDENTIALS_USR" --password-stdin
                     docker-compose push
                     '''
                 }

From cc7ede9824575d4d5d97bd3134c3840ea0b60ac4 Mon Sep 17 00:00:00 2001
From: khalid-salman <71970537+khalid-salman@users.noreply.github.com>
Date: Wed, 2 Oct 2024 20:26:04 +0300
Subject: [PATCH 42/60] Update jenkinsfile for testing

---
 jenkinsfile | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/jenkinsfile b/jenkinsfile
index d4c5d73..01bc688 100644
--- a/jenkinsfile
+++ b/jenkinsfile
@@ -53,6 +53,25 @@ pipeline {
             }
         }
 
+        stage('Run Tests') {
+            steps {
+                script {
+                    sh '''
+                    cd $WORKSPACE
+                    echo "Installing pytest..."
+                    pip install pytest
+                    
+                    echo "Running tests..."
+                    if [ -f tests/test.py ]; then
+                        pytest tests/test.py --maxfail=1 --disable-warnings
+                    else
+                        echo "No tests found. Skipping."
+                    fi
+                    '''
+                }
+            }
+        }
+
         stage('Push to Docker-Hub') {
             steps {
                 script {
@@ -220,4 +239,4 @@ pipeline {
     //                  body: "Unfortunately, the build has failed.",
     //                  to: 'johnhana567@gmail.com'
     //     }
-    // }
\ No newline at end of file
+    // }

From ba9272b5a329054c9610b2619a709940fe78e158 Mon Sep 17 00:00:00 2001
From: Khalid Salman <khalid.salman1996@gmail.com>
Date: Wed, 2 Oct 2024 20:35:15 +0300
Subject: [PATCH 43/60] updating for testing

---
 jenkinsfile | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/jenkinsfile b/jenkinsfile
index 01bc688..9136f63 100644
--- a/jenkinsfile
+++ b/jenkinsfile
@@ -1,5 +1,11 @@
 pipeline {
-    agent any
+    agent {
+    docker {
+        image 'python:3.9-slim' // Use a Python Docker image
+        args '-u root' // Run as root to allow installations
+    }
+}
+
 
     environment {
         DOCKER_HUB_CREDENTIALS = credentials('docker-Hub-credentials')

From 59d481f01f79847be75254c2522ffd2e81d3a862 Mon Sep 17 00:00:00 2001
From: Khalid Salman <khalid.salman1996@gmail.com>
Date: Wed, 2 Oct 2024 20:36:37 +0300
Subject: [PATCH 44/60] updating for testing

---
 jenkinsfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/jenkinsfile b/jenkinsfile
index 9136f63..b44b9b9 100644
--- a/jenkinsfile
+++ b/jenkinsfile
@@ -4,8 +4,7 @@ pipeline {
         image 'python:3.9-slim' // Use a Python Docker image
         args '-u root' // Run as root to allow installations
     }
-}
-
+    }
 
     environment {
         DOCKER_HUB_CREDENTIALS = credentials('docker-Hub-credentials')

From 0457f189dbf08704ddde1fbe847bd203f17111b8 Mon Sep 17 00:00:00 2001
From: Khalid Salman <khalid.salman1996@gmail.com>
Date: Wed, 2 Oct 2024 20:40:18 +0300
Subject: [PATCH 45/60] updating for testing

---
 jenkinsfile | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/jenkinsfile b/jenkinsfile
index b44b9b9..5be799f 100644
--- a/jenkinsfile
+++ b/jenkinsfile
@@ -1,10 +1,5 @@
 pipeline {
-    agent {
-    docker {
-        image 'python:3.9-slim' // Use a Python Docker image
-        args '-u root' // Run as root to allow installations
-    }
-    }
+    agent any
 
     environment {
         DOCKER_HUB_CREDENTIALS = credentials('docker-Hub-credentials')
@@ -63,20 +58,21 @@ pipeline {
                 script {
                     sh '''
                     cd $WORKSPACE
-                    echo "Installing pytest..."
-                    pip install pytest
-                    
-                    echo "Running tests..."
-                    if [ -f tests/test.py ]; then
-                        pytest tests/test.py --maxfail=1 --disable-warnings
-                    else
-                        echo "No tests found. Skipping."
-                    fi
+                    echo "Running tests in Docker container..."
+
+                    # Run tests in a Python Docker container
+                    docker run --rm -v $WORKSPACE:/app -w /app python:3.9-slim bash -c "
+                        pip install pytest &&
+                        if [ -f tests/test.py ]; then
+                            pytest tests/test.py --maxfail=1 --disable-warnings;
+                        else
+                            echo 'No tests found. Skipping.';
+                        fi
+                    "
                     '''
                 }
             }
         }
-
         stage('Push to Docker-Hub') {
             steps {
                 script {

From dd846dbcaa8cb646d9bfaba6f45ceee00fc01935 Mon Sep 17 00:00:00 2001
From: khalid-salman <71970537+khalid-salman@users.noreply.github.com>
Date: Wed, 2 Oct 2024 20:46:14 +0300
Subject: [PATCH 46/60] Update test.py for fail testing

---
 tests/test.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/test.py b/tests/test.py
index 3419901..84fd438 100644
--- a/tests/test.py
+++ b/tests/test.py
@@ -11,7 +11,7 @@ def test_isupper(self):
         self.assertFalse('Foo'.isupper())
 
     def test_split(self):
-        s = 'hello world'
+        s = 'helloO0 world'
         self.assertEqual(s.split(), ['hello', 'world'])
         # check that s.split fails when the separator is not a string
         with self.assertRaises(TypeError):
@@ -19,4 +19,4 @@ def test_split(self):
 
 
 if __name__ == '__main__':
-    unittest.main()
\ No newline at end of file
+    unittest.main()

From 75b66e8146c61b0fe5a8a813bfa424e6b2686bcb Mon Sep 17 00:00:00 2001
From: khalid-salman <71970537+khalid-salman@users.noreply.github.com>
Date: Wed, 2 Oct 2024 20:55:21 +0300
Subject: [PATCH 47/60] Update jenkinsfile for run test stage

---
 jenkinsfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jenkinsfile b/jenkinsfile
index 5be799f..cbe708f 100644
--- a/jenkinsfile
+++ b/jenkinsfile
@@ -63,8 +63,8 @@ pipeline {
                     # Run tests in a Python Docker container
                     docker run --rm -v $WORKSPACE:/app -w /app python:3.9-slim bash -c "
                         pip install pytest &&
-                        if [ -f tests/test.py ]; then
-                            pytest tests/test.py --maxfail=1 --disable-warnings;
+                        if [ -f ./tests/test.py ]; then
+                            pytest ./tests/test.py --maxfail=1 --disable-warnings;
                         else
                             echo 'No tests found. Skipping.';
                         fi

From 80c2c77aeb51bce18689964d68f40522ead601bf Mon Sep 17 00:00:00 2001
From: Khalid Salman <khalid.salman1996@gmail.com>
Date: Wed, 2 Oct 2024 20:59:57 +0300
Subject: [PATCH 48/60] update run test stage

---
 jenkinsfile | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/jenkinsfile b/jenkinsfile
index cbe708f..0a505cc 100644
--- a/jenkinsfile
+++ b/jenkinsfile
@@ -58,13 +58,16 @@ pipeline {
                 script {
                     sh '''
                     cd $WORKSPACE
+                    echo "Current directory: $(pwd)"
+                    echo "Listing files in the tests directory:"
+                    ls -la tests/
                     echo "Running tests in Docker container..."
 
                     # Run tests in a Python Docker container
                     docker run --rm -v $WORKSPACE:/app -w /app python:3.9-slim bash -c "
                         pip install pytest &&
-                        if [ -f ./tests/test.py ]; then
-                            pytest ./tests/test.py --maxfail=1 --disable-warnings;
+                        if ls tests/test_*.py; then
+                            pytest tests/test_*.py --maxfail=1 --disable-warnings;
                         else
                             echo 'No tests found. Skipping.';
                         fi
@@ -73,6 +76,8 @@ pipeline {
                 }
             }
         }
+
+
         stage('Push to Docker-Hub') {
             steps {
                 script {

From 31dc58cc11f2f0f015ad59ad6a07571a02737de2 Mon Sep 17 00:00:00 2001
From: Khalid Salman <khalid.salman1996@gmail.com>
Date: Wed, 2 Oct 2024 21:10:20 +0300
Subject: [PATCH 49/60] update for testing

---
 jenkinsfile | 49 ++++++++++++++++++++++++-------------------------
 1 file changed, 24 insertions(+), 25 deletions(-)

diff --git a/jenkinsfile b/jenkinsfile
index 0a505cc..3c9bcab 100644
--- a/jenkinsfile
+++ b/jenkinsfile
@@ -20,7 +20,30 @@ pipeline {
                 git url: 'https://github.com/johnsamey/DEPI-Project.git', branch: 'master', credentialsId: 'github'
             }
         }
+        stage('Run Tests') {
+            steps {
+                script {
+                    sh '''
+                    cd $WORKSPACE
+                    echo "Current directory: $(pwd)"
+                    echo "Listing files in the tests directory:"
+                    ls -la tests/
+                    echo "Running tests in Docker container..."
 
+                    # Run tests in a Python Docker container
+                    docker run --rm -v $WORKSPACE:/app -w /app python:3.9-slim bash -c "
+                        pip install pytest &&
+                        if ls tests/test_*.py; then
+                            pytest tests/test_*.py --maxfail=1 --disable-warnings;
+                        else
+                            echo 'No tests found. Skipping.';
+                        fi
+                    "
+                    '''
+                }
+            }
+        }
+        
         stage('Prepare Docker Image') {
             steps {
                 script {
@@ -53,31 +76,7 @@ pipeline {
             }
         }
 
-        stage('Run Tests') {
-            steps {
-                script {
-                    sh '''
-                    cd $WORKSPACE
-                    echo "Current directory: $(pwd)"
-                    echo "Listing files in the tests directory:"
-                    ls -la tests/
-                    echo "Running tests in Docker container..."
-
-                    # Run tests in a Python Docker container
-                    docker run --rm -v $WORKSPACE:/app -w /app python:3.9-slim bash -c "
-                        pip install pytest &&
-                        if ls tests/test_*.py; then
-                            pytest tests/test_*.py --maxfail=1 --disable-warnings;
-                        else
-                            echo 'No tests found. Skipping.';
-                        fi
-                    "
-                    '''
-                }
-            }
-        }
-
-
+        
         stage('Push to Docker-Hub') {
             steps {
                 script {

From 63498dc33a83d5646558c19fa3ec03298d5d6ea4 Mon Sep 17 00:00:00 2001
From: Khalid Salman <khalid.salman1996@gmail.com>
Date: Wed, 2 Oct 2024 21:12:18 +0300
Subject: [PATCH 50/60] update for testing task

---
 jenkinsfile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/jenkinsfile b/jenkinsfile
index 3c9bcab..70c6836 100644
--- a/jenkinsfile
+++ b/jenkinsfile
@@ -20,6 +20,7 @@ pipeline {
                 git url: 'https://github.com/johnsamey/DEPI-Project.git', branch: 'master', credentialsId: 'github'
             }
         }
+
         stage('Run Tests') {
             steps {
                 script {
@@ -33,8 +34,8 @@ pipeline {
                     # Run tests in a Python Docker container
                     docker run --rm -v $WORKSPACE:/app -w /app python:3.9-slim bash -c "
                         pip install pytest &&
-                        if ls tests/test_*.py; then
-                            pytest tests/test_*.py --maxfail=1 --disable-warnings;
+                        if ls tests/test.py; then
+                            pytest tests/test.py --maxfail=1 --disable-warnings;
                         else
                             echo 'No tests found. Skipping.';
                         fi
@@ -43,7 +44,7 @@ pipeline {
                 }
             }
         }
-        
+
         stage('Prepare Docker Image') {
             steps {
                 script {

From cd8b79b4c57e8ef1a84dcf0e5828f818ad0b0b36 Mon Sep 17 00:00:00 2001
From: johnsamey <johnsamyut@gmail.com>
Date: Wed, 2 Oct 2024 21:22:03 +0300
Subject: [PATCH 51/60] update jenkinsfile

---
 jenkinsfile | 73 +++++++++++++++++++++++++----------------------------
 1 file changed, 34 insertions(+), 39 deletions(-)

diff --git a/jenkinsfile b/jenkinsfile
index 70c6836..6b5d6c3 100644
--- a/jenkinsfile
+++ b/jenkinsfile
@@ -94,7 +94,41 @@ pipeline {
     triggers {
         pollSCM('H/5 * * * *') // Poll GitHub every 5 minutes
     }
+    post {
+        // success {
+        //     mail to: "${EMAIL_RECIPIENTS}",
+        //          subject: "✅ Build Successful: ${JOB_NAME} - Build #${BUILD_NUMBER}",
+        //          body: """<p>Good news! The build was successful.</p>
+        //                   <p><strong>Job:</strong> ${JOB_NAME}</p>
+        //                   <p><strong>Build Number:</strong> ${BUILD_NUMBER}</p>
+        //                   <p>Check the details at <a href="${BUILD_URL}">${BUILD_URL}</a></p>""",
+        //          mimeType: 'text/html'
+        //         //  attachLog: true
+        // }
 
+        failure {
+            mail to: "${EMAIL_RECIPIENTS}",
+                 subject: "❌ Build Failed: ${JOB_NAME} - Build #${BUILD_NUMBER}",
+                 body: """<p>Oops! The build has failed.</p>
+                          <p><strong>Job:</strong> ${JOB_NAME}</p>
+                          <p><strong>Build Number:</strong> ${BUILD_NUMBER}</p>
+                          <p>Check the console output at <a href="${BUILD_URL}">${BUILD_URL}</a></p>""",
+                 mimeType: 'text/html'
+                //  attachLog: true
+        }
+
+        unstable {
+            mail to: "${EMAIL_RECIPIENTS}",
+                 subject: "⚠️ Build Unstable: ${JOB_NAME} - Build #${BUILD_NUMBER}",
+                 body: """<p>The build is unstable.</p>
+                          <p><strong>Job:</strong> ${JOB_NAME}</p>
+                          <p><strong>Build Number:</strong> ${BUILD_NUMBER}</p>
+                          <p>Check the console output at <a href="${BUILD_URL}">${BUILD_URL}</a></p>""",
+                 mimeType: 'text/html'
+                //  attachLog: true
+        }
+    }
+}
     // post {
     //     always {
     //         emailext(
@@ -142,45 +176,6 @@ pipeline {
     //     }
     // }
 
-    post {
-        success {
-            mail to: "${EMAIL_RECIPIENTS}",
-                 subject: "✅ Build Successful: ${JOB_NAME} - Build #${BUILD_NUMBER}",
-                 body: """<p>Good news! The build was successful.</p>
-                          <p><strong>Job:</strong> ${JOB_NAME}</p>
-                          <p><strong>Build Number:</strong> ${BUILD_NUMBER}</p>
-                          <p>Check the details at <a href="${BUILD_URL}">${BUILD_URL}</a></p>""",
-                 mimeType: 'text/html'
-                //  attachLog: true
-        }
-
-        failure {
-            mail to: "${EMAIL_RECIPIENTS}",
-                 subject: "❌ Build Failed: ${JOB_NAME} - Build #${BUILD_NUMBER}",
-                 body: """<p>Oops! The build has failed.</p>
-                          <p><strong>Job:</strong> ${JOB_NAME}</p>
-                          <p><strong>Build Number:</strong> ${BUILD_NUMBER}</p>
-                          <p>Check the console output at <a href="${BUILD_URL}">${BUILD_URL}</a></p>""",
-                 mimeType: 'text/html'
-                //  attachLog: true
-        }
-
-        unstable {
-            mail to: "${EMAIL_RECIPIENTS}",
-                 subject: "⚠️ Build Unstable: ${JOB_NAME} - Build #${BUILD_NUMBER}",
-                 body: """<p>The build is unstable.</p>
-                          <p><strong>Job:</strong> ${JOB_NAME}</p>
-                          <p><strong>Build Number:</strong> ${BUILD_NUMBER}</p>
-                          <p>Check the console output at <a href="${BUILD_URL}">${BUILD_URL}</a></p>""",
-                 mimeType: 'text/html'
-                //  attachLog: true
-        }
-    }
-
-
-
-}
-
 
 // post {
 //         failure {

From 0bf66a4238e032a49b4a35bc1958a2918ab3d7b8 Mon Sep 17 00:00:00 2001
From: johnsamey <johnsamyut@gmail.com>
Date: Wed, 2 Oct 2024 21:28:54 +0300
Subject: [PATCH 52/60] update jenkinsfile

---
 jenkinsfile | 39 ++++++++++++++++++++++++---------------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/jenkinsfile b/jenkinsfile
index 6b5d6c3..b5e5828 100644
--- a/jenkinsfile
+++ b/jenkinsfile
@@ -21,30 +21,39 @@ pipeline {
             }
         }
 
+        // stage('Run Tests') {
+        //     steps {
+        //         script {
+        //             sh '''
+        //             cd $WORKSPACE
+        //             echo "Current directory: $(pwd)"
+        //             echo "Listing files in the tests directory:"
+        //             ls -la tests/
+        //             echo "Running tests in Docker container..."
+
+        //             # Run tests in a Python Docker container
+        //             docker run --rm -v $WORKSPACE:/app -w /app python:3.9-slim bash -c "
+        //                 pip install pytest &&
+        //                 if ls tests/test.py; then
+        //                     pytest tests/test.py --maxfail=1 --disable-warnings;
+        //                 else
+        //                     echo 'No tests found. Skipping.';
+        //                 fi
+        //             "
+        //             '''
+        //         }
+        //     }
+        // }
         stage('Run Tests') {
             steps {
                 script {
                     sh '''
                     cd $WORKSPACE
-                    echo "Current directory: $(pwd)"
-                    echo "Listing files in the tests directory:"
-                    ls -la tests/
-                    echo "Running tests in Docker container..."
-
-                    # Run tests in a Python Docker container
-                    docker run --rm -v $WORKSPACE:/app -w /app python:3.9-slim bash -c "
-                        pip install pytest &&
-                        if ls tests/test.py; then
-                            pytest tests/test.py --maxfail=1 --disable-warnings;
-                        else
-                            echo 'No tests found. Skipping.';
-                        fi
-                    "
+                    docker-compose run --rm app python -m unittest discover
                     '''
                 }
             }
         }
-
         stage('Prepare Docker Image') {
             steps {
                 script {

From 650083d91ff5d284289c2e1beb8db05984f0a002 Mon Sep 17 00:00:00 2001
From: johnsamey <johnsamyut@gmail.com>
Date: Thu, 3 Oct 2024 05:26:57 +0300
Subject: [PATCH 53/60] update .gitignore

---
 .gitignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 75ec3f0..54f6b99 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-.vscode/*
\ No newline at end of file
+.vscode/*
+terraform/
\ No newline at end of file

From 07d78de8579d1248a2a033cd8833bc0370b69a73 Mon Sep 17 00:00:00 2001
From: johnsamey <johnsamyut@gmail.com>
Date: Thu, 3 Oct 2024 05:47:31 +0300
Subject: [PATCH 54/60] update jenkinsfile

---
 jenkinsfile | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/jenkinsfile b/jenkinsfile
index b5e5828..d23c766 100644
--- a/jenkinsfile
+++ b/jenkinsfile
@@ -44,16 +44,6 @@ pipeline {
         //         }
         //     }
         // }
-        stage('Run Tests') {
-            steps {
-                script {
-                    sh '''
-                    cd $WORKSPACE
-                    docker-compose run --rm app python -m unittest discover
-                    '''
-                }
-            }
-        }
         stage('Prepare Docker Image') {
             steps {
                 script {

From db067775b82309269b1877a277babeb7f536c2cd Mon Sep 17 00:00:00 2001
From: johnsamey <johnsamyut@gmail.com>
Date: Sun, 6 Oct 2024 03:07:05 +0300
Subject: [PATCH 55/60] Add testing stage

---
 jenkinsfile | 33 +++++++++------------------------
 1 file changed, 9 insertions(+), 24 deletions(-)

diff --git a/jenkinsfile b/jenkinsfile
index d23c766..5a204ec 100644
--- a/jenkinsfile
+++ b/jenkinsfile
@@ -21,29 +21,6 @@ pipeline {
             }
         }
 
-        // stage('Run Tests') {
-        //     steps {
-        //         script {
-        //             sh '''
-        //             cd $WORKSPACE
-        //             echo "Current directory: $(pwd)"
-        //             echo "Listing files in the tests directory:"
-        //             ls -la tests/
-        //             echo "Running tests in Docker container..."
-
-        //             # Run tests in a Python Docker container
-        //             docker run --rm -v $WORKSPACE:/app -w /app python:3.9-slim bash -c "
-        //                 pip install pytest &&
-        //                 if ls tests/test.py; then
-        //                     pytest tests/test.py --maxfail=1 --disable-warnings;
-        //                 else
-        //                     echo 'No tests found. Skipping.';
-        //                 fi
-        //             "
-        //             '''
-        //         }
-        //     }
-        // }
         stage('Prepare Docker Image') {
             steps {
                 script {
@@ -76,7 +53,15 @@ pipeline {
             }
         }
 
-        
+        stage('Run Tests') {
+            steps {
+                sh 'echo "Running tests..."'
+                sh 'cd counting_App && docker-compose up -d --build my_app '
+                sh 'cd counting_App && docker exec my_app_container python -m unittest test_hello.py'
+                sh 'cd counting_App && docker-compose down'
+            }
+        }
+
         stage('Push to Docker-Hub') {
             steps {
                 script {

From e404f5b071c41181eb43b2a1e7d771dd18891f46 Mon Sep 17 00:00:00 2001
From: johnsamey <johnsamyut@gmail.com>
Date: Sun, 6 Oct 2024 03:10:51 +0300
Subject: [PATCH 56/60] Updated docker-compose.yml to match master

---
 docker-compose.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index a20127e..6ddd81b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,12 +13,14 @@ services:
       - REDIS_PORT=6379
       - REDIS_DB=0
     ports:
-      - "8010:8000"
+      - "8000:8000"
     depends_on:
       - redis
     command: python hello.py
+    container_name: app-container
     image: johnsami/dockerized-app-build-app:latest
   redis:
     image: "redis:6.0-alpine"
     ports:
       - "6379:6379"
+    container_name: redis-container
\ No newline at end of file

From c7e24fe24df7274f029b140b2bf8bb9a35170a03 Mon Sep 17 00:00:00 2001
From: johnsamey <johnsamyut@gmail.com>
Date: Sun, 6 Oct 2024 04:17:25 +0300
Subject: [PATCH 57/60] Add testing stage

---
 jenkinsfile | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/jenkinsfile b/jenkinsfile
index 5a204ec..0d731b9 100644
--- a/jenkinsfile
+++ b/jenkinsfile
@@ -56,9 +56,6 @@ pipeline {
         stage('Run Tests') {
             steps {
                 sh 'echo "Running tests..."'
-                sh 'cd counting_App && docker-compose up -d --build my_app '
-                sh 'cd counting_App && docker exec my_app_container python -m unittest test_hello.py'
-                sh 'cd counting_App && docker-compose down'
             }
         }
 

From 23feaec42bf288a8f58bb1e2e257a8471fd12c9b Mon Sep 17 00:00:00 2001
From: johnsamey <johnsamyut@gmail.com>
Date: Sun, 6 Oct 2024 04:18:02 +0300
Subject: [PATCH 58/60] Add testing stage

---
 jenkinsfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/jenkinsfile b/jenkinsfile
index 0d731b9..bdc10ca 100644
--- a/jenkinsfile
+++ b/jenkinsfile
@@ -72,9 +72,9 @@ pipeline {
         }
     }
 
-    triggers {
-        pollSCM('H/5 * * * *') // Poll GitHub every 5 minutes
-    }
+    // triggers {
+    //     pollSCM('H/5 * * * *') // Poll GitHub every 5 minutes
+    // }
     post {
         // success {
         //     mail to: "${EMAIL_RECIPIENTS}",

From 7270aaaeb3223fa7669fd60bf6e7dd6f6a48813e Mon Sep 17 00:00:00 2001
From: johnsamey <johnsamyut@gmail.com>
Date: Sun, 6 Oct 2024 14:57:51 +0300
Subject: [PATCH 59/60] add terraform

---
 terraform/auto_var.auto.tfvars            | 10 +++
 terraform/main.tf                         | 16 ++++
 terraform/modules/ec2/main.tf             | 96 +++++++++++++++++++++++
 terraform/modules/ec2/outputs.tf          | 13 +++
 terraform/modules/ec2/public_user_data.sh | 15 ++++
 terraform/modules/ec2/variables.tf        | 48 ++++++++++++
 terraform/modules/vpc/main.tf             | 60 ++++++++++++++
 terraform/modules/vpc/outputs.tf          |  8 ++
 terraform/modules/vpc/variables.tf        | 23 ++++++
 terraform/outputs.tf                      |  0
 terraform/providers.tf                    | 18 +++++
 terraform/variables.tf                    | 40 ++++++++++
 12 files changed, 347 insertions(+)
 create mode 100644 terraform/auto_var.auto.tfvars
 create mode 100644 terraform/main.tf
 create mode 100644 terraform/modules/ec2/main.tf
 create mode 100644 terraform/modules/ec2/outputs.tf
 create mode 100644 terraform/modules/ec2/public_user_data.sh
 create mode 100644 terraform/modules/ec2/variables.tf
 create mode 100644 terraform/modules/vpc/main.tf
 create mode 100644 terraform/modules/vpc/outputs.tf
 create mode 100644 terraform/modules/vpc/variables.tf
 create mode 100644 terraform/outputs.tf
 create mode 100644 terraform/providers.tf
 create mode 100644 terraform/variables.tf

diff --git a/terraform/auto_var.auto.tfvars b/terraform/auto_var.auto.tfvars
new file mode 100644
index 0000000..e3ffdf6
--- /dev/null
+++ b/terraform/auto_var.auto.tfvars
@@ -0,0 +1,10 @@
+ # vpc 
+  vpc_Name = "test-vpc"
+  vpc_cidr_block = "10.0.0.0/16"
+  public_subnets_cidr = ["10.0.1.0/24","10.0.2.0/24"]
+  availability_Zones_subnet = ["us-east-1a","us-east-1b"]   # us-east-1a
+#ec2
+  ec2_Name = ["Docker","Jenkins"]
+  ami_id = "ami-0e86e20dae9224db8"   # ami-0e86e20dae9224db8
+  key_Name = "private_key"
+  instance_type = "t2.micro"   # t2.micro
\ No newline at end of file
diff --git a/terraform/main.tf b/terraform/main.tf
new file mode 100644
index 0000000..79067d0
--- /dev/null
+++ b/terraform/main.tf
@@ -0,0 +1,16 @@
+module "vpc" {
+  source = "./modules/vpc"
+  vpc_Name = var.vpc_Name
+  vpc_cidr_block = var.vpc_cidr_block
+  public_subnets_cidr = var.public_subnets_cidr
+  availability_Zones_subnet = var.availability_Zones_subnet
+}
+module "ec2" {
+  source = "./modules/ec2"
+  ec2_Name = var.ec2_Name
+  vpc_id = module.vpc.vpc_id
+  public_subnet_ids = module.vpc.public_subnet_ids
+  ami_id = var.ami_id
+  key_Name = var.key_Name
+  instance_type = var.instance_type
+}
\ No newline at end of file
diff --git a/terraform/modules/ec2/main.tf b/terraform/modules/ec2/main.tf
new file mode 100644
index 0000000..5a7d47c
--- /dev/null
+++ b/terraform/modules/ec2/main.tf
@@ -0,0 +1,96 @@
+
+
+resource "aws_instance" "public_ec2"{
+    count =length(var.public_subnet_ids) 
+    ami = var.ami_id
+    instance_type = var.instance_type
+    subnet_id = var.public_subnet_ids[count.index]
+    vpc_security_group_ids = [aws_security_group.public_security-group.id]
+    key_name = aws_key_pair.kp.key_name #key pair attach
+    associate_public_ip_address = "true"
+    user_data =file("./modules/ec2/public_user_data.sh")
+    tags = {
+        Name = "${var.ec2_Name[count.index]}",
+        created-by="john"
+    }
+     provisioner "local-exec" {
+    command = <<EOT
+    instance_name="${var.ec2_Name[count.index]}"
+    instance_ip="${self.public_ip}"
+
+    if [ "$instance_name" = "Docker" ]; then
+      echo "[Docker]\n$instance_ip" >> inventory.ini
+    elif [ "$instance_name" = "Jenkins" ]; then
+      echo "[Jenkins]\n$instance_ip" >> inventory.ini
+    fi
+    EOT
+  }
+}
+
+
+
+
+resource "aws_security_group" "public_security-group" {
+    name = "public-security-group"
+    vpc_id = var.vpc_id
+
+    ingress {
+        from_port   = var.ssh_port
+        to_port     = var.ssh_port
+        protocol    = "tcp"
+        cidr_blocks = ["0.0.0.0/0"]
+    }
+    
+
+    ingress {
+        from_port   = var.HTTP_port
+        to_port     = var.HTTP_port
+        protocol    = "tcp"
+        cidr_blocks = ["0.0.0.0/0"]
+    }
+    ingress {
+        from_port   = var.jenkins_port
+        to_port     = var.jenkins_port
+        protocol    = "tcp"
+        cidr_blocks = ["0.0.0.0/0"]
+    }
+
+    egress {
+        from_port   = 0
+        to_port     = 0
+        protocol    = "-1"
+        cidr_blocks = ["0.0.0.0/0"]
+    }
+}
+
+
+# Generate a new RSA private key with a key size of 4096 bits
+resource "tls_private_key" "pk" {
+  algorithm = "RSA"
+  rsa_bits  = 4096
+}
+# Create an AWS key pair using the generated public key
+resource "aws_key_pair" "kp" {
+  key_name   = var.key_Name      # Create "myKey" to AWS!!
+  public_key = tls_private_key.pk.public_key_openssh
+
+ # Use a local-exec provisioner to save the private key to a file on the local machine
+# provisioner "local-exec" { 
+#     command = <<EOT
+# echo '${tls_private_key.pk.private_key_pem}' > ./${var.key_Name}.pem
+# chmod 400 ./${var.key_Name}.pem
+# EOT
+#   }
+
+}
+
+# Save the private key to a file locally (will be destroyed with the key_pair resource)
+resource "local_file" "private_key" {
+  content  = tls_private_key.pk.private_key_pem
+  filename = "${path.cwd}/${var.key_Name}.pem"
+  provisioner "local-exec" {
+    command = <<EOT
+    chmod 400 ${path.cwd}/${var.key_Name}.pem
+    EOT
+  }
+}
diff --git a/terraform/modules/ec2/outputs.tf b/terraform/modules/ec2/outputs.tf
new file mode 100644
index 0000000..bfc47df
--- /dev/null
+++ b/terraform/modules/ec2/outputs.tf
@@ -0,0 +1,13 @@
+output "public_instance_ids" {
+  value = aws_instance.public_ec2.*.id
+}
+
+
+
+output "public_ec2_ids" {
+  value = aws_instance.public_ec2.*.id
+}
+
+output "public_security_group_id" {
+  value = aws_security_group.public_security-group.id
+}
diff --git a/terraform/modules/ec2/public_user_data.sh b/terraform/modules/ec2/public_user_data.sh
new file mode 100644
index 0000000..25f5e1a
--- /dev/null
+++ b/terraform/modules/ec2/public_user_data.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+# Move to /tmp directory
+cd /tmp
+
+# Update the package manager
+sudo yum update -y
+
+# Install the SSM Agent
+sudo yum install -y https://s3.amazonaws.com/ec2-downloads-windows/SSMAgent/latest/linux_amd64/amazon-ssm-agent.rpm
+
+# Enable and start the SSM Agent
+sudo systemctl enable amazon-ssm-agent
+sudo systemctl start amazon-ssm-agent
+
diff --git a/terraform/modules/ec2/variables.tf b/terraform/modules/ec2/variables.tf
new file mode 100644
index 0000000..7fb311b
--- /dev/null
+++ b/terraform/modules/ec2/variables.tf
@@ -0,0 +1,48 @@
+variable "instance_type" {
+  description = "Specifies the type of EC2 instance to be launched."
+  type = string
+  
+}
+variable "ec2_Name" {
+  description = "The name assigned to the EC2 instance."
+  type = list(string)
+}
+
+variable "ami_id" {
+  description = "The Amazon Machine Image (AMI) ID"
+  type = string
+   
+}
+variable "public_subnet_ids" {
+    description = "A list of public subnet IDs where the EC2 instance will be deployed."
+    type = list(string)
+   
+}
+
+variable "ssh_port" {
+  description = "The port used for SSH access to the EC2 instance."
+  type = number
+  default = 22
+  
+}
+variable "HTTP_port" {
+  description = "The port used for HTTP traffic to the EC2 instance."
+  type = number
+  default = 80
+}
+variable "jenkins_port" {
+  description = "The port used for jenkins traffic to the EC2 instance."
+  type = number
+  default = 8080
+}
+
+variable "vpc_id" {
+  description = "The port used for HTTP traffic to the EC2 instance."
+  type = string
+}
+
+
+variable "key_Name" {
+  description = "The name of the AWS key pair used to connect to the EC2 instance."
+  type = string
+}
\ No newline at end of file
diff --git a/terraform/modules/vpc/main.tf b/terraform/modules/vpc/main.tf
new file mode 100644
index 0000000..1c7c6be
--- /dev/null
+++ b/terraform/modules/vpc/main.tf
@@ -0,0 +1,60 @@
+# Create vpc with specific cider block 
+resource "aws_vpc" "aws_vpc" {
+  cidr_block = var.vpc_cidr_block
+  tags = {
+    Name = var.vpc_Name,
+    created-by="john"
+  }
+}
+
+# Create public subnets with specific cider block 
+resource "aws_subnet" "public_subnet" {
+  count =length(var.public_subnets_cidr)
+  vpc_id = aws_vpc.aws_vpc.id
+  cidr_block =var.public_subnets_cidr[count.index]
+  availability_zone = var.availability_Zones_subnet[count.index]
+ tags = {
+    Name = "public-subnet-${count.index + 1}-${var.vpc_Name}"
+    created-by="john"
+  }
+
+}
+
+
+# Create an internet gateway
+resource "aws_internet_gateway" "internet_gateway" {
+  count = length(var.public_subnets_cidr) > 0 ? 1 : 0  
+  vpc_id =  aws_vpc.aws_vpc.id
+
+  tags = {
+    Name = "igw-${var.vpc_Name}"
+    created-by="john"
+  }
+
+}
+
+# Create a route table for public subnets
+resource "aws_route_table" "public_route_table" {
+  count = length(var.public_subnets_cidr) > 0 ? 1 : 0  #use to prevent creation of rw if not public subnet entered 
+  vpc_id =  aws_vpc.aws_vpc.id
+
+  route {
+    cidr_block = "0.0.0.0/0"
+    gateway_id = aws_internet_gateway.internet_gateway[0].id
+  }
+
+  tags = {
+    Name = "route_table_${var.vpc_Name}"
+    created-by="john"
+  }
+}
+
+
+
+# Associate public subnets with the public route table
+resource "aws_route_table_association" "public_association" {
+  count          = length(var.public_subnets_cidr)
+  subnet_id      = aws_subnet.public_subnet[count.index].id
+  route_table_id = aws_route_table.public_route_table[0].id
+  
+}
diff --git a/terraform/modules/vpc/outputs.tf b/terraform/modules/vpc/outputs.tf
new file mode 100644
index 0000000..815e887
--- /dev/null
+++ b/terraform/modules/vpc/outputs.tf
@@ -0,0 +1,8 @@
+
+output "vpc_id" {
+    value = aws_vpc.aws_vpc.id
+}
+output "public_subnet_ids" {
+    description = "List with IDs of the public subnets"
+    value = aws_subnet.public_subnet.*.id
+}
diff --git a/terraform/modules/vpc/variables.tf b/terraform/modules/vpc/variables.tf
new file mode 100644
index 0000000..3b06add
--- /dev/null
+++ b/terraform/modules/vpc/variables.tf
@@ -0,0 +1,23 @@
+variable "vpc_cidr_block" {
+  description = "this is cidr block of created vpc "
+  type = string
+
+}
+
+variable "public_subnets_cidr" {
+  description = "cider blocks for public subnets"
+  type = list(string)
+}
+
+variable "vpc_Name" {
+  description = "this name vpc "
+  type = string
+}
+
+
+variable "availability_Zones_subnet" {
+  description = "Availability Zones subnet for each subnet"
+  type = list(string)
+}
+
+
diff --git a/terraform/outputs.tf b/terraform/outputs.tf
new file mode 100644
index 0000000..e69de29
diff --git a/terraform/providers.tf b/terraform/providers.tf
new file mode 100644
index 0000000..44cc68e
--- /dev/null
+++ b/terraform/providers.tf
@@ -0,0 +1,18 @@
+terraform {
+
+  required_providers {
+    aws = {
+      
+      source  = "hashicorp/aws"
+      version = "~> 5.0.0"
+    }
+  }
+
+}
+
+provider "aws" {
+  shared_config_files = [ "~/.aws/config" ]
+  shared_credentials_files = [ "~/.aws/credentials" ]
+  profile = "default"
+  region = "us-east-1"
+}
diff --git a/terraform/variables.tf b/terraform/variables.tf
new file mode 100644
index 0000000..7fbce37
--- /dev/null
+++ b/terraform/variables.tf
@@ -0,0 +1,40 @@
+variable "vpc_Name" {
+    description = "Name of the VPC."
+    type = string
+}
+
+variable "vpc_cidr_block" {
+    description = "CIDR block for the VPC."
+    type = string
+}
+
+variable "public_subnets_cidr" {
+    description = "List of CIDR blocks for public subnets."
+    type = list(string)
+}
+
+variable "availability_Zones_subnet" {
+    description = "List of Availability Zones for subnets."
+    type = list(string)
+}
+
+variable "ec2_Name" {
+    description = "Name of the EC2 instance."
+    type = list(string)
+}
+
+variable "ami_id" {
+    description = "AMI ID for the EC2 instance."
+    type = string
+}
+
+variable "instance_type" {
+    description = "Type of EC2 instance."
+    type = string
+}
+
+variable "key_Name" {
+    description = "SSH key pair name for instance access."
+    type = string
+}
+

From b38b6a148d576ebfff2325d8312ecba0d969824f Mon Sep 17 00:00:00 2001
From: johnsamey <johnsamyut@gmail.com>
Date: Sun, 6 Oct 2024 15:02:39 +0300
Subject: [PATCH 60/60] Update

---
 .gitignore | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 54f6b99..c8618e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,6 @@
 .vscode/*
-terraform/
\ No newline at end of file
+# terraform/
+terraform/.terraform
+terraform/.terraform.lock.hcl
+terraform/terraform.tfstate
+terraform/terraform.tfstate.backup