AdaptNext · xbsoft · Apr 30, 2018 · Apr 30, 2018 · Apr 30, 2018 · Apr 30, 2018
diff --git a/GIT练习手册.docx b/GIT练习手册.docx
diff --git a/JMeterDemo.jmx b/JMeterDemo.jmx
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -0,0 +1,89 @@
+pipeline {
+  agent any
+  stages {
+    stage('Code') {
+      steps {
+        git 'https://github.com/xbsoft/SimpleMavenJunitWebApp'
+      }
+    }
+
+
+    stage('Build and Test') {
+      parallel {
+        stage('Build') {
+          steps {
+            readFile 'pom.xml'
+            script {
+					if(isUnix() == true) {
+            sh 'mvn install -DskipTests'
+					}else {
+            bat 'mvn install -DskipTests'
+					}
+				}
+          }
+        }
+
+        stage('UnitTest') {
+          steps {
+            script {
+					if(isUnix() == true) {
+            sh 'mvn package'
+					}else {
+            bat 'mvn package'
+					}
+				}
+          }
+        }
+      }
+    }
+    stage('Check') {
+      parallel {
+        stage('Check') {
+          steps {
+            script {
+					if(isUnix() == true) {
+            sh 'mvn -e -B sonar:sonar -Dsonar.host.url=http://106.14.68.164:9000 -Dsonar.sources=src\\main -Dsonar.scm.provider=git -Dsonar.java.binaries=target && exit %%ERRORLEVEL%%'
+					}else {
+            bat 'mvn -e -B sonar:sonar -Dsonar.host.url=http://106.14.68.164:9000 -Dsonar.sources=src\\main -Dsonar.scm.provider=git -Dsonar.java.binaries=target && exit %%ERRORLEVEL%%'
+					}
+				}
+          }
+        }
+        stage('checkx') {
+          steps {
+            script {
+					if(isUnix() == true) {
+                     sh 'ls -l'
+         	}else {
+                     bat 'dir'
+         }
+				}
+          }
+        }
+      }
+    }
+    stage('NexusUpload') {
+      steps {
+        sleep 10
+        build 'NexusUpload'
+      }
+    }
+    stage('Selenium') {
+      steps {
+        build 'SeleniumDemo'
+      }
+    }
+    stage('Jmeter') {
+      steps {
+        build 'JMeterDemo'
+      }
+    }
+  }
+  post {
+    always {
+      junit '**/reports/junit/*.xml'
+
+    }
+
+  }
+}
diff --git a/README.md b/README.md
@@ -1 +1,50 @@
-# SimpleMavenJunitWebApp
+# SimpleMavenJunitWebApp
+# demo 9.2
+
+演示目标
+课程学员：初级、中级、高级
+角色：开发，测试，项目经理，产品经理
+价值: 快速引入业界最佳实践，短期落地，长期规划，系统化培训与实施，能力培养，社区引荐等
+
+范围
+CI/CD/DevOps
+
+基础
+JDK
+Tomcat
+
+RedMine/GitHub/Maven/Jenkins/SonarQube/JUnit样例
+Jenkins Job:
+MavenGitDemo
+步骤:
+指定Redmine演示项目
+从github取demo代码
+使用Maven编译、运行JUnit
+使用Maven调用SonarQube
+部署war到Tomcat
+
+效果：
+手动触发完整编译
+在Jenkins编译结果的变更说明中link到RedMine的记录
+链接编译结果至Sonar报告
+在编译结果中查看JUnit测试结果
+
+后续
+编译时从Nexus中取得依赖项
+编译后将新版本存入Nexus
+在测试后进行一键提权
+
+
+工具链
+code, GitHub
+IDE
+Jira/Confluence
+Maven
+Jenkins
+SonarQube
+Zephyr
+Selenium
+Jmeter
+Docker
+K8s
+Hygieia
diff --git a/Zjm.docx b/Zjm.docx
diff --git a/licedse b/licedse
diff --git a/one.txt b/one.txt
@@ -0,0 +1 @@
+demo
diff --git a/qn.txt b/qn.txt
diff --git a/readme.txt b/readme.txt
@@ -0,0 +1,2 @@
+hello shuai
+demo2
diff --git a/songyang.txt b/songyang.txt
@@ -0,0 +1 @@
+hello git
diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp
@@ -2,5 +2,6 @@
 <body>
 <h2><font face="verdana" color="green">Welcome TO AdaptNext</font></h2>
 <i><font face="verdana" color="green">Version 101</font></i>
+<i><font face="verdana" color="green">Author: You</font></i>
 </body>
 </html>
diff --git a/src/test/java/com/nijjwal/SimpleTest.java b/src/test/java/com/nijjwal/SimpleTest.java
@@ -1,3 +1,4 @@
+//demo9
 package com.nijjwal;
 
 import static org.junit.Assert.assertEquals;

diff --git a/src/test/test.docx b/src/test/test.docx
diff --git a/testxj b/testxj
@@ -0,0 +1 @@
+qwqweqasd
diff --git a/two.txt b/two.txt
diff --git a/ypk.txt b/ypk.txt
@@ -0,0 +1 @@
+git is a tool