diff --git a/README.md b/README.md index de115ec1c3..89e3080e06 100644 --- a/README.md +++ b/README.md @@ -2,3 +2,5 @@ Modification 1 Modif 2 Modif 3 +Modif 4 +Ajout 1 diff --git a/Vagrantfile b/Vagrantfile new file mode 100644 index 0000000000..9f92d7deae --- /dev/null +++ b/Vagrantfile @@ -0,0 +1,16 @@ +# -*- mode: ruby -*- +# vi: set ft=ruby : + +Vagrant.configure("2") do |config| + config.vm.define "jenkins" do |jenkins| + jenkins.vm.box = "bento/ubuntu-22.04" + jenkins.vm.hostname = "jenkins" + jenkins.vm.network "private_network", ip:"192.168.33.10" + jenkins.vm.provision "shell", path:"jenkins.sh" + jenkins.vm.provider "Virtualbox" do |v| + v.name = "jenkins" + v.memory = 4096 + v.cpus = 2 + end + end +end diff --git a/file5 b/file5 new file mode 100644 index 0000000000..e38a66424b --- /dev/null +++ b/file5 @@ -0,0 +1 @@ +nouveau test diff --git a/jenkins-files-pipeline b/jenkins-files-pipeline new file mode 100644 index 0000000000..788b442252 --- /dev/null +++ b/jenkins-files-pipeline @@ -0,0 +1,63 @@ +pipeline +{ + agent any + tools + { + maven "localMaven" + } + stages + { + stage('Clone CodeBase') + { + steps + { + echo 'Clone github repos' + git 'https://github.com/bperdreau/maven-project.git' + } + } + stage('Compile') + { + steps + { + echo 'Compiling with local Maven' + withMaven(maven:'localMaven') + { + bat "mvn compile" + } + } + } + stage('Test') + { + steps + { + echo 'Testing' + withMaven(maven:'localMaven') + { + bat "mvn test" + } + } + } + stage('Build') + { + steps + { + echo 'Building' + withMaven(maven:'localMaven') + { + bat "mvn -B -DskipTests clean package" + } + } + } + stage('Analyse and send Results to Sonar') + { + steps + { + echo 'Analyse with Sonar' + withSonarQubeEnv(installationName: 'localSonar', credentialsId: 'token4sonar') + { + bat "mvn -B -DskipTests clean package sonar:sonar" + } + } + } + } +} diff --git a/jenkins.sh.txt b/jenkins.sh.txt new file mode 100644 index 0000000000..1ebd6d875e --- /dev/null +++ b/jenkins.sh.txt @@ -0,0 +1,30 @@ +#!/bin/bash +echo "Adding apt-keys" +wget -q -O - https://pkg.jenkins.io/debian-stable/jenkins.io-2023.key | sudo apt-key add - +sudo sh -c 'echo deb http://pkg.jenkins.io/debian-stable binary/ > /etc/apt/sources.list.d/jenkins.list' + +echo "Updating apt-get" +sudo apt-get -qq update + +echo "Installing default-java" +sudo apt-get -y install default-jre > /dev/null 2>&1 +sudo apt-get -y install default-jdk > /dev/null 2>&1 + +echo "Installing git" +sudo apt-get -y install git > /dev/null 2>&1 + +echo "Installing git-ftp" +sudo apt-get -y install git-ftp > /dev/null 2>&1 + +echo "Installing jenkins" +sudo apt-get -y install jenkins > /dev/null 2>&1 +sudo service jenkins start + +sleep 1m + +echo "Installing Maven" +sudo apt-get install maven -y + +echo "Installing Jenkins Plugins" +JENKINSPWD=$(sudo cat /var/lib/jenkins/secrets/initialAdminPassword) +echo $JENKINSPWD diff --git a/server/src/main/java/com/example/Greeter.java b/server/src/main/java/com/example/Greeter.java index 591110f1f9..1eda20cd0a 100644 --- a/server/src/main/java/com/example/Greeter.java +++ b/server/src/main/java/com/example/Greeter.java @@ -2,8 +2,8 @@ import java.lang.Math; -import java.io.* ; -import java.io.* ; +/** import java.io.* ; */ +/** import java.io.* ; */ /** * this is a Class */