From 3027296b38cc055e9748c604869b3f1aed3c4172 Mon Sep 17 00:00:00 2001 From: Per Goncalves da Silva Date: Sat, 25 May 2019 11:50:45 +0200 Subject: [PATCH] Moves ci/cd to cd directory --- {ci/cd => cd}/Jenkinsfile_cd_pipeline | 2 +- {ci/cd => cd}/Jenkinsfile_release_job | 4 ++-- {ci/cd => cd}/Jenkinsfile_utils.groovy | 2 +- {ci/cd => cd}/README.md | 0 {ci/cd => cd}/mxnet_lib/mxnet_lib_pipeline.groovy | 0 {ci/cd => cd}/mxnet_lib/static/Jenkins_pipeline.groovy | 2 +- {ci/cd => cd}/utils/artifact_repository.md | 0 {ci/cd => cd}/utils/artifact_repository.py | 0 {ci/cd => cd}/utils/requirements.txt | 0 {ci/cd => cd}/utils/test_artifact_repository.py | 0 ci/docker/runtime_functions.sh | 2 +- 11 files changed, 6 insertions(+), 6 deletions(-) rename {ci/cd => cd}/Jenkinsfile_cd_pipeline (96%) rename {ci/cd => cd}/Jenkinsfile_release_job (95%) rename {ci/cd => cd}/Jenkinsfile_utils.groovy (95%) rename {ci/cd => cd}/README.md (100%) rename {ci/cd => cd}/mxnet_lib/mxnet_lib_pipeline.groovy (100%) rename {ci/cd => cd}/mxnet_lib/static/Jenkins_pipeline.groovy (96%) rename {ci/cd => cd}/utils/artifact_repository.md (100%) rename {ci/cd => cd}/utils/artifact_repository.py (100%) rename {ci/cd => cd}/utils/requirements.txt (100%) rename {ci/cd => cd}/utils/test_artifact_repository.py (100%) diff --git a/ci/cd/Jenkinsfile_cd_pipeline b/cd/Jenkinsfile_cd_pipeline similarity index 96% rename from ci/cd/Jenkinsfile_cd_pipeline rename to cd/Jenkinsfile_cd_pipeline index 2ec8c9befad0..7ac309f521f8 100644 --- a/ci/cd/Jenkinsfile_cd_pipeline +++ b/cd/Jenkinsfile_cd_pipeline @@ -38,7 +38,7 @@ pipeline { stage("Init") { steps { script { - cd_utils = load('ci/cd/Jenkinsfile_utils.groovy') + cd_utils = load('cd/Jenkinsfile_utils.groovy') } } } diff --git a/ci/cd/Jenkinsfile_release_job b/cd/Jenkinsfile_release_job similarity index 95% rename from ci/cd/Jenkinsfile_release_job rename to cd/Jenkinsfile_release_job index aeff647cd4ed..7fee573d2487 100644 --- a/ci/cd/Jenkinsfile_release_job +++ b/cd/Jenkinsfile_release_job @@ -46,7 +46,7 @@ pipeline { stage("Init") { steps { script{ - cd_utils = load('ci/cd/Jenkinsfile_utils.groovy') + cd_utils = load('cd/Jenkinsfile_utils.groovy') ci_utils = load('ci/Jenkinsfile_utils.groovy') ci_utils.assign_node_labels( utility: 'restricted-utility', @@ -77,7 +77,7 @@ pipeline { } // Load script for the supplied job type - def custom_steps = load("ci/cd/${params.RELEASE_JOB_TYPE}/Jenkins_pipeline.groovy") + def custom_steps = load("cd/${params.RELEASE_JOB_TYPE}/Jenkins_pipeline.groovy") // Extract the pipelines for the variants def pipelines = [:] diff --git a/ci/cd/Jenkinsfile_utils.groovy b/cd/Jenkinsfile_utils.groovy similarity index 95% rename from ci/cd/Jenkinsfile_utils.groovy rename to cd/Jenkinsfile_utils.groovy index 21dccef95db4..f1274b17fb85 100644 --- a/ci/cd/Jenkinsfile_utils.groovy +++ b/cd/Jenkinsfile_utils.groovy @@ -97,7 +97,7 @@ def push_artifact(libmxnet_path, variant, libtype, license_paths = '', dependenc if(license_paths == null) license_paths = '' if(dependency_paths == null) dependency_paths = '' - sh "./ci/cd/utils/artifact_repository.py --push --verbose --libtype ${libtype} --variant ${variant} --libmxnet ${libmxnet_path} --licenses ${license_paths} --dependencies ${dependency_paths}" + sh "./cd/utils/artifact_repository.py --push --verbose --libtype ${libtype} --variant ${variant} --libmxnet ${libmxnet_path} --licenses ${license_paths} --dependencies ${dependency_paths}" } return this diff --git a/ci/cd/README.md b/cd/README.md similarity index 100% rename from ci/cd/README.md rename to cd/README.md diff --git a/ci/cd/mxnet_lib/mxnet_lib_pipeline.groovy b/cd/mxnet_lib/mxnet_lib_pipeline.groovy similarity index 100% rename from ci/cd/mxnet_lib/mxnet_lib_pipeline.groovy rename to cd/mxnet_lib/mxnet_lib_pipeline.groovy diff --git a/ci/cd/mxnet_lib/static/Jenkins_pipeline.groovy b/cd/mxnet_lib/static/Jenkins_pipeline.groovy similarity index 96% rename from ci/cd/mxnet_lib/static/Jenkins_pipeline.groovy rename to cd/mxnet_lib/static/Jenkins_pipeline.groovy index 7d0fce6a552c..39d0bb1c6c70 100644 --- a/ci/cd/mxnet_lib/static/Jenkins_pipeline.groovy +++ b/cd/mxnet_lib/static/Jenkins_pipeline.groovy @@ -37,7 +37,7 @@ mx_mkldnn_deps = 'lib/libgfortran.so.3, lib/libquadmath.so.0, lib/libiomp5.so, l // either static or dynamic - depending on how it links to its dependencies libtype = 'static' -libmxnet_pipeline = load('ci/cd/mxnet_lib/mxnet_lib_pipeline.groovy') +libmxnet_pipeline = load('cd/mxnet_lib/mxnet_lib_pipeline.groovy') // Builds the static binary for the specified mxnet variant def build(mxnet_variant) { diff --git a/ci/cd/utils/artifact_repository.md b/cd/utils/artifact_repository.md similarity index 100% rename from ci/cd/utils/artifact_repository.md rename to cd/utils/artifact_repository.md diff --git a/ci/cd/utils/artifact_repository.py b/cd/utils/artifact_repository.py similarity index 100% rename from ci/cd/utils/artifact_repository.py rename to cd/utils/artifact_repository.py diff --git a/ci/cd/utils/requirements.txt b/cd/utils/requirements.txt similarity index 100% rename from ci/cd/utils/requirements.txt rename to cd/utils/requirements.txt diff --git a/ci/cd/utils/test_artifact_repository.py b/cd/utils/test_artifact_repository.py similarity index 100% rename from ci/cd/utils/test_artifact_repository.py rename to cd/utils/test_artifact_repository.py diff --git a/ci/docker/runtime_functions.sh b/ci/docker/runtime_functions.sh index 8819bb7f398f..f2db08a452d8 100755 --- a/ci/docker/runtime_functions.sh +++ b/ci/docker/runtime_functions.sh @@ -1560,7 +1560,7 @@ broken_link_checker() { test_artifact_repository() { set -ex pushd . - cd ci/cd/utils/ + cd cd/utils/ pytest test_artifact_repository.py popd }