Dev

infra/jenkins/dev/BotBuild.Jenkinsfile

@@ -2,25 +2,35 @@ pipeline {
     agent {
         docker {
             // TODO build & push your Jenkins agent image, place the URL here
-            image '<jenkins-agent-image>'
+            label 'danishain'
+            image '352708296901.dkr.ecr.eu-north-1.amazonaws.com/danishain-jenkins-ex1:latest'
             args  '--user root -v /var/run/docker.sock:/var/run/docker.sock'
         }
     }
-
+    environment {
+        REGISTRY_URL = "public.ecr.aws/r7m7o9d4"
+        IMAGE_TAG = "0.0.$BUILD_NUMBER"
+        IMAGE_NAME = "danishain-bot-dev"
+        }
     stages {
         stage('Build') {
             steps {
                 // TODO dev bot build stage
                 sh '''
                 echo "building..."
+                aws ecr-public get-login-password --region us-east-1 | docker login --username AWS --password-stdin $REGISTRY_URL
+                docker build -t $IMAGE_NAME:$IMAGE_TAG . -f services/bot/Dockerfile
+                docker tag $IMAGE_NAME:$IMAGE_TAG $REGISTRY_URL/$IMAGE_NAME:$IMAGE_TAG
+                docker push $REGISTRY_URL/$IMAGE_NAME:$IMAGE_TAG
+                echo "done"
                 '''
             }
         }
 
         stage('Trigger Deploy') {
             steps {
                 build job: 'BotDeploy', wait: false, parameters: [
-                    string(name: 'BOT_IMAGE_NAME', value: "<image-name>")
+                    string(name: 'BOT_IMAGE_NAME', value: "${REGISTRY_URL}/${IMAGE_NAME}:${IMAGE_TAG}")
                 ]
             }
         }

infra/jenkins/dev/BotDeploy.Jenkinsfile

@@ -1,8 +1,9 @@
 pipeline {
     agent {
         docker {
-            // TODO build & push your Jenkins agent image, place the URL here
-            image '<jenkins-agent-image>'
+            // TODO build & push your Jenkins agent image, place the URL heree
+            label 'danishain'
+            image '352708296901.dkr.ecr.eu-north-1.amazonaws.com/danishain-jenkins-ex1:latest'
             args  '--user root -v /var/run/docker.sock:/var/run/docker.sock'
         }
     }
@@ -28,7 +29,7 @@ pipeline {
                     # replace placeholders in YAML k8s files
                     bash common/replaceInFile.sh $K8S_CONFIGS/bot.yaml APP_ENV $APP_ENV
                     bash common/replaceInFile.sh $K8S_CONFIGS/bot.yaml BOT_IMAGE $BOT_IMAGE_NAME
-                    bash common/replaceInFile.sh $K8S_CONFIGS/bot.yaml TELEGRAM_TOKEN $(echo $TELEGRAM_TOKEN | base64)
+                    bash common/replaceInFile.sh $K8S_CONFIGS/bot.yaml TELEGRAM_TOKEN $(echo -n $TELEGRAM_TOKEN | base64)
 
                     # apply the configurations to k8s cluster
                     kubectl apply --kubeconfig ${KUBECONFIG} -f $K8S_CONFIGS/bot.yaml

infra/jenkins/dev/WorkerBuild.Jenkinsfile

@@ -1,11 +1,39 @@
 pipeline {
     agent {
         docker {
-            // TODO build & push your Jenkins agent image, place the URL here
-            image '<jenkins-agent-image>'
+            // TODO build & push your Jenkins agent image, place the URL heree
+            image '352708296901.dkr.ecr.eu-north-1.amazonaws.com/danishain-jenkins-ex1:latest'
             args  '--user root -v /var/run/docker.sock:/var/run/docker.sock'
         }
     }
 
     // TODO dev worker build stage
+    environment {
+        REGISTRY_URL = "public.ecr.aws/r7m7o9d4"
+        IMAGE_TAG = "0.0.$BUILD_NUMBER"
+        IMAGE_NAME = "danishain-worker-dev"
+        }
+    stages {
+        stage('Build') {
+            steps {
+                // TODO dev bot build stage
+                sh '''
+                echo "building..."
+                aws ecr-public get-login-password --region us-east-1  | docker login --username AWS --password-stdin $REGISTRY_URL
+                docker build -t $IMAGE_NAME:$IMAGE_TAG . -f services/worker/Dockerfile
+                docker tag $IMAGE_NAME:$IMAGE_TAG $REGISTRY_URL/$IMAGE_NAME:$IMAGE_TAG
+                docker push $REGISTRY_URL/$IMAGE_NAME:$IMAGE_TAG
+                echo "done"
+                '''
+            }
+        }
+
+        stage('Trigger Deploy') {
+            steps {
+                build job: 'WorkerDeploy', wait: false, parameters: [
+                    string(name: 'WORKER_IMAGE_NAME', value: "${REGISTRY_URL}/${IMAGE_NAME}:${IMAGE_TAG}")
+                ]
+            }
+        }
+    }
 }

infra/jenkins/dev/WorkerDeploy.Jenkinsfile

@@ -2,7 +2,7 @@ pipeline {
     agent {
         docker {
             // TODO build & push your Jenkins agent image, place the URL here
-            image '<jenkins-agent-image>'
+            image '352708296901.dkr.ecr.eu-north-1.amazonaws.com/danishain-jenkins-ex1:latest'
             args  '--user root -v /var/run/docker.sock:/var/run/docker.sock'
         }
     }

services/bot/Dockerfile

@@ -3,5 +3,4 @@ WORKDIR /app
 ENV APP_PATH=services/bot
 COPY . .
 RUN pip install -r $APP_PATH/requirements.txt
-
-CMD ["python3", "services/bot/app.py"]
+CMD ["python3","-m", "services/bot/app.py"]

services/bot/app.py

@@ -60,7 +60,7 @@ def _message_handler(self, update, context):
                     'chat_id': {'StringValue': chat_id, 'DataType': 'String'}
                 }
             )
-            logger.info(f'msg {response.get("MessageId")} has been sent to queue')
+            logger.info(f'msg {response.get("MessageId")} has been sent to queue this is a check PR')
             self.send_text(update, f'Your message is being processed...', chat_id=chat_id)
 
         except botocore.exceptions.ClientError as error: