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

Teste #23

Open
wants to merge 68 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
f15604e
Update index.xhtml
tsuyoshimasuno Dec 24, 2018
495db8b
Update index.xhtml
tsuyoshimasuno Dec 25, 2018
ab98107
Update index.xhtml
tsuyoshimasuno Dec 25, 2018
74f5f8a
Merge commit 'ab9810702f0b2c2d01116cfda129037dac5fec94' into HEAD
tsuyoshimasuno Dec 25, 2018
7c4d021
Update index.xhtml
tsuyoshimasuno Dec 25, 2018
cc60bcb
Merge commit '7c4d0217ea7997917c45e5c7d1f7a2c62ecade2e' into HEAD
tsuyoshimasuno Dec 25, 2018
98d48e0
Update index.xhtml
tsuyoshimasuno Dec 25, 2018
d0a0df3
Merge commit '98d48e011ef864a3f1d07a9538f3ea77b356f577' into HEAD
tsuyoshimasuno Dec 25, 2018
a7bf55d
Update index.xhtml
tsuyoshimasuno Dec 25, 2018
ad96c3a
Merge commit 'cc60bcb39452d32dc4e671255201c5a52f98ab1f' into HEAD
tsuyoshimasuno Dec 25, 2018
06b7de7
Merge commit 'a7bf55d7a3209fd03c1631df53d0d918a5039daf' into HEAD
tsuyoshimasuno Dec 25, 2018
f6cedd8
Update index.xhtml
tsuyoshimasuno Jan 5, 2019
631815a
Merge commit 'f6cedd8850b36dbb32f4497d8eb19bfdd48d6c30' into HEAD
tsuyoshimasuno Jan 5, 2019
446c2b1
Update index.xhtml
tsuyoshimasuno Jan 5, 2019
84e6c1c
Update index.xhtml
tsuyoshimasuno Jan 5, 2019
6d4cb91
Merge commit '84e6c1c571d20a3ab471c2a074f697705f986d53' into HEAD
tsuyoshimasuno Jan 5, 2019
531029a
Update index.xhtml
tsuyoshimasuno Jan 5, 2019
8b0360f
Update index.xhtml
tsuyoshimasuno Jan 5, 2019
1243094
Merge commit '8b0360f4921ba50bbc76c3d033864bd690ecea94' into HEAD
tsuyoshimasuno Jan 5, 2019
e3be997
Update index.xhtml
tsuyoshimasuno Jan 6, 2019
0c58c57
Update index.xhtml
tsuyoshimasuno Jan 6, 2019
e478ac8
Merge commit '0c58c571182ee41f91d2d465ff6c0164915cb97d' into HEAD
tsuyoshimasuno Jan 6, 2019
116819c
Update index.xhtml
tsuyoshimasuno Jan 6, 2019
fe058ea
Merge commit '116819cc852c83690d9603209709853162f649b4' into HEAD
tsuyoshimasuno Jan 6, 2019
a2e77a9
Update index.xhtml
tsuyoshimasuno Jan 6, 2019
5e16636
Merge commit 'a2e77a9f98955d8a5bb6a7fb6065c8fb4d6b9041' into HEAD
tsuyoshimasuno Jan 6, 2019
db109df
Update index.xhtml
tsuyoshimasuno Jan 6, 2019
6b2aa3e
Merge commit 'db109df1f701b6792fe76c1a5b7b65c28bb90a92' into HEAD
tsuyoshimasuno Jan 6, 2019
6a0ea15
alterando o filtro
tsuyoshimasuno Jan 8, 2019
06979bb
atualizndo novamente o filtro
tsuyoshimasuno Jan 8, 2019
e3331e1
Update index.xhtml
tsuyoshimasuno Jan 8, 2019
2c899ce
Update index.xhtml
tsuyoshimasuno Jan 8, 2019
24aafdc
Merge commit '2c899cec48319396bb1f8b33e3dcf80b2a7f1420' into HEAD
tsuyoshimasuno Jan 8, 2019
4702d36
alterando o filtro por periodo
tsuyoshimasuno Jan 8, 2019
cf2214b
teste commit
tsuyoshimasuno Jan 8, 2019
ec8b80a
testando
tsuyoshimasuno Jan 8, 2019
47950ed
Merge commit 'ec8b80a5289c82fb8bcecfad1ff424f71ad2c4de' into HEAD
tsuyoshimasuno Jan 8, 2019
079d490
adicionando arquivo jenkins
tsuyoshimasuno Jan 8, 2019
4ec6dde
Merge branch 'esteira-dev-teste'
tsuyoshimasuno Jan 8, 2019
670bd63
Rename jenkinsfile to Jenkinsfile
tsuyoshimasuno Jan 8, 2019
731c9a0
Update Jenkinsfile
tsuyoshimasuno Jan 8, 2019
3253c11
Update Jenkinsfile
tsuyoshimasuno Jan 8, 2019
e3716bc
Update Jenkinsfile
tsuyoshimasuno Jan 8, 2019
e0dac13
Update pom.xml
tsuyoshimasuno Jan 8, 2019
0f3372d
Update pom.xml
tsuyoshimasuno Jan 8, 2019
bdbe08d
Update pom.xml
tsuyoshimasuno Jan 8, 2019
0aed09a
Update pom.xml
tsuyoshimasuno Jan 8, 2019
b75c0db
Update pom.xml
tsuyoshimasuno Jan 8, 2019
299cf40
Rename jenkinsfile to Jenkinsfile
tsuyoshimasuno Jan 8, 2019
b6fb7a2
Update Jenkinsfile
tsuyoshimasuno Jan 8, 2019
0bd4bfa
Update index.xhtml
tsuyoshimasuno Jan 8, 2019
e1a5670
Merge commit '0bd4bfafbcaa65cc4f2a2d122a45f7fde97e24a1' into HEAD
tsuyoshimasuno Jan 8, 2019
94072c1
Update index.xhtml
tsuyoshimasuno Jan 8, 2019
57b8c21
Merge commit '94072c13ec0296dd422a8721a0f19f5046886419' into HEAD
tsuyoshimasuno Jan 8, 2019
2f18bb5
Update index.xhtml
tsuyoshimasuno Jan 9, 2019
34e6a84
Merge commit '2f18bb572390bae685457dfdc80f6d4f0350963d' into HEAD
tsuyoshimasuno Jan 9, 2019
de41c2b
teste integracao jenkins
tsuyoshimasuno Jan 12, 2019
c4bc678
Merge branch 'master' of https://github.com/tsuyoshimasuno/argentum-web
tsuyoshimasuno Jan 12, 2019
d816ce6
Update index.xhtml
tsuyoshimasuno Jan 12, 2019
d8f094c
correcao jenkins
tsuyoshimasuno Jan 12, 2019
95e6406
correcao milena
tsuyoshimasuno Jan 12, 2019
fbf6587
Alterando jenkinsfile
tsuyoshimasuno Jan 13, 2019
e672b50
correcao JenkinsFile
tsuyoshimasuno Jan 13, 2019
8faa9db
corrigindo jen
tsuyoshimasuno Jan 13, 2019
b9891f2
alterando o filtro
tsuyoshimasuno Jan 13, 2019
eec8794
alterando o jenkinfile
tsuyoshimasuno Jan 13, 2019
645625b
correção jenkinsfile
tsuyoshimasuno Jan 13, 2019
1c63994
subindo a versao nova
tsuyoshimasuno Mar 14, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 38 additions & 0 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
pipeline {
agent any

stages {
stage ('Compile Stage') {

steps {
withMaven(maven : 'maven_3_6_0') {
sh 'mvn clean compile'
}
}
}

stage ('Unit Testing Stage') {

steps {
withMaven(maven : 'maven_3_6_0') {
sh 'mvn test'
}
}
}

stage ('Integration Testing Stage') {

steps {
withMaven(maven : 'maven_3_6_0') {
sh 'mvn clean verify sonar:sonar -Ptestes-integracao -Dwebdriver.chrome.driver=/home/tsu/Downloads/chromedriver_linux64/chromedriver'
}
}
}
stage ('Deployment Stage') {
steps {
sh 'cp /home/tsu/.jenkins/workspace/argentum-pipeline/target/argentum-web.war /home/tsu/Downloads/apache-tomcat-7.0.92/webapps'
}
}

}
}
14 changes: 14 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -290,4 +290,18 @@
</profile>

</profiles>

<repositories>
<repository>
<id>myMavenRepo.read</id>
<url>https://mymavenrepo.com/repo/Q7KTwL7rW6d5GLakwYA7/</url>
</repository>
</repositories>

<distributionManagement>
<repository>
<id>myMavenRepo.write</id>
<url>https://mymavenrepo.com/repo/q5Pb91OuuthGllguIspA/</url>
</repository>
</distributionManagement>
</project>
8 changes: 5 additions & 3 deletions src/main/webapp/index.xhtml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,17 @@
xmlns:p="http://primefaces.org/ui">

<h:head>
<title>Argentum Web</title>
<title>Argentum Web teste maria Andrea e Aline</title>
</h:head>

<h:body>

<h:form prependId="false">
<h:outputText value="Implementando funcionalidade filtro por valor..."></h:outputText>
<h:outputText value="Implementando funcionalidade filtro de valor..."></h:outputText>

<p:panel>
<h:outputText value="Filtrar por período:" style="margin-right:10px" />
<h:outputText value="Filtrar por período teste aaaa" style="margin-right:10px" />

<p:inputMask id="filtroDataDe" style="width:100px;" placeholder="De" mask="99/99/9999" value="#{argentumBean.filtroDataDe}">
<f:convertDateTime pattern="dd/MM/yyyy" />
</p:inputMask>
Expand Down