6 Commits

Author SHA1 Message Date
Nana Janashia
31ae1c5153 Add simple UI 2021-07-12 12:32:27 +02:00
Nana Janashia
b128506eec Update Jenkinsfile 2021-01-04 10:14:43 +00:00
Nana Janashia
0a40971e52 add kubectl deploy step 2020-12-04 19:11:10 +01:00
Nana Janashia
ba11b6ecc8 revert 2020-12-04 19:00:41 +01:00
Nana Janashia
127fe8818c add kubectl create 2020-12-04 16:46:59 +01:00
Nana Janashia
322a9fb1b9 add new feature 2020-12-04 16:22:34 +01:00
7 changed files with 10 additions and 88 deletions

45
Jenkinsfile vendored
View File

@@ -2,33 +2,11 @@
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'
}
}
}
@@ -36,11 +14,6 @@ pipeline {
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}"
}
}
}
}
@@ -48,27 +21,11 @@ pipeline {
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'
}
sh 'kubectl create deployment nginx-deployment --image=nginx'
}
}
}

View File

@@ -1,24 +0,0 @@
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

View File

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

View File

@@ -6,7 +6,7 @@
<groupId>com.example</groupId>
<artifactId>java-maven-app</artifactId>
<version>1.1.5</version>
<version>1.1.4</version>
<build>
<plugins>

View File

@@ -1,5 +1,5 @@
#Generated by Maven
#Sat Dec 05 14:30:39 UTC 2020
version=1.1.5
#Sun Nov 29 08:01:35 UTC 2020
version=1.1.4
groupId=com.example
artifactId=java-maven-app

View File

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

View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
<testsuite tests="1" failures="0" name="AppTest" time="0.007" errors="0" skipped="0">
<testsuite tests="1" failures="0" name="AppTest" time="0.01" 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"/>
@@ -60,5 +60,5 @@
<property name="sun.io.unicode.encoding" value="UnicodeLittle"/>
<property name="sun.cpu.isalist" value=""/>
</properties>
<testcase classname="AppTest" name="testApp" time="0.007"/>
<testcase classname="AppTest" name="testApp" time="0.01"/>
</testsuite>