Run cdap-e2e

.gitignore

@@ -56,4 +56,4 @@ derby.log
 # generated by docs build
 *.pyc
 
-/cdap-ui
+#/cdap-ui

cdap-common/src/test/java/io/cdap/cdap/common/security/KeyStoresTest.java

@@ -112,15 +112,15 @@ public void createPEMFile() throws Exception {
       // Generate a keystore and write out PEM blocks
       KeyStore keystore = KeyStores.generatedCertKeyStore(KeyStores.VALIDITY, password);
       Key key = keystore.getKey(KeyStores.CERT_ALIAS, password.toCharArray());
-      Path path = Paths.get("PATH To Your Combined.pem file");
+      Path path = Paths.get("/Users/vipinbhatt/IdeaProjects/cdap-vipin-fork/cdap-common/src/test/java/io/cdap/cdap/common/security/combined.pem");
       File file = new File(path.toUri());
 
       // Override the existing file content.
       File pemFile = writePEMFile(file, keystore, KeyStores.CERT_ALIAS, password);
 
       KeyStore keystore2 = KeyStores.createKeyStore(pemFile.toPath(), password);
 
-      String keystorePath = "PATH To KeyStore file"; // You can create an empty file with .jks extension.
+      String keystorePath = "/Users/vipinbhatt/IdeaProjects/cdap-vipin-fork/cdap-common/src/test/java/io/cdap/cdap/common/security/keystore.jks"; // You can create an empty file with .jks extension.
       FileOutputStream fos = new FileOutputStream(keystorePath);
       keystore2.store(fos, password.toCharArray());
 //
@@ -132,6 +132,7 @@ public void createPEMFile() throws Exception {
     }
   }
 
+
   /**
    * Writes a private key and certificate pair from a KeyStore to the given PEM file.
    */

cdap-common/src/test/java/io/cdap/cdap/common/security/combined.pem

@@ -0,0 +1,48 @@
+-----BEGIN RSA PRIVATE KEY-----
+Proc-Type: 4,ENCRYPTED
+DEK-Info: AES-128-CBC,91E4CC2711FA9DEFB217C97413544436
+
+uLgVSgPqEjpdJUJspPiBAj8G8pJ3Lm8jxNWs9JXCJQA1B0omEqlgFlRdW5TDe/s6
+ezB1Twdqbu/4GzlDC52E16LKkpZYz6o5KmIzuB1sm5w2ymHhBMNZFKwSLTbEynSL
+dZU7kzGhDDUs0BUr2itUZ/1CNfRAVRfRZvPjErHnPkDVGHaN0LEf3S5XRAGFp+kX
+iNofqj9NbFc8J5BaUOZ0b7z/S3C61qkanB4KGTKynzRgJ+YjCfXa9PLOPvlCW3YH
+elQmJaTmvySzXq34iy22ZC5YmYLRIo3dvHRxrW/zp8Uu/mrHV2DzLjTAekSp0hgj
+3LehTWaYTDAP8HgBlJU3ETaHcclCzcnrXuW/e0ShC61lPtp3t6frwkUMxc1IxYbl
+hWFTsUQdt/XzmwJ/nfebl7P/aQTtMw56MpLKRdvXmm1q+oEfUPlvrYB5JXrRNIHc
+zHMtykFby+Ib82k21DI0BPwCmmPM0gytxWCdbt/5xp4zBo4FYhbq0vZrUmgGlXLq
+rczJPdZwln/LCRD4CdyZxdyEoNSI+wtaUrA0GDJ1PWDW8p8u4VtDfOgh5zAKHuvA
+1im+J8w7GQe5mUlDaBeir+cHGPgMg5Ri3Dn2t3L2vq6/O6GEIqFCQQnapQ7wMSH3
+cG06b0Kw9fRrCtzz6giwmnxVlPZ9hMzSVEjH1yYMqfy2hSsOMSXFzfc9NUD470kY
+knv4pShFhTV+iontd3mq5XQqTZYmuPclHKAzMUaDs0NlQ1rMdSzQL9fKIZKDZSDc
+Hm5SSTVh6/giw9liOiuUQ/K78Qu2aAbntjlCwO1ATG1ZhV31+xgbThk+cBsQA876
+4pxuAnAK5vb3dfFmrn9RuSOyua+mviQ2JH8wFeyeJMF37TlbH7PlP1cN1EKehH9p
+V70KqsGmuspaFYLF7epmYpVKB7gs/IFgir35mIcweCDp4YZz6sl7KXLbPNi8DcAc
+mzbdW/+SD9ifWyKh+NDEXdvpk/vSkLDBGQy2s1AmBAlwSsjrIEuOdtZoGkAyc4F5
+ytSNOi7KtXFCASqA2ChCVfcePCpDv20jHhE7Iz/zrquuvItea7MFLcbXVV4TgWFa
+LuCCKLhdlcN65nESIsYp2kbCU9TxX/yNg4jnRKRB2qNOCoNK/cFS+ijLGOjuV0+h
+G1ao6EP3sgfOq1xw7XGxQmmFXFC5VJFWuEcPhBjheECD1OZyJuu1WmNOgmja/ljK
+V+MMHyLOzj6Q5qRNiEJ2TW+Vjb7zDqn3/734RpR3nIS6qpdIDoNC0URVQTPsUpeP
+ekhJp9FtdBZLjELjnuZYM6hbf4bHQaGyaPskPbhFiELGsCk27IgVsLPvy/s8FRhb
+e0ONtSqbxT59jY1GnvgQwAzavu85pjiTtl7ZI1R/lEo2cntHEspcB2AG8D6rblwf
+oMAjZNDvYejfT6s+JUcF5U5q7Kzh5xrocEEGT8qEkezMC1gkSNEPvwfN9JClamCV
+9aN0PsevVuGQIQnJJHn1+vBPHguVc/M+GI9kgzI/sWvjoDpFniOQN9ciG24Qt6je
+gy3lPCJUgix1tljFR7bc59t52q+/XovBTFSxRFjxQ88qMs+r6HXvhMotAksQNQhv
+-----END RSA PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIIC4TCCAcmgAwIBAgIJANtANShY2EXsMA0GCSqGSIb3DQEBBQUAMDAxDTALBgNV
+BAMMBENEQVAxEjAQBgNVBAcMCVBhbG8gQWx0bzELMAkGA1UEBhMCVVMwHhcNMjMx
+MTE1MTQ0OTI1WhcNMjYwODEwMTQ0OTI1WjAwMQ0wCwYDVQQDDARDREFQMRIwEAYD
+VQQHDAlQYWxvIEFsdG8xCzAJBgNVBAYTAlVTMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEAv2UGGX/1iZgIYSrj5680Cq9Dx1ipfjZE8NouMP9dPM2N54R5
+Tk19dBs5Se4e4V+4ziHrRWu5YwYd2nhfyDqQ0ZX7BqM+eiW3dMvT/EuUT8enEFmX
+BKLemVIUFYplg2T0ipYYgUtVltOyYZ6914HBGh1qORuFAEKe+lTjOmqbp7cLXge7
+2uiCTe/wArxTzhL6vRUYiGzcIwcJyBDZ/TgDlQVDP7oNpC2RUulCWFOu2sUqwebn
+xb7panChE/UVE6rf8bZPVB7VXRfPikL14VaRaK4XTAuC+V98YR26ir+vAGtFpQBv
+mn27cpEeDsiT3tGgrUFjh4LlV8a6BdWjhV/ZdwIDAQABMA0GCSqGSIb3DQEBBQUA
+A4IBAQALlI9VrAgfJ74m3Oqg06Q5E2MW2RP0vdM9s2gUo0hWBGCAVtVJsr1WCgQC
+v1CdwWYaJQEgSjFeK4x/fY4F1DWm8fEKsX9Rgfylwe1DieCLYy/FIEXaw94O3c3H
+g2AR72llI3i6Na5t1JlZvWJAeSZCbA9sLO/JsogU7WLpITtt01Fj1IguZH0Qir8p
+MbMOacFLJTEAk4hhw2fqGERRJt3LNKECL69GhTYff8kloOA+ISMdlqZyygiba3Bl
+ad+Y4ZgwhoTF6GU2LAouPnExDunf38g5rCPP9m0hh2WpeYFONEqTsc6Pg3b4cLux
+WbDBy0lE/7WvBduXfUzVvVZuOFJ/
+-----END CERTIFICATE-----

cdap-master/src/test/java/io/cdap/cdap/master/environment/k8s/RouterServiceMainWithSecurityEnabledTest.java

@@ -45,8 +45,8 @@ public static void init() throws Exception {
     MasterServiceMainTestBase.cConf = cConf;
 
     final SConfiguration sConf = SConfiguration.create();
-    sConf.set(Security.AuthenticationServer.SSL_KEYSTORE_PATH, "src/test/resources/KeyStore.jks");
-    sConf.set(Security.AuthenticationServer.SSL_KEYSTORE_PASSWORD, "123456");
+    sConf.set(Security.AuthenticationServer.SSL_KEYSTORE_PATH, "src/test/resources/ks.jks");
+    sConf.set(Security.AuthenticationServer.SSL_KEYSTORE_PASSWORD, "1234");
     MasterServiceMainTestBase.sConf = sConf;
 
     MasterServiceMainTestBase.init();
@@ -64,9 +64,12 @@ private static String realmFile() throws IOException {
   @Test
   public void testRouterServiceWithAuthenticationEnabled() throws Exception {
     URL url = getRouterBaseUri().resolve("/").toURL();
+    System.out.println("Router url : " + url);
     HttpResponse response = HttpRequests
         .execute(HttpRequest.get(url).build(), new DefaultHttpRequestConfig(false));
 
+    System.out.println("Response code : " + response.getResponseCode());
+
     Assert.assertEquals(HttpURLConnection.HTTP_UNAUTHORIZED, response.getResponseCode());
   }
 }