Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pull up to date #65

Open
wants to merge 62 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
5267e0e
Update TestGreeter.java
DamiaNeoDon Aug 27, 2022
dbbd4a7
dodany test case do test greeter file
DamiaNeoDon Aug 27, 2022
e9dcf87
zmiana w nazwie headeru testu w pliku greeting tester
DamiaNeoDon Aug 27, 2022
485b90a
nowy test case- badam auto jenkins every 1minute
DamiaNeoDon Aug 27, 2022
30b5cc1
update nazwy greeting nr 4w maven i testujemy automat scm
DamiaNeoDon Aug 27, 2022
eb9b975
zmiany w project package_application
DamiaNeoDon Aug 28, 2022
214d24d
nowa notka w tym tucie
DamiaNeoDon Aug 28, 2022
99b51bd
dodana notka w jobie do deployowana w Head2
DamiaNeoDon Aug 28, 2022
e61cba0
dodane wszystkie pliki z jenkins123 folder
DamiaNeoDon Aug 28, 2022
2b24a8f
raz jeszce push by zmienic contener tomcata i header w pliku
DamiaNeoDon Aug 28, 2022
54b1b11
dodane pliki tomcata do repo
DamiaNeoDon Aug 29, 2022
b7861ec
Update index.jsp
DamiaNeoDon Aug 29, 2022
cf49c6c
dodane pliki z tomcat prod
DamiaNeoDon Aug 29, 2022
9723427
Merge branch 'master' of https://github.com/DamiaNeoDon/Jenkins_Upgra…
DamiaNeoDon Aug 29, 2022
3055831
Update MavenProjectDSL.groovy
DamiaNeoDon Aug 29, 2022
9dc67b3
modified groovy seed job maven
DamiaNeoDon Aug 29, 2022
dad01ff
dodane pliki ze zmienionym maven seed job itp
DamiaNeoDon Aug 29, 2022
78f28b2
added modified jenkins file
DamiaNeoDon Aug 30, 2022
1193dff
Update Jenkinsfile
DamiaNeoDon Aug 30, 2022
677951e
Update Jenkinsfile
DamiaNeoDon Aug 30, 2022
b2200eb
Update Jenkinsfile
DamiaNeoDon Aug 30, 2022
a289e8e
zmiany w jenkins, dodany concluding step
DamiaNeoDon Aug 30, 2022
80211bc
Merge branch 'master' of https://github.com/DamiaNeoDon/Jenkins_Upgra…
DamiaNeoDon Aug 30, 2022
7fccf27
Update Jenkinsfile
DamiaNeoDon Aug 30, 2022
26f4201
Update Jenkinsfile
DamiaNeoDon Aug 30, 2022
7a9dad6
Update Jenkinsfile
DamiaNeoDon Aug 30, 2022
c97052e
Update Jenkinsfile
DamiaNeoDon Aug 30, 2022
5354cf3
zmiany w jenkins w tomcat folder
DamiaNeoDon Aug 30, 2022
1d92eaf
Merge branch 'master' of https://github.com/DamiaNeoDon/Jenkins_Upgra…
DamiaNeoDon Aug 30, 2022
2f1bfbb
Update Jenkinsfile
DamiaNeoDon Aug 30, 2022
54ee4fd
Update Jenkinsfile
DamiaNeoDon Aug 30, 2022
f4a8596
zmiany w pipeline code sample
DamiaNeoDon Aug 30, 2022
3695174
Merge branch 'master' of https://github.com/DamiaNeoDon/Jenkins_Upgra…
DamiaNeoDon Aug 30, 2022
bb25bcf
Update Jenkinsfile
DamiaNeoDon Aug 30, 2022
54d6994
Update Jenkinsfile
DamiaNeoDon Aug 30, 2022
b8050a9
Update Jenkinsfile
DamiaNeoDon Aug 30, 2022
3af5651
Update index.jsp
DamiaNeoDon Aug 30, 2022
5ddd428
dodane zmiany w jenkins, code pipeline version 2
DamiaNeoDon Aug 30, 2022
f860adc
dodany initializer i tool do jenkins maven java tomcat sample jenkins…
DamiaNeoDon Aug 30, 2022
b2ceee5
Update Jenkinsfile
DamiaNeoDon Aug 30, 2022
cda935c
Update Jenkinsfile
DamiaNeoDon Aug 30, 2022
03930fe
Update Jenkinsfile
DamiaNeoDon Aug 30, 2022
eb18909
Update Jenkinsfile
DamiaNeoDon Aug 30, 2022
4562d86
Update Jenkinsfile
DamiaNeoDon Aug 30, 2022
b5c951a
Update Jenkinsfile
DamiaNeoDon Aug 30, 2022
6d8567e
Update Jenkinsfile
DamiaNeoDon Aug 30, 2022
3096467
Update Jenkinsfile
DamiaNeoDon Aug 30, 2022
5d88da9
cofka zmian w pliku minimal pipeline
DamiaNeoDon Aug 30, 2022
87fc32b
Update Jenkinsfile
DamiaNeoDon Aug 30, 2022
a050877
Update Jenkinsfile
DamiaNeoDon Aug 30, 2022
30f3bae
Update Jenkinsfile
DamiaNeoDon Aug 30, 2022
d7c0c64
Update Jenkinsfile
DamiaNeoDon Aug 30, 2022
8efcbd7
Update Jenkinsfile
DamiaNeoDon Aug 30, 2022
2e2bf97
Update Jenkinsfile
DamiaNeoDon Aug 30, 2022
5ebbd62
Update Jenkinsfile
DamiaNeoDon Aug 30, 2022
2cfc729
Update Jenkinsfile
DamiaNeoDon Aug 30, 2022
c0b317e
Update Jenkinsfile
DamiaNeoDon Aug 30, 2022
7f3ae7a
added working code pipeline, nie dziala tylko z powodu 9090 i9091 not…
DamiaNeoDon Aug 30, 2022
b1263d3
dodane agent jar i remoting folder
DamiaNeoDon Aug 30, 2022
64d2590
nowe pliki i folder emoting dodane
DamiaNeoDon Aug 30, 2022
0c9592d
dodane dir docker1, zmiany w jenkins file, utworzylem docker file
DamiaNeoDon Aug 31, 2022
ad8b95b
Update dockerfile
DamiaNeoDon Aug 31, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Binary file modified .DS_Store
Binary file not shown.
14 changes: 10 additions & 4 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ pipeline {
stages {
stage('Init') {
steps {
echo 'Hi, this is Anshul from LevelUp360'
echo 'Hi, this is DamiaNeoDon this time'
echo 'We are Starting the Testing'
}
}
Expand All @@ -17,10 +17,16 @@ pipeline {
echo "Deploying in Staging Area"
}
}
stage('Deploy Production') {
stage('Deploy Production 123') {
steps {
echo "Deploying in Production Area"
echo "Deploying in Production Area 321"
}

}
stage('Concluding step') {
steps {
echo "Concluding extra step in production"
}
}
}
}
}
4 changes: 2 additions & 2 deletions MavenProjectDSL.groovy
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
job('First-Maven-Project-Via-DSL') {
description("First Maven job generated by the DSL on ${new Date()}, the project is a small Maven project hosted on github")
scm {
git("https://github.com/anshulc55/Jenkins_Upgradev3.git", 'master')
git("https://github.com/DamiaNeoDon/Jenkins_Upgradev3.git", 'master')
}
triggers {
scm('* * * * *')
Expand All @@ -13,4 +13,4 @@ job('First-Maven-Project-Via-DSL') {
//archive the war file generated
archiveArtifacts '**/*.jar'
}
}
}
4 changes: 0 additions & 4 deletions java-tomcat-sample-docker/Dockerfile

This file was deleted.

25 changes: 0 additions & 25 deletions java-tomcat-sample-docker/Jenkinsfile

This file was deleted.

44 changes: 44 additions & 0 deletions java-tomcat-sample-docker1/.classpath
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" path="target/generated-sources/annotations">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="ignore_optional_problems" value="true"/>
<attribute name="m2e-apt" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="ignore_optional_problems" value="true"/>
<attribute name="m2e-apt" value="true"/>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
23 changes: 23 additions & 0 deletions java-tomcat-sample-docker1/.project
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>java-tomcat-sample</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
</projectDescription>
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
org.eclipse.jdt.apt.aptEnabled=false
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
org.eclipse.jdt.core.compiler.compliance=1.5
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
org.eclipse.jdt.core.compiler.processAnnotations=disabled
org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.source=1.5
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
53 changes: 53 additions & 0 deletions java-tomcat-sample-docker1/Jenkinsfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
pipeline {
agent any
tools {
maven 'LokalnyMaven'
jdk 'LokalnnyJDK'
}
stages {
stage ('Initialize') {
steps {
sh '''
echo "PATH = ${PATH}"
echo "M2_HOME = ${M2_HOME}"
'''
}
}
<<<<<<< HEAD

stage('Build Application123') {
steps {
sh 'mvn -f java-tomcat-sample/pom.xml clean package'
}
post {
success {
echo "Now Archiving the Artifacts...."
archiveArtifacts artifacts: '**/*.war'
}
}
}
stage('Deploy in Staging Environment'){
steps{
build job: 'Deploy_application_staging_envinronment'

stage ('Build') {
=======
stage('Build Application') {
>>>>>>> c0b317e13f4fbba9fd1bf336a742ce72fe1c6bc9
steps {
sh 'mvn -f java-tomcat-sample/pom.xml clean package'
}
post {
success {
echo "Now Archiving the Artifacts...."
archiveArtifacts artifacts: '**/*.war'
}
}
}
stage('Create tomcat docker image'){
steps{
sh 'docker build . -t tomcatsamplewevapp:$env.BUILD_ID'
}
}
}
}
File renamed without changes.
7 changes: 7 additions & 0 deletions java-tomcat-sample-docker1/dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
FROM tomcat:9.0.65

ADD **/*.war /usr/local/tomcat/webapps

EXPOSE 7070

CMD ["catalina.sh", "run"]
File renamed without changes.
7 changes: 7 additions & 0 deletions java-tomcat-sample-docker1/src/main/webapp/index.jsp
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<html>
<body>
<h2>Hello World! Welcome to Jenkins Training v2 Code Pipeline...notka moja attempt2, teraz attempt 3. dlaczego nie skubie tego z builda hmmm i co zrobić zeby skubało samo</h2>
<p>Dzięki za partycypacje w tym tucie ,,, VERSION 2 CODE PIPELINE</p>
<p>raz jest raz nie ma, teraz zmiana dla 9091 prod</p>
</body>
</html>
38 changes: 35 additions & 3 deletions java-tomcat-sample/Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,39 @@
pipeline {
agent any
tools {
maven 'LokalnyMaven'
jdk 'LokalnnyJDK'
}
stages {
stage ('Initialize') {
steps {
sh '''
echo "PATH = ${PATH}"
echo "M2_HOME = ${M2_HOME}"
'''
}
}
<<<<<<< HEAD

stage('Build Application123') {
steps {
sh 'mvn -f java-tomcat-sample/pom.xml clean package'
}
post {
success {
echo "Now Archiving the Artifacts...."
archiveArtifacts artifacts: '**/*.war'
}
}
}
stage('Deploy in Staging Environment'){
steps{
build job: 'Deploy_application_staging_envinronment'

stage ('Build') {
=======
stage('Build Application') {
>>>>>>> c0b317e13f4fbba9fd1bf336a742ce72fe1c6bc9
steps {
sh 'mvn -f java-tomcat-sample/pom.xml clean package'
}
Expand All @@ -14,7 +46,7 @@ pipeline {
}
stage('Deploy in Staging Environment'){
steps{
build job: 'Deploy_Application_Staging_Env'
build job: 'Deploy_application_staging_envinronment'

}

Expand All @@ -24,8 +56,8 @@ pipeline {
timeout(time:5, unit:'DAYS'){
input message:'Approve PRODUCTION Deployment?'
}
build job: 'Deploy_Application_Prod_Env'
build job: 'Deploy_application_prod_envinronment'
}
}
}
}
}
4 changes: 3 additions & 1 deletion java-tomcat-sample/src/main/webapp/index.jsp
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<html>
<body>
<h2>Hello World! Welcome to Jenkins Training v2 Code Pipeline...</h2>
<h2>Hello World! Welcome to Jenkins Training v2 Code Pipeline...notka moja attempt2, teraz attempt 3. dlaczego nie skubie tego z builda hmmm i co zrobić zeby skubało samo</h2>
<p>Dzięki za partycypacje w tym tucie ,,, VERSION 2 CODE PIPELINE</p>
<p>raz jest raz nie ma, teraz zmiana dla 9091 prod</p>
</body>
</html>
Binary file added jenkins_node/agent.jar
Binary file not shown.
Binary file added jenkins_node/bin/slave.jar
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Empty file.
Empty file.
26 changes: 26 additions & 0 deletions jenkins_node/remoting/logs/remoting.log.2
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
sie 30, 2022 3:33:16 PM hudson.remoting.jnlp.Main createEngine
INFO: Setting up agent: LOCAL_NODE
sie 30, 2022 3:33:16 PM hudson.remoting.jnlp.Main$CuiListener <init>
INFO: Jenkins agent is running in headless mode.
sie 30, 2022 3:33:16 PM hudson.remoting.Engine startEngine
INFO: Using Remoting version: 4.13.3
sie 30, 2022 3:33:16 PM org.jenkinsci.remoting.engine.WorkDirManager initializeWorkDir
INFO: Using /Users/fradaperypetie/Dysk Google/git-github/JENKINS123/jenkins_node/remoting as a remoting work directory
sie 30, 2022 3:33:17 PM hudson.remoting.jnlp.Main$CuiListener status
INFO: WebSocket connection open
sie 30, 2022 3:33:17 PM hudson.remoting.jnlp.Main$CuiListener status
INFO: Connected
sie 30, 2022 4:08:12 PM hudson.remoting.jnlp.Main$CuiListener status
INFO: Write side closed
sie 30, 2022 4:08:12 PM hudson.remoting.jnlp.Main$CuiListener status
INFO: Read side closed
sie 30, 2022 4:08:12 PM hudson.remoting.jnlp.Main$CuiListener status
INFO: Read side closed
sie 30, 2022 4:08:12 PM hudson.remoting.jnlp.Main$CuiListener status
INFO: Terminated
sie 30, 2022 4:08:12 PM hudson.remoting.jnlp.Main$CuiListener status
INFO: Read side closed
sie 30, 2022 4:08:12 PM hudson.remoting.jnlp.Main$CuiListener status
INFO: Performing onReconnect operation.
sie 30, 2022 4:08:12 PM jenkins.slaves.restarter.JnlpSlaveRestarterInstaller$EngineListenerAdapterImpl onReconnect
INFO: Restarting agent via jenkins.slaves.restarter.UnixSlaveRestarter@310b667f
Binary file modified maven-samples/.DS_Store
Binary file not shown.
Binary file modified maven-samples/single-module/.DS_Store
Binary file not shown.
Binary file modified maven-samples/single-module/src/.DS_Store
Binary file not shown.
Binary file modified maven-samples/single-module/src/main/.DS_Store
Binary file not shown.
Binary file modified maven-samples/single-module/src/main/java/.DS_Store
Binary file not shown.
Binary file modified maven-samples/single-module/src/main/java/com/.DS_Store
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,31 @@ public void greetShouldIncludeTheOneBeingGreeted() {
}

@Test
public void greetShouldIncludeGreetingPhrase() {
String someone = "World";
public void greetShouldIncludeGreetingPhrase0() {
String someone = "World1";

assertThat(greeter.greet(someone).length(), is(greaterThan(someone.length())));
}

@Test
public void greetShouldIncludeGreetingMessage() {
String someone = "World, Thanks you making me Happy";
public void greetShouldIncludeGreetingMessage1() {
String someone = "World2, Thanks you making me Happy";

assertThat(greeter.greet(someone).length(), is(greaterThan(someone.length())));
}
@Test
public void greetShouldIncludeGreetingPhrase2() {
String someone = "World3, jadymy dalej, wlazlem tu z terminala również i savuje ten plik";

assertThat(greeter.greet(someone).length(), is(greaterThan(someone.length())));
}

@Test
public void greetShouldIncludeGreetingPhrase3() {
String someone = "World4, test mavena auto scm auto ";

assertThat(greeter.greet(someone).length(), is(greaterThan(someone.length())));
}


}
Binary file added temp/apache-tomcat-9.0.65.zip
Binary file not shown.
Loading