Add simple UI code

.gitignore

@@ -1 +1,2 @@
 .idea/*
+target

Dockerfile

@@ -0,0 +1,8 @@
+FROM openjdk:8-jre-alpine
+
+EXPOSE 8080
+
+COPY ./target/java-maven-app-*.jar /usr/app/
+WORKDIR /usr/app
+
+CMD java -jar java-maven-app-*.jar

Jenkinsfile

@@ -0,0 +1,76 @@
+#!/usr/bin/env groovy
+
+pipeline {
+    agent any
+    tools {
+        maven 'Maven'
+    }
+    environment {
+        ECR_REPO_URL = '664574038682.dkr.ecr.eu-west-3.amazonaws.com'
+        IMAGE_REPO = "${ECR_REPO_URL}/java-maven-app"
+    }
+    stages {
+        stage('increment version') {
+            steps {
+                script {
+                    echo 'incrementing app version...'
+                    sh 'mvn build-helper:parse-version versions:set \
+                        -DnewVersion=\\\${parsedVersion.majorVersion}.\\\${parsedVersion.minorVersion}.\\\${parsedVersion.nextIncrementalVersion} \
+                        versions:commit'
+                    def matcher = readFile('pom.xml') =~ '<version>(.+)</version>'
+                    def version = matcher[0][1]
+                    env.IMAGE_NAME = "$version-$BUILD_NUMBER"
+                    echo "############ ${IMAGE_REPO}"
+                }
+            }
+        }
+        stage('build app') {
+            steps {
+               script {
+                   echo "building the application..."
+                   sh 'mvn clean package'
+               }
+            }
+        }
+        stage('build image') {
+            steps {
+                script {
+                    echo "building the docker image..."
+                    withCredentials([usernamePassword(credentialsId: 'ecr-credentials', passwordVariable: 'PASS', usernameVariable: 'USER')]) {
+                        sh "docker build -t ${IMAGE_REPO}:${IMAGE_NAME} ."
+                        sh "echo $PASS | docker login -u $USER --password-stdin ${ECR_REPO_URL}"
+                        sh "docker push ${IMAGE_REPO}:${IMAGE_NAME}"
+                    }
+                }
+            }
+        }
+        stage('deploy') {
+            environment {
+                AWS_ACCESS_KEY_ID = credentials('jenkins_aws_access_key_id')
+                AWS_SECRET_ACCESS_KEY = credentials('jenkins_aws_secret_access_key')
+                APP_NAME = 'java-maven-app'
+            }
+            steps {
+                script {
+                    echo 'deploying docker image...'
+                    sh 'envsubst < kubernetes/deployment.yaml | kubectl apply -f -'
+                    sh 'envsubst < kubernetes/service.yaml | kubectl apply -f -'
+                }
+            }
+        }
+        stage('commit version update') {
+            steps {
+                script {
+                    withCredentials([usernamePassword(credentialsId: 'gitlab-credentials', passwordVariable: 'PASS', usernameVariable: 'USER')]) {
+                        sh 'git config user.email "jenkins@example.com"'
+                        sh 'git config user.name "Jenkins"'
+                        sh "git remote set-url origin https://${USER}:${PASS}@gitlab.com/nanuchi/java-maven-app.git"
+                        sh 'git add .'
+                        sh 'git commit -m "ci: version bump"'
+                        sh 'git push origin HEAD:jenkins-jobs'
+                    }
+                }
+            }
+        }
+    }
+}

Jenkinsfile-v1

@@ -1,52 +0,0 @@
-pipeline {
-    agent any
-    environment {
-        ANSIBLE_SERVER = "157.230.120.252"
-    }
-    stages {
-        stage("copy ansible folder and ec2 access key to ansible-server") {
-            steps {
-                script {
-                    sshagent(['ansible-server-key']) {
-                        echo "copying ansible folder to ansible server"
-                        // ${ANSIBLE_SERVER}:/root without root will give jenkins@${ANSIBLE_SERVER}:/root
-                        sh "scp -o StrictHostKeyChecking=no ansible/* root@${ANSIBLE_SERVER}:/root"    
-
-                        echo "copying ssh keys for ec2 instances"
-                        withCredentials([sshUserPrivateKey(credentialsId: 'ec2-server-key', keyFileVariable: 'keyfile', usernameVariable: 'user')]) {
-                            sh 'scp $keyfile root@$ANSIBLE_SERVER:/root/ssh-key.pem'
-                        }
-                    }                               
-                }
-            }
-        }
-        stage("execute ansible playbook from the ansible-server") {
-            environment {
-                AWS_ACCESS_KEY_ID = credentials('jenkins_aws_access_key_id')
-                AWS_SECRET_ACCESS_KEY = credentials('jenkins_aws_secret_access_key')
-            }
-            steps {
-                script {
-                    echo "executing ansible-playbook"
-                    
-                    def remote = [:]
-                    remote.name = "ansible-server"
-                    remote.host = ANSIBLE_SERVER
-                    remote.allowAnyHosts = true
-                    
-                    withCredentials([sshUserPrivateKey(credentialsId: 'ansible-server-key', keyFileVariable: 'keyfile', usernameVariable: 'user')]) {
-                        remote.identityFile = keyfile
-                        remote.user = user
-
-                        sshCommand remote: remote, command: "ls -l"
-                        
-                        // set AWS credentials
-                        sshScript remote: remote, script: "ansible/prepare-server.sh"
-                        
-                        sshCommand remote: remote, command: "export AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID}; export AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY}; ansible-playbook docker-and-compose.yaml"
-                    }
-                }
-            }
-        }
-    }   
-}

Jenkinsfile-v2

@@ -1,48 +0,0 @@
-pipeline {
-    agent any
-    environment {
-        ANSIBLE_SERVER = "157.230.120.252"
-    }
-    stages {
-        stage("copy ansible folder and ec2 access key to ansible-server") {
-            steps {
-                script {
-                    sshagent(['ansible-server-key']) {
-                        echo "copying ansible folder to ansible server"
-                        // ${ANSIBLE_SERVER}:/root without root will give jenkins@${ANSIBLE_SERVER}:/root
-                        sh "scp -o StrictHostKeyChecking=no ansible/* root@${ANSIBLE_SERVER}:/root"    
-
-                        echo "copying ssh keys for ec2 instances"
-                        withCredentials([sshUserPrivateKey(credentialsId: 'ec2-server-key', keyFileVariable: 'keyfile', usernameVariable: 'user')]) {
-                            sh 'scp $keyfile root@$ANSIBLE_SERVER:/root/ssh-key.pem'
-                        }
-                    }                               
-                }
-            }
-        }
-        stage("execute ansible playbook from the ansible-server") {
-            environment {
-                AWS_ACCESS_KEY_ID = credentials('jenkins_aws_access_key_id')
-                AWS_SECRET_ACCESS_KEY = credentials('jenkins_aws_secret_access_key')
-            }
-            steps {
-                script {
-                    echo "executing ansible-playbook"
-                    
-                    def remote = [:]
-                    remote.name = "ansible-server"
-                    remote.host = ANSIBLE_SERVER
-                    remote.allowAnyHosts = true
-                    
-                    withCredentials([sshUserPrivateKey(credentialsId: 'ansible-server-key', keyFileVariable: 'keyfile', usernameVariable: 'user')]) {
-                        remote.identityFile = keyfile
-                        remote.user = user
-
-                        sshCommand remote: remote, command: "ls -l"
-                        sshCommand remote: remote, command: "ansible-playbook docker-and-compose.yaml"
-                    }
-                }
-            }
-        }
-    }   
-}

Jenkinsfile-v3

@@ -1,34 +0,0 @@
-def gv
-
-pipeline {
-    agent any
-    stages {
-        stage("build jar") {
-            steps {
-                script {
-                    echo "building the application..."
-                    sh 'mvn package'
-                }
-            }
-        }
-        stage("build image") {
-            steps {
-                script {
-                    echo "building the docker image..."
-                    withCredentials([usernamePassword(credentialsId: 'docker-hub-repo', passwordVariable: 'PASS', usernameVariable: 'USER')]) {
-                        sh 'docker build -t nanajanashia/demo-app:jma-2.0 .'
-                        sh "echo $PASS | docker login -u $USER --password-stdin"
-                        sh 'docker push nanajanashia/demo-app:jma-2.0'
-                    }
-                }
-            }
-        }
-        stage("deploy") {
-            steps {
-                script {
-                    echo 'deploying the application...'
-                }
-            }
-        }
-    }   
-}

ansible/ansible.cfg

@@ -1,9 +0,0 @@
-[defaults]
-host_key_checking = False
-inventory = inventory_aws_ec2.yaml
-
-interpreter_python = /usr/bin/python3
-enable_plugins = aws_ec2
-
-remote_user = ec2-user
-private_key_file = ~/ssh-key.pem

ansible/docker-and-compose.yaml

@@ -1,29 +0,0 @@
----
-- name: Install python3, docker, docker-compose
-  hosts: all
-  become: yes
-  gather_facts: False
-  tasks:
-    - name: Install python3 and docker
-      vars:
-        ansible_python_interpreter: /usr/bin/python
-      yum:
-        name:
-          - python3
-          - docker
-        update_cache: yes
-        state: present
-    - name: Install Docker-compose
-      get_url: 
-        url: https://github.com/docker/compose/releases/download/1.27.4/docker-compose-Linux-{{lookup('pipe', 'uname -m')}}
-        dest: /usr/local/bin/docker-compose
-        mode: +x
-    - name: Start docker daemon
-      systemd:
-        name: docker
-        state: started
-    - name: Install docker python module
-      pip:
-        name: 
-          - docker
-          - docker-compose

ansible/inventory_aws_ec2.yaml

@@ -1,9 +0,0 @@
----
-plugin: aws_ec2
-regions:
-  - eu-west-3
-keyed_groups:
-  - key: tags
-    prefix: tag
-  - key: instance_type
-    prefix: instance_type

ansible/prepare-server.sh

@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-
-apt update
-apt install ansible -y
-apt install python3-pip -y
-pip3 install boto3 botocore
-
-# export AWS_ACCESS_KEY_ID=$1
-# export AWS_SECRET_ACCESS_KEY=$2
-

kubernetes/deployment.yaml

@@ -0,0 +1,24 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: $APP_NAME
+  labels:
+    app: $APP_NAME
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: $APP_NAME
+  template:
+    metadata:
+      labels:
+        app: $APP_NAME
+    spec:
+      imagePullSecrets:
+        - name: my-registry-key
+      containers:
+        - name: $APP_NAME
+          image: $IMAGE_REPO:$IMAGE_NAME
+          imagePullPolicy: Always
+          ports:
+            - containerPort: 8080

kubernetes/service.yaml

@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: $APP_NAME
+spec:
+  selector:
+    app: $APP_NAME
+  ports:
+    - protocol: TCP
+      port: 80
+      targetPort: 8080

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.example</groupId>
     <artifactId>java-maven-app</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.1.5</version>
 
     <build>
         <plugins>
@@ -22,17 +22,6 @@
                     </execution>
                 </executions>
             </plugin>
-
-            <!-- to handle any Java version mismatch, add the following configuration for maven-compiler-plugin -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.6.0</version>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 

src/main/resources/static/index.html

@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>MyApp</title>
+</head>
+<body>
+<h1>Welcome to Java Maven Application</h1>
+<!-- add image here  <img src="" width="" /> -->
+</body>
+</html>

src/test/java/AppTest.java

@@ -0,0 +1,16 @@
+import com.example.Application;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+public class AppTest {
+
+    @Test
+    public void testApp() {
+        Application myApp = new Application();
+
+        String result = myApp.getStatus();
+
+        assertEquals("OK", result);
+    }
+
+}

target/maven-archiver/pom.properties

@@ -0,0 +1,5 @@
+#Generated by Maven
+#Sat Dec 05 14:30:39 UTC 2020
+version=1.1.5
+groupId=com.example
+artifactId=java-maven-app

target/surefire-reports/AppTest.txt

@@ -0,0 +1,4 @@
+-------------------------------------------------------------------------------
+Test set: AppTest
+-------------------------------------------------------------------------------
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.126 sec

target/surefire-reports/TEST-AppTest.xml

@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<testsuite tests="1" failures="0" name="AppTest" time="0.007" errors="0" skipped="0">
+  <properties>
+    <property name="java.runtime.name" value="OpenJDK Runtime Environment"/>
+    <property name="sun.boot.library.path" value="/usr/local/openjdk-8/jre/lib/amd64"/>
+    <property name="java.vm.version" value="25.242-b08"/>
+    <property name="java.vm.vendor" value="Oracle Corporation"/>
+    <property name="maven.multiModuleProjectDirectory" value="/var/jenkins_home/workspace/java-maven-app_jenkins-jobs"/>
+    <property name="java.vendor.url" value="http://java.oracle.com/"/>
+    <property name="path.separator" value=":"/>
+    <property name="guice.disable.misplaced.annotation.check" value="true"/>
+    <property name="java.vm.name" value="OpenJDK 64-Bit Server VM"/>
+    <property name="file.encoding.pkg" value="sun.io"/>
+    <property name="sun.java.launcher" value="SUN_STANDARD"/>
+    <property name="sun.os.patch.level" value="unknown"/>
+    <property name="java.vm.specification.name" value="Java Virtual Machine Specification"/>
+    <property name="user.dir" value="/var/jenkins_home/workspace/java-maven-app_jenkins-jobs"/>
+    <property name="java.runtime.version" value="1.8.0_242-b08"/>
+    <property name="java.awt.graphicsenv" value="sun.awt.X11GraphicsEnvironment"/>
+    <property name="java.endorsed.dirs" value="/usr/local/openjdk-8/jre/lib/endorsed"/>
+    <property name="os.arch" value="amd64"/>
+    <property name="java.io.tmpdir" value="/tmp"/>
+    <property name="line.separator" value="
+"/>
+    <property name="java.vm.specification.vendor" value="Oracle Corporation"/>
+    <property name="os.name" value="Linux"/>
+    <property name="classworlds.conf" value="/var/jenkins_home/tools/hudson.tasks.Maven_MavenInstallation/Maven/bin/m2.conf"/>
+    <property name="sun.jnu.encoding" value="UTF-8"/>
+    <property name="java.library.path" value="/usr/java/packages/lib/amd64:/usr/lib64:/lib64:/lib:/usr/lib"/>
+    <property name="maven.conf" value="/var/jenkins_home/tools/hudson.tasks.Maven_MavenInstallation/Maven/conf"/>
+    <property name="java.specification.name" value="Java Platform API Specification"/>
+    <property name="java.class.version" value="52.0"/>
+    <property name="sun.management.compiler" value="HotSpot 64-Bit Tiered Compilers"/>
+    <property name="os.version" value="5.4.0-51-generic"/>
+    <property name="library.jansi.path" value="/var/jenkins_home/tools/hudson.tasks.Maven_MavenInstallation/Maven/lib/jansi-native"/>
+    <property name="user.home" value="/var/jenkins_home"/>
+    <property name="user.timezone" value="Etc/UTC"/>
+    <property name="java.awt.printerjob" value="sun.print.PSPrinterJob"/>
+    <property name="java.specification.version" value="1.8"/>
+    <property name="file.encoding" value="UTF-8"/>
+    <property name="user.name" value="jenkins"/>
+    <property name="java.class.path" value="/var/jenkins_home/tools/hudson.tasks.Maven_MavenInstallation/Maven/boot/plexus-classworlds-2.6.0.jar"/>
+    <property name="java.vm.specification.version" value="1.8"/>
+    <property name="sun.arch.data.model" value="64"/>
+    <property name="java.home" value="/usr/local/openjdk-8/jre"/>
+    <property name="sun.java.command" value="org.codehaus.plexus.classworlds.launcher.Launcher clean package"/>
+    <property name="java.specification.vendor" value="Oracle Corporation"/>
+    <property name="user.language" value="en"/>
+    <property name="awt.toolkit" value="sun.awt.X11.XToolkit"/>
+    <property name="java.vm.info" value="mixed mode"/>
+    <property name="java.version" value="1.8.0_242"/>
+    <property name="java.ext.dirs" value="/usr/local/openjdk-8/jre/lib/ext:/usr/java/packages/lib/ext"/>
+    <property name="securerandom.source" value="file:/dev/./urandom"/>
+    <property name="sun.boot.class.path" value="/usr/local/openjdk-8/jre/lib/resources.jar:/usr/local/openjdk-8/jre/lib/rt.jar:/usr/local/openjdk-8/jre/lib/sunrsasign.jar:/usr/local/openjdk-8/jre/lib/jsse.jar:/usr/local/openjdk-8/jre/lib/jce.jar:/usr/local/openjdk-8/jre/lib/charsets.jar:/usr/local/openjdk-8/jre/lib/jfr.jar:/usr/local/openjdk-8/jre/classes"/>
+    <property name="java.vendor" value="Oracle Corporation"/>
+    <property name="maven.home" value="/var/jenkins_home/tools/hudson.tasks.Maven_MavenInstallation/Maven"/>
+    <property name="file.separator" value="/"/>
+    <property name="java.vendor.url.bug" value="http://bugreport.sun.com/bugreport/"/>
+    <property name="sun.cpu.endian" value="little"/>
+    <property name="sun.io.unicode.encoding" value="UnicodeLittle"/>
+    <property name="sun.cpu.isalist" value=""/>
+  </properties>
+  <testcase classname="AppTest" name="testApp" time="0.007"/>
+</testsuite>