Moves ci/cd to cd directory

TuKJet · Aug 30, 2019 · 3027296 · 3027296
1 parent 98cdf30
commit 3027296
Show file tree

Hide file tree

Showing 11 changed files with 6 additions and 6 deletions.
diff --git a/ci/cd/Jenkinsfile_cd_pipeline → cd/Jenkinsfile_cd_pipeline b/ci/cd/Jenkinsfile_cd_pipeline → 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 → cd/Jenkinsfile_release_job b/ci/cd/Jenkinsfile_release_job → 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 → cd/Jenkinsfile_utils.groovy b/ci/cd/Jenkinsfile_utils.groovy → 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 → cd/README.md b/ci/cd/README.md → cd/README.md
diff --git a/ci/cd/mxnet_lib/mxnet_lib_pipeline.groovy → cd/mxnet_lib/mxnet_lib_pipeline.groovy b/ci/cd/mxnet_lib/mxnet_lib_pipeline.groovy → cd/mxnet_lib/mxnet_lib_pipeline.groovy
diff --git a/.../mxnet_lib/static/Jenkins_pipeline.groovy → cd/mxnet_lib/static/Jenkins_pipeline.groovy b/.../mxnet_lib/static/Jenkins_pipeline.groovy → 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 → cd/utils/artifact_repository.md b/ci/cd/utils/artifact_repository.md → cd/utils/artifact_repository.md
diff --git a/ci/cd/utils/artifact_repository.py → cd/utils/artifact_repository.py b/ci/cd/utils/artifact_repository.py → cd/utils/artifact_repository.py
diff --git a/ci/cd/utils/requirements.txt → cd/utils/requirements.txt b/ci/cd/utils/requirements.txt → cd/utils/requirements.txt
diff --git a/ci/cd/utils/test_artifact_repository.py → cd/utils/test_artifact_repository.py b/ci/cd/utils/test_artifact_repository.py → cd/utils/test_artifact_repository.py
diff --git 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
 }