Skip to content
This repository has been archived by the owner on Sep 20, 2023. It is now read-only.

Sprint36 #12

Merged
merged 30 commits into from
Aug 4, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
1bbef4a
Fne all satheesh sprint30 (#172)
spanyala Jun 2, 2020
ead7a15
Merge pull request #173 from SalientCRGT-FEC/release
rsanchez-s Jun 2, 2020
7d7f029
Fne all satheesh sprint30 (#174)
spanyala Jun 2, 2020
278a0c8
Fne all satheesh sprint30 (#175)
spanyala Jun 2, 2020
ad31f88
Fne all satheesh sprint31 (#176)
spanyala Jun 3, 2020
3536def
Fne all satheesh sprint31 (#177)
spanyala Jun 3, 2020
9e08eec
Merge pull request #178 from SalientCRGT-FEC/release
rsanchez-s Jun 3, 2020
383c625
Fne 2439 satheesh sprint31 (#179)
spanyala Jun 3, 2020
96999db
Merge pull request #180 from SalientCRGT-FEC/release
rsanchez-s Jun 4, 2020
e26a66e
Fne 2438 satheesh sprint31 (#181)
spanyala Jun 4, 2020
5c7f69e
Merge pull request #182 from SalientCRGT-FEC/release
rsanchez-s Jun 9, 2020
68ecc96
fixing F3X print issues (#183)
jpraveenkmr Jun 18, 2020
9151028
Merge pull request #184 from SalientCRGT-FEC/release
rsanchez-s Jun 24, 2020
da0b01b
Fne uat bugs satheesh sprint33 (#185)
spanyala Jun 24, 2020
8cbd50b
alignment fixes SH2.pdf (#186)
jpraveenkmr Jun 24, 2020
aab4654
Merge pull request #187 from SalientCRGT-FEC/release
rsanchez-s Jun 29, 2020
31b4d32
Update to new env deployment
Jun 30, 2020
9208df9
Merge pull request #189 from SalientCRGT-FEC/k8s-update
rsanchez-s Jun 30, 2020
9d9f2d3
FNE-2524 (#188)
jpraveenkmr Jun 30, 2020
98f891e
Fne 2662 praveen sprint34 (#190)
jpraveenkmr Jul 1, 2020
7d5d59b
FNE-2529
MeghaA05 Jul 7, 2020
31c5e95
FNE-2618
MeghaA05 Jul 7, 2020
69528ab
Merge pull request #191 from SalientCRGT-FEC/FNE-2529-Megha-Sprint34
MeghaA05 Jul 7, 2020
84fd462
Merge pull request #192 from SalientCRGT-FEC/FNE-2618-Megha-Sprint34
MeghaA05 Jul 7, 2020
5598eca
FNE-2618
MeghaA05 Jul 9, 2020
77453ec
Merge pull request #194 from SalientCRGT-FEC/release
rsanchez-s Jul 9, 2020
7c9edc6
Merge pull request #193 from SalientCRGT-FEC/FNE-2628-Megha-Sprint34
MeghaA05 Jul 9, 2020
d12ebb5
changed k8s instance
Jul 13, 2020
833238c
Merge pull request #195 from SalientCRGT-FEC/release
rsanchez-s Jul 13, 2020
efbdc69
Merge branch 'master' of github.com:SalientCRGT-FEC/fecfile-ImageGene…
Jul 27, 2020
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
16 changes: 13 additions & 3 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,20 +25,20 @@ pipeline{
stage('Deploy Dev'){
when { branch 'develop' }
steps {
deployImage("${VERSION}", "dev")
deployImage16("${VERSION}", "dev")
code_quality("${BUILD_ID}", "${VERSION}")
}
}
stage('Deploy QA'){
when { branch 'release' }
steps {
deployImage("${VERSION}", "qa")
deployImage16("${VERSION}", "qa")
}
}
stage('Deploy UAT'){
when { branch 'master' }
steps {
deployImage("${VERSION}", "uat")
deployImage16("${VERSION}", "uat")
}
}
}
Expand All @@ -61,6 +61,16 @@ def deployImage(String version, String toEnv) {
"""
}

def deployImage16(String version, String toEnv) {
sh """
kubectl16 \
--context=arn:aws:eks:us-east-1:813218302951:cluster/fecnxg-dev1 \
--namespace=${toEnv} \
set image deployment/fecfile-imagegenerator \
fecfile-imagegenerator=813218302951.dkr.ecr.us-east-1.amazonaws.com/fecfile-imagegenerator:${version}
"""
}

def code_quality(String id, String hash) {
sh(""" sh successful_test.sh "${id}" ${hash} """)
junit '**/reports/*.xml'
Expand Down
1,676 changes: 1,063 additions & 613 deletions routes/src/form3x.py

Large diffs are not rendered by default.

Binary file modified templates/forms/F1M.pdf
Binary file not shown.
Binary file modified templates/forms/F3X.pdf
Binary file not shown.
Binary file modified templates/forms/SB.pdf
Binary file not shown.
Binary file modified templates/forms/SC.pdf
Binary file not shown.
Binary file modified templates/forms/SH2.pdf
Binary file not shown.