@@ -4,7 +4,8 @@ import { serverHasState } from './common/util/serverUtils';
44import { expect } from 'chai' ;
55import * as os from 'os' ;
66import { ServerState } from './common/enum/serverState' ;
7- import { downloadExtractFile } from './common/util/downloadServerUtil' ;
7+ import { Unpack } from './common/util/unpack' ;
8+ // import { downloadExtractFile } from './common/util/downloadServerUtil';
89
910import * as fs from 'fs' ;
1011import path = require( 'path' ) ;
@@ -23,7 +24,7 @@ export function basicServerOperationTest(testServers: ServerTestType[]): void {
2324
2425 let driver : WebDriver ;
2526 // NEW_SERVER_ADAPTER
26- const EAP_URL = 'https://download-node-02.eng.bos.redhat.com/released/jboss/eap8/8.0.0-Beta/jboss-eap-8.0.0.Beta.zip' ;
27+ // const EAP_URL = 'https://download-node-02.eng.bos.redhat.com/released/jboss/eap8/8.0.0-Beta/jboss-eap-8.0.0.Beta.zip';
2728 const downloadLocation = path . join ( __dirname , 'eap-server.zip' ) ;
2829 const extractLocation = path . join ( __dirname , 'eap-server' ) ;
2930
@@ -58,11 +59,16 @@ export function basicServerOperationTest(testServers: ServerTestType[]): void {
5859 } else {
5960 it ( `Create the ${ testServer . serverDownloadName } server from the disk location` , async function ( ) {
6061 this . timeout ( 240000 ) ;
61- log . info ( `Downloading server at ${ EAP_URL } to ${ downloadLocation } and extracting to ${ extractLocation } ` ) ;
62+ log . info ( `Extracting downloaded EAP server from ${ downloadLocation } to ${ extractLocation } ` ) ;
63+
64+ // Download is in the Jenkinsfile. Server is pre-downloaded.
65+ expect ( fs . existsSync ( downloadLocation ) ) . to . be . true ;
6266 if ( ! fs . existsSync ( extractLocation ) ) {
63- await downloadExtractFile ( EAP_URL , downloadLocation , extractLocation ) ;
67+ // await downloadExtractFile(EAP_URL, downloadLocation, extractLocation);
68+ await Unpack . unpack ( downloadLocation , extractLocation ) ;
6469 }
6570 expect ( fs . existsSync ( extractLocation ) ) . to . be . true ;
71+
6672 try {
6773 const realPath = path . join ( extractLocation , testServer . serverName ) ;
6874 log . info ( `Adding new local server at ${ realPath } ` ) ;
0 commit comments