Skip to content

Commit 9a58b5e

Browse files
author
John E. Malmberg
authored
Remove unused and broken code, add proxy for RPM (#458)
vars/dockerBuildArgs.groovy: Add passing DAOS_LAB_CA_FILE_URL environment variable. Remove some dead code, including some that required whitelisting in the groovy sandbox. vars/packageBuildingPipelineDAOSTest.groovy: Fix typo found by spellcheck Signed-off-by: John E. Malmberg <john.malmberg@hpe.com>
1 parent b3c8580 commit 9a58b5e

File tree

2 files changed

+2
-80
lines changed

2 files changed

+2
-80
lines changed

vars/dockerBuildArgs.groovy

Lines changed: 1 addition & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -23,41 +23,6 @@ Integer num_proc() {
2323
*
2424
* config['parallel_build'] Whether to build in parallel (-j)
2525
*
26-
* Repositories URLs are looked up via Jenkins environment variables.
27-
* There are two environment variables that are put together to create
28-
* a path to a repo.
29-
*
30-
* The first envronment variable is "REPOSITORY_URL" which is a common
31-
* base URL that is used for all accesses to the repository.
32-
*
33-
* The rest of the URL for each specific repo is in additional environment
34-
* varables with a name format of "DAOS_STACK_$(distro}${mod}_${type}_REPO".
35-
*
36-
* The ${mod} currently is "_DOCKER" for repositories that are for use
37-
* with dockerfiles, and "" for generic repositories.
38-
* DOCKER repositories are for both replacing the distro built in
39-
* repositories and adding locally built packages.
40-
*
41-
* The ${distro} is currently one of "EL_7", "EL_8", "LEAP_15", and
42-
* "UBUNTU_20_04".
43-
*
44-
* The ${type} is "LOCAL", "DEV", "STABLE", or "RELEASE". This is passed
45-
* in lower case in the "repo_type" parameter above.
46-
*
47-
* "LOCAL" type contains only locally built packages. This is being phased
48-
* out for all but Ubuntu. It is a single repository.
49-
*
50-
* The other types are group repositories that combine both locally built
51-
* package repositories with other repositories.
52-
*
53-
* The "DEV" type is group for experimental configurations for special PRs.
54-
*
55-
* The "STABLE" type is a group with locally build packages and also can
56-
* contain other repositories. It should not contain the default distro
57-
* provided repositories. It may also contain locally built signed
58-
* release packages.
59-
*
60-
* The "RELEASE" type contains locally built signed released packages.
6126
*
6227
* Getting better repositories for Ubuntu is a work in progress.
6328
* For Ubuntu repository groups, that will need to be a URL that
@@ -69,27 +34,9 @@ String call(Map config = [:]) {
6934
Boolean add_repos = config.get('add_repos', true)
7035
Boolean deps_build = config.get('deps_build', false)
7136
Boolean parallel_build = config.get('parallel_build', false)
72-
String daos_type = 'LOCAL'
73-
String dist_type = 'GROUP'
74-
String repo_alias = ''
75-
String repo_mod = ''
76-
String daos_arg = 'DAOS'
77-
String dist_arg = 'DISTRO'
78-
79-
if (config.containsKey('repo_type')) {
80-
daos_type = config['repo_type'].toString().toUpperCase()
81-
if (daos_type != 'LOCAL') {
82-
repo_mod = '_DOCKER'
83-
dist_type = daos_type
84-
}
85-
}
8637

8738
Map stage_info = parseStageInfo(config)
8839

89-
if (config.containsKey('distro')) {
90-
stage_info['target'] = config['distro']
91-
}
92-
9340
// The docker agent setup and the provisionNodes step need to know the
9441
// UID that the build agent is running under.
9542
String ret_str = ' --build-arg NOBUILD=1 ' +
@@ -107,33 +54,8 @@ String call(Map config = [:]) {
10754
ret_str += ' --build-arg CB0=' + current_time.get(Calendar.WEEK_OF_YEAR)
10855
}
10956

110-
// No env.REPOSITORY_URL, no repos to add.
111-
if (add_repos && env.REPOSITORY_URL) {
112-
if (stage_info['target'] == 'ubuntu20.04') {
113-
// Ubuntu repos curently only used for package building.
114-
// When fully implemented it will probably be similar to above.
115-
// And the URLS for will be for installing a list of repos.
116-
// Details still to be worked out.
117-
repo_alias = 'UBUNTU_20_04'
118-
daos_arg = repo_alias
119-
}
120-
dist_repo = env["DAOS_STACK_${repo_alias}${repo_mod}_${dist_type}_REPO"]
121-
daos_repo = env["DAOS_STACK_${repo_alias}_${daos_type}_REPO"]
122-
123-
// Only add the build args if a repo was found.
124-
if (dist_repo || daos_repo) {
125-
ret_str += ' --build-arg REPO_URL=' + env.REPOSITORY_URL
126-
if (daos_repo) {
127-
ret_str += " --build-arg REPO_${daos_arg}=" + daos_repo
128-
}
129-
if (dist_repo) {
130-
ret_str += " --build-arg REPO_${dist_arg}=" + dist_repo
131-
}
132-
}
133-
}
134-
13557
// pass through env. var.s
136-
['REPO_FILE_URL', 'HTTP_PROXY', 'HTTPS_PROXY'].each { var ->
58+
['DAOS_LAB_CA_FILE_URL', 'REPO_FILE_URL', 'HTTP_PROXY', 'HTTPS_PROXY'].each { var ->
13759
if (env."$var") {
13860
ret_str += ' --build-arg ' + var + '="' + env."$var" + '"'
13961
}

vars/packageBuildingPipelineDAOSTest.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ void call(Map pipeline_args) {
228228
}
229229
agent { label 'lightweight' }
230230
steps {
231-
sh label: 'Get submdule status',
231+
sh label: 'Get submodule status',
232232
script: 'git submodule status'
233233
checkoutScm url: 'https://github.com/daos-stack/packaging.git',
234234
checkoutDir: 'packaging-module',

0 commit comments

Comments
 (0)