Update README.md

2-Git/README.md

@@ -1,4 +1,14 @@
-# Version Control System
+# Version Control SystemTable of Contents
+
+Table of Contents
+
+1. [Purpose of Git Branches](#purpose-of-git-branches)
+2. [Creating a Branch](#creating-a-branch)
+3. [Switching Between Branches](#switching-between-branches)
+4. [Merging Branches](#merging-branches)
+5. [Deleting a Branch](#deleting-a-branch)
+
+
 
 ## Introduction
 

5-jenkins/5.2-simple-java-program/Helloworld.java

@@ -0,0 +1,6 @@
+public class Helloworld {
+  public static void main(String[] args) {
+	System.out.println("Hello, World From Bhagyalakshmi");
+  }
+}
+

5-jenkins/5.3-maven-project/my-app/src/main/java/com/mycompany/app/App.java

@@ -8,6 +8,6 @@ public class App
 {
     public static void main( String[] args )
     {
-        System.out.println( "Hello World! From Varun Manik in Simplilearn class" );
+        System.out.println( "Hello World! From Bhagyalakshmi " );
     }
 }

5-jenkins/5.3-maven-project/my-app/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1 +1 @@
-/home/varunmanikoutlo/varun/DevOps-Tutorial/5-jenkins/5.3-maven-project/my-app/src/main/java/com/mycompany/app/App.java
+/home/nicepinkysahoo4/DevOps-Tutorial/DevOps-Tutorial/DevOps-Tutorial/5-jenkins/5.3-maven-project/my-app/src/main/java/com/mycompany/app/App.java

5-jenkins/5.3-maven-project/my-app/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst

@@ -1 +1 @@
-/home/varunmanikoutlo/varun/DevOps-Tutorial/5-jenkins/5.3-maven-project/my-app/src/test/java/com/mycompany/app/AppTest.java
+/home/nicepinkysahoo4/DevOps-Tutorial/DevOps-Tutorial/DevOps-Tutorial/5-jenkins/5.3-maven-project/my-app/src/test/java/com/mycompany/app/AppTest.java

5-jenkins/5.3-maven-project/my-app/target/surefire-reports/TEST-com.mycompany.app.AppTest.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report.xsd" name="com.mycompany.app.AppTest" time="0.042" tests="1" errors="0" skipped="0" failures="0">
+<testsuite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report.xsd" name="com.mycompany.app.AppTest" time="0.016" tests="1" errors="0" skipped="0" failures="0">
   <properties>
     <property name="awt.toolkit" value="sun.awt.X11.XToolkit"/>
     <property name="java.specification.version" value="11"/>
     <property name="sun.cpu.isalist" value=""/>
     <property name="sun.jnu.encoding" value="UTF-8"/>
-    <property name="java.class.path" value="/home/varunmanikoutlo/varun/DevOps-Tutorial/5-jenkins/5.3-maven-project/my-app/target/test-classes:/home/varunmanikoutlo/varun/DevOps-Tutorial/5-jenkins/5.3-maven-project/my-app/target/classes:/home/varunmanikoutlo/.m2/repository/junit/junit/4.11/junit-4.11.jar:/home/varunmanikoutlo/.m2/repository/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar:"/>
+    <property name="java.class.path" value="/home/nicepinkysahoo4/DevOps-Tutorial/DevOps-Tutorial/DevOps-Tutorial/5-jenkins/5.3-maven-project/my-app/target/test-classes:/home/nicepinkysahoo4/DevOps-Tutorial/DevOps-Tutorial/DevOps-Tutorial/5-jenkins/5.3-maven-project/my-app/target/classes:/home/nicepinkysahoo4/.m2/repository/junit/junit/4.11/junit-4.11.jar:/home/nicepinkysahoo4/.m2/repository/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar:"/>
     <property name="java.vm.vendor" value="Ubuntu"/>
     <property name="sun.arch.data.model" value="64"/>
     <property name="java.vendor.url" value="https://ubuntu.com/"/>
@@ -14,36 +14,36 @@
     <property name="os.name" value="Linux"/>
     <property name="sun.java.launcher" value="SUN_STANDARD"/>
     <property name="sun.boot.library.path" value="/usr/lib/jvm/java-11-openjdk-amd64/lib"/>
-    <property name="sun.java.command" value="/home/varunmanikoutlo/varun/DevOps-Tutorial/5-jenkins/5.3-maven-project/my-app/target/surefire/surefirebooter7833339953640500318.jar /home/varunmanikoutlo/varun/DevOps-Tutorial/5-jenkins/5.3-maven-project/my-app/target/surefire 2023-05-06T04-50-04_163-jvmRun1 surefire4344132283997186016tmp surefire_013108013248152437099tmp"/>
+    <property name="sun.java.command" value="/home/nicepinkysahoo4/DevOps-Tutorial/DevOps-Tutorial/DevOps-Tutorial/5-jenkins/5.3-maven-project/my-app/target/surefire/surefirebooter5485097748395712298.jar /home/nicepinkysahoo4/DevOps-Tutorial/DevOps-Tutorial/DevOps-Tutorial/5-jenkins/5.3-maven-project/my-app/target/surefire 2023-05-11T13-59-24_216-jvmRun1 surefire10300217371686179842tmp surefire_016531317073733774176tmp"/>
     <property name="jdk.debug" value="release"/>
-    <property name="surefire.test.class.path" value="/home/varunmanikoutlo/varun/DevOps-Tutorial/5-jenkins/5.3-maven-project/my-app/target/test-classes:/home/varunmanikoutlo/varun/DevOps-Tutorial/5-jenkins/5.3-maven-project/my-app/target/classes:/home/varunmanikoutlo/.m2/repository/junit/junit/4.11/junit-4.11.jar:/home/varunmanikoutlo/.m2/repository/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar:"/>
+    <property name="surefire.test.class.path" value="/home/nicepinkysahoo4/DevOps-Tutorial/DevOps-Tutorial/DevOps-Tutorial/5-jenkins/5.3-maven-project/my-app/target/test-classes:/home/nicepinkysahoo4/DevOps-Tutorial/DevOps-Tutorial/DevOps-Tutorial/5-jenkins/5.3-maven-project/my-app/target/classes:/home/nicepinkysahoo4/.m2/repository/junit/junit/4.11/junit-4.11.jar:/home/nicepinkysahoo4/.m2/repository/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar:"/>
     <property name="sun.cpu.endian" value="little"/>
-    <property name="user.home" value="/home/varunmanikoutlo"/>
+    <property name="user.home" value="/home/nicepinkysahoo4"/>
     <property name="user.language" value="en"/>
     <property name="java.specification.vendor" value="Oracle Corporation"/>
     <property name="java.version.date" value="2023-01-17"/>
     <property name="java.home" value="/usr/lib/jvm/java-11-openjdk-amd64"/>
     <property name="file.separator" value="/"/>
-    <property name="basedir" value="/home/varunmanikoutlo/varun/DevOps-Tutorial/5-jenkins/5.3-maven-project/my-app"/>
+    <property name="basedir" value="/home/nicepinkysahoo4/DevOps-Tutorial/DevOps-Tutorial/DevOps-Tutorial/5-jenkins/5.3-maven-project/my-app"/>
     <property name="java.vm.compressedOopsMode" value="Zero based"/>
     <property name="line.separator" value="&#10;"/>
     <property name="java.specification.name" value="Java Platform API Specification"/>
     <property name="java.vm.specification.vendor" value="Oracle Corporation"/>
     <property name="java.awt.graphicsenv" value="sun.awt.X11GraphicsEnvironment"/>
-    <property name="surefire.real.class.path" value="/home/varunmanikoutlo/varun/DevOps-Tutorial/5-jenkins/5.3-maven-project/my-app/target/surefire/surefirebooter7833339953640500318.jar"/>
+    <property name="surefire.real.class.path" value="/home/nicepinkysahoo4/DevOps-Tutorial/DevOps-Tutorial/DevOps-Tutorial/5-jenkins/5.3-maven-project/my-app/target/surefire/surefirebooter5485097748395712298.jar"/>
     <property name="sun.management.compiler" value="HotSpot 64-Bit Tiered Compilers"/>
     <property name="java.runtime.version" value="11.0.18+10-post-Ubuntu-0ubuntu120.04.1"/>
-    <property name="user.name" value="varunmanikoutlo"/>
+    <property name="user.name" value="nicepinkysahoo4"/>
     <property name="path.separator" value=":"/>
     <property name="os.version" value="5.15.0-1035-aws"/>
     <property name="java.runtime.name" value="OpenJDK Runtime Environment"/>
     <property name="file.encoding" value="UTF-8"/>
     <property name="java.vm.name" value="OpenJDK 64-Bit Server VM"/>
-    <property name="localRepository" value="/home/varunmanikoutlo/.m2/repository"/>
+    <property name="localRepository" value="/home/nicepinkysahoo4/.m2/repository"/>
     <property name="java.vendor.url.bug" value="https://bugs.launchpad.net/ubuntu/+source/openjdk-lts"/>
     <property name="java.io.tmpdir" value="/tmp"/>
     <property name="java.version" value="11.0.18"/>
-    <property name="user.dir" value="/home/varunmanikoutlo/varun/DevOps-Tutorial/5-jenkins/5.3-maven-project/my-app"/>
+    <property name="user.dir" value="/home/nicepinkysahoo4/DevOps-Tutorial/DevOps-Tutorial/DevOps-Tutorial/5-jenkins/5.3-maven-project/my-app"/>
     <property name="os.arch" value="amd64"/>
     <property name="java.vm.specification.name" value="Java Virtual Machine Specification"/>
     <property name="java.awt.printerjob" value="sun.print.PSPrinterJob"/>

5-jenkins/5.3-maven-project/my-app/target/surefire-reports/com.mycompany.app.AppTest.txt

@@ -1,4 +1,4 @@
 -------------------------------------------------------------------------------
 Test set: com.mycompany.app.AppTest
 -------------------------------------------------------------------------------
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.042 s - in com.mycompany.app.AppTest
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.016 s - in com.mycompany.app.AppTest

5-jenkins/README.md

@@ -1,4 +1,4 @@
-# DevOps-Tutorial for Jenkins 1
+# DevOps-Tutorial for Jenkins 6
 DevOps-Tutorial
 # Caltech-DevOps Simplilearn PG Program
 

6-ansible/6.7-S3-Bucket-Using-Terraform/main.tf

@@ -3,7 +3,7 @@ provider "aws" {
   region = "us-east-1"
 }
 resource "aws_s3_bucket" "b" {
-  bucket = "my-tf-test-bucket-345611"
+  bucket = "my-tf1-test-bucket-34561120"
   acl    = "private"
 
   tags = {

6-ansible/6.8-tf-ec2-provisioning/ansible/inventory.ini

@@ -6,7 +6,7 @@ ansible_user=ec2-user
 ansible_ssh_private_key_file=../deployer
 
 [aws_linux_vm]
-wp-server ansible_host=3.81.25.108
+wp-server ansible_host=18.209.168.230
 
 [ubuntu:children]
 ubuntu_vm
@@ -16,4 +16,4 @@ ansible_user=ubuntu
 ansible_ssh_private_key_file=../deployer
 
 [ubuntu_vm]
-my_server_1 ansible_host=44.210.103.164
+my_server_1 ansible_host=44.211.128.2

6-ansible/6.8-tf-ec2-provisioning/ansible/inventory1.ini

@@ -0,0 +1,4 @@
+[my_servers]
+my_server_1 ansible_host="54.152.209.126"
+my_server_2 ansible_host="44.212.28.99"
+my_server_3 ansible_host="54.152.140.33"

6-ansible/6.8-tf-ec2-provisioning/ubuntu-vm.tf

@@ -32,8 +32,8 @@ resource "aws_instance" "ubuntu" {
   ami                    = "ami-007855ac798b5175e"
   instance_type          = "t3.micro"
   key_name               = aws_key_pair.deployer.key_name
-  count                  = 3
   vpc_security_group_ids = ["${aws_security_group.allow_SSH_ubuntu.id}"]
+  count                  = 3
   tags = {
     "Name" = "UBUNTU-${count.index}"
     "ENV"  = "Dev"

6-ansible/wordpress/wp.yaml

@@ -5,7 +5,7 @@
     db_name: wordpress
     db_user: wordpress
     db_password: secure-123
-    db_host: 34.230.43.235  # added DB_HOST
+    db_host: 18.209.168.230  # added DB_HOST
     wp_table_prefix: wp_  # added wp_table_prefix
 
 

index.html

@@ -4,7 +4,7 @@
 
 <head>
 
-<title>XYZ-company/title>
+<title>ABC-company/ </title>
 
 </head>
 
@@ -14,11 +14,13 @@
 
 <h1>This is GitOps Class going on.  </h1>
 
+<h3> Hello To All </h3>
+
 <p>This is a paragraph in Dev Branch. </p>
 
 <p>we are learning about git Merge </p>
 
-
+<p> Merging</p>
 
 </body>