diff --git a/Jenkinsfile-nov22 b/Jenkinsfile-nov22 new file mode 100644 index 0000000000..369f1ca931 --- /dev/null +++ b/Jenkinsfile-nov22 @@ -0,0 +1,21 @@ +@Library("novlibs") _ +pipeline{ + agent any + stages{ + stage("git checkout"){ + steps{ + git credentialsId: 'github-creds-ov22', url: 'https://github.com/navalgoski/myweb.git' + } + } + stage("maven build"){ + steps{ + sh 'mvn clean package' + } + } + stage("Dev Tomcat Deploy"){ + steps{ + tomcatDeploy ("10.100.202.100", "ec2-user", "tomcat-dev") + } + } + } +} diff --git a/Jenkinsfile2 b/Jenkinsfile2 index abfcbe2af1..4c6df1ef4c 100644 --- a/Jenkinsfile2 +++ b/Jenkinsfile2 @@ -1,23 +1,29 @@ -node { - stage('Git'){ - git 'https://github.com/javahometech/myweb' - } - - stage('Maven Build'){ - sh 'mvn clean package' - } - stage('Archive Artifacts'){ - archiveArtifacts 'target/myweb.war' - } - - stage('Email'){ - - mail bcc: '', body: '''Thanks, -Java Home''', cc: '', from: '', replyTo: '', subject: 'Pipeline Demo', to: 'hari.kammana@gmail.com' - - - - - - } -} +pipeline{ + agent any + stages{ + stage("Maven Build"){ + when{ + branch "dev" + } + steps{ + sh "mvn package" + } + } + stage("Deploy To dev"){ + when{ + branch "dev" + } + steps{ + echo "deploying to development server" + } + } + stage("Deploy To prod"){ + when{ + branch"master" + } + steps{ + echo "deploying to master server" + } + } + } + } diff --git a/august/aug22.html b/august/aug22.html new file mode 100644 index 0000000000..027c63f79b --- /dev/null +++ b/august/aug22.html @@ -0,0 +1,4 @@ +

Independance day + demo create branch + fetch +

diff --git a/august/gitbranch.html b/august/gitbranch.html new file mode 100644 index 0000000000..7e0024c63c --- /dev/null +++ b/august/gitbranch.html @@ -0,0 +1,4 @@ +

+ created dev branch + stash command 2 +

\ No newline at end of file diff --git a/august/gitdevbranch.html b/august/gitdevbranch.html new file mode 100644 index 0000000000..c2b18a94c1 --- /dev/null +++ b/august/gitdevbranch.html @@ -0,0 +1,3 @@ +

branch commit + stash command +

\ No newline at end of file diff --git a/august/stashurgentwork b/august/stashurgentwork new file mode 100644 index 0000000000..5d51184b43 --- /dev/null +++ b/august/stashurgentwork @@ -0,0 +1 @@ +uregent work \ No newline at end of file diff --git a/august/stashurgentwork.html b/august/stashurgentwork.html new file mode 100644 index 0000000000..ee090625ea --- /dev/null +++ b/august/stashurgentwork.html @@ -0,0 +1,3 @@ +

+ uregent work +

\ No newline at end of file diff --git a/docker-ci-cd b/docker-ci-cd index 6baf2273bb..0207e8761c 100644 --- a/docker-ci-cd +++ b/docker-ci-cd @@ -29,4 +29,4 @@ node{ } } - + hi kscdniwedcmn kas diff --git a/jhcansible/apache.yml b/jhcansible/apache.yml new file mode 100644 index 0000000000..f137dc97d1 --- /dev/null +++ b/jhcansible/apache.yml @@ -0,0 +1,16 @@ +- hosts: 10.100.102.28 + become: True + tasks: + - name: install apache + yum: + name: httpd + state: present + - name: Copy index file onto apache + copy: + src: index.html + dest: /var/www/html/ + - name: start and enable apache + service: + name: httpd + state: started + enabled: True diff --git a/jhcansible/index.html b/jhcansible/index.html new file mode 100644 index 0000000000..e049eef8d9 --- /dev/null +++ b/jhcansible/index.html @@ -0,0 +1,2 @@ +

ansible demo1 +

diff --git a/naval.jpeg.jpeg b/naval.jpeg.jpeg new file mode 100644 index 0000000000..cb133748a2 Binary files /dev/null and b/naval.jpeg.jpeg differ diff --git a/pom.xml b/pom.xml index 773dfeeeac..60e9d2b30f 100644 --- a/pom.xml +++ b/pom.xml @@ -1,51 +1,58 @@ - 4.0.0 - in.javahome - myweb - war - 8.3.2 - Java Home myweb - http://maven.apache.org - - - kammana - - - - com.oracle.bedrock - bedrock-runtime-maven - 5.1.2 - - - - junit - junit - 3.8.1 - test - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + 4.0.0 + in.javahome + myweb + war + 0.0.9 + my-app + http://maven.apache.org - - - - - nexusRepo - http://13.233.230.166:8081/repository/maven-snapshots/ - - - - nexusRepo - http://13.233.230.166:8081/repository/maven-releases/ - - - - - - maven1 - Maven.org - http://repo1.maven.org/maven2 - - - - - + + + javax.servlet + javax.servlet-api + 3.0.1 + + + + junit + junit + 3.8.1 + test + + + com.lowagie + itext + 2.1.7 + + + org.apache.poi + poi + 5.2.0 + + + org.apache.poi + poi-ooxml + 5.2.0 + + + + 7 + 1.7 + + + + + org.apache.maven.plugins + maven-war-plugin + 3.3.1 + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + + + + diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 0f915b20e5..e48b160929 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -1,5 +1,8 @@ - + -

JavaHome App 2020 Weekend

+

Rakhshabandhan 2022

+ + + naval diff --git a/src/main/webapp/naval.jpeg.jpeg b/src/main/webapp/naval.jpeg.jpeg new file mode 100644 index 0000000000..cb133748a2 Binary files /dev/null and b/src/main/webapp/naval.jpeg.jpeg differ