jenkins/sap-jenkins-library
1
0
Fork 0
mirror of https://github.com/SAP/jenkins-library.git synced 2025-01-18 05:18:24 +02:00
Code Issues Releases Activity

Fix reading download cache variables on node (#1660)

Browse Source
This commit is contained in:
Daniel Kurzynski 2020-06-11 21:59:55 +02:00 committed by GitHub
parent d558db9106
commit d1cdf4449c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 69 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/com/sap/piper/DownloadCacheUtils.groovy
View File

@ -34,25 +34,29 @@ class DownloadCacheUtils {
return parameters
}
static String networkName() {
return System.getenv('DL_CACHE_NETWORK')
}
static String hostname() {
return System.getenv('DL_CACHE_HOSTNAME')
}
static boolean isEnabled(Script script) {
if (script.env.ON_K8S) {
return false
}
script.node('master') {
String network = script.env.DL_CACHE_NETWORK
String host = script.env.DL_CACHE_HOSTNAME
return (network.asBoolean() && host.asBoolean())
}
return (networkName() && hostname())
}
static String getDockerOptions(Script script) {
script.node('master') {
String dockerNetwork = script.env.DL_CACHE_NETWORK
if (!dockerNetwork) {
return ''
}
return "--network=$dockerNetwork"
String dockerNetwork = networkName()
if (!dockerNetwork) {
return ''
}
return "--network=$dockerNetwork"
}
static String getGlobalMavenSettingsForDownloadCache(Script script) {
@ -61,10 +65,7 @@ class DownloadCacheUtils {
return globalSettingsFilePath
}
String hostname = ''
script.node('master') {
hostname = script.env.DL_CACHE_HOSTNAME // set by cx-server
}
String hostname = hostname()
if (!hostname) {
return ''
@ -82,10 +83,12 @@ class DownloadCacheUtils {
}
static String getNpmRegistryUri(Script script) {
String npmRegistry = ''
script.node('master') {
npmRegistry = "http://${script.env.DL_CACHE_HOSTNAME}:8081/repository/npm-proxy/"
String hostname = hostname()
if (!hostname) {
return ''
}
String npmRegistry = "http://${hostname}:8081/repository/npm-proxy/"
return npmRegistry
}
}

61
test/groovy/DownloadCacheUtilsTest.groovy
View File

@ -1,5 +1,6 @@
import com.sap.piper.BuildTool
import com.sap.piper.DownloadCacheUtils
import org.junit.After
import org.junit.Before
import org.junit.Rule
import org.junit.Test
@ -22,6 +23,8 @@ class DownloadCacheUtilsTest extends BasePiperTest {
@Before
void init() {
DownloadCacheUtils.metaClass.static.networkName = {return }
DownloadCacheUtils.metaClass.static.hostname = { return }
helper.registerAllowedMethod("libraryResource", [String.class], { path ->
File resource = new File(new File('resources'), path)
if (resource.exists()) {
@ -34,10 +37,20 @@ class DownloadCacheUtilsTest extends BasePiperTest {
}
}
@After
void after(){
DownloadCacheUtils.metaClass.static.networkName = {return }
DownloadCacheUtils.metaClass.static.hostname = { return }
}
@Test
void 'isEnabled should return true if dl cache is enabled'() {
nullScript.env.DL_CACHE_HOSTNAME = 'cx-downloadcache'
nullScript.env.DL_CACHE_NETWORK = 'cx-network'
DownloadCacheUtils.metaClass.static.networkName = {
return 'cx-network'
}
DownloadCacheUtils.metaClass.static.hostname = {
return 'cx-downloadcache'
}
boolean actual = DownloadCacheUtils.isEnabled(nullScript)
assertTrue(actual)
@ -45,7 +58,9 @@ class DownloadCacheUtilsTest extends BasePiperTest {
@Test
void 'getDockerOptions should return docker network if configured'() {
nullScript.env.DL_CACHE_NETWORK = 'cx-network'
DownloadCacheUtils.metaClass.static.networkName = {
return 'cx-network'
}
String expected = '--network=cx-network'
String actual = DownloadCacheUtils.getDockerOptions(nullScript)
@ -54,7 +69,9 @@ class DownloadCacheUtilsTest extends BasePiperTest {
@Test
void 'getGlobalMavenSettingsForDownloadCache should write file'() {
nullScript.env.DL_CACHE_HOSTNAME = 'cx-downloadcache'
DownloadCacheUtils.metaClass.static.hostname = {
return 'cx-downloadcache'
}
boolean writeFileExecuted = false
helper.registerAllowedMethod('writeFile', [Map.class]) { Map m ->
@ -70,7 +87,9 @@ class DownloadCacheUtilsTest extends BasePiperTest {
@Test
void 'getGlobalMavenSettingsForDownloadCache should return filePath if file already exists'() {
fileExistsRule.registerExistingFile('.pipeline/global_settings.xml')
nullScript.env.DL_CACHE_HOSTNAME = 'cx-downloadcache'
DownloadCacheUtils.metaClass.static.hostname = {
return 'cx-downloadcache'
}
boolean writeFileExecuted = false
helper.registerAllowedMethod('writeFile', [Map.class]) { Map m ->
@ -99,8 +118,12 @@ class DownloadCacheUtilsTest extends BasePiperTest {
@Test
void 'injectDownloadCacheInParameters should set docker options and global settings for maven'() {
nullScript.env.DL_CACHE_HOSTNAME = 'cx-downloadcache'
nullScript.env.DL_CACHE_NETWORK = 'cx-network'
DownloadCacheUtils.metaClass.static.hostname = {
return 'cx-downloadcache'
}
DownloadCacheUtils.metaClass.static.networkName = {
return 'cx-network'
}
Map expected = [
dockerOptions: ['--network=cx-network'],
@ -114,8 +137,12 @@ class DownloadCacheUtilsTest extends BasePiperTest {
@Test
void 'injectDownloadCacheInParameters should set docker options, global settings and npm default registry for mta'() {
nullScript.env.DL_CACHE_HOSTNAME = 'cx-downloadcache'
nullScript.env.DL_CACHE_NETWORK = 'cx-network'
DownloadCacheUtils.metaClass.static.hostname = {
return 'cx-downloadcache'
}
DownloadCacheUtils.metaClass.static.networkName = {
return 'cx-network'
}
Map expected = [
dockerOptions: ['--network=cx-network'],
@ -130,8 +157,12 @@ class DownloadCacheUtilsTest extends BasePiperTest {
@Test
void 'injectDownloadCacheInParameters should set docker options and default npm config for npm'() {
nullScript.env.DL_CACHE_HOSTNAME = 'cx-downloadcache'
nullScript.env.DL_CACHE_NETWORK = 'cx-network'
DownloadCacheUtils.metaClass.static.hostname = {
return 'cx-downloadcache'
}
DownloadCacheUtils.metaClass.static.networkName = {
return 'cx-network'
}
Map expected = [
dockerOptions: ['--network=cx-network'],
@ -145,8 +176,12 @@ class DownloadCacheUtilsTest extends BasePiperTest {
@Test
void 'injectDownloadCacheInParameters should append docker options'() {
nullScript.env.DL_CACHE_HOSTNAME = 'cx-downloadcache'
nullScript.env.DL_CACHE_NETWORK = 'cx-network'
DownloadCacheUtils.metaClass.static.hostname = {
return 'cx-downloadcache'
}
DownloadCacheUtils.metaClass.static.networkName = {
return 'cx-network'
}
List expectedDockerOptions = ['--test', '--network=cx-network']