Merge pull request #12 from fecgov/Sprint36

Sprint36
fecgov · Aug 4, 2020 · d83cda3 · d83cda3
2 parents 50d3bed + efbdc69
commit d83cda3
Show file tree

Hide file tree

Showing 7 changed files with 1,076 additions and 616 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -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")
       }
     }
   }
@@ -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'

diff --git a/routes/src/form3x.py b/routes/src/form3x.py
diff --git a/templates/forms/F1M.pdf b/templates/forms/F1M.pdf
diff --git a/templates/forms/F3X.pdf b/templates/forms/F3X.pdf
diff --git a/templates/forms/SB.pdf b/templates/forms/SB.pdf
diff --git a/templates/forms/SC.pdf b/templates/forms/SC.pdf
diff --git a/templates/forms/SH2.pdf b/templates/forms/SH2.pdf