From 44fdfb9bda8e957b438fcb08bd21701ef011bf66 Mon Sep 17 00:00:00 2001
From: Aaron Markham <markhama@amazon.com>
Date: Fri, 16 Aug 2019 17:35:02 -0700
Subject: [PATCH] activate r publishing; switch to archive for final site tar

---
 ci/docker/runtime_functions.sh      |  4 +++-
 ci/jenkins/Jenkins_steps.groovy     | 11 ++++++++---
 ci/jenkins/Jenkinsfile_website_full |  3 +--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/ci/docker/runtime_functions.sh b/ci/docker/runtime_functions.sh
index fca4f1aaf4fc..72b9385a9187 100755
--- a/ci/docker/runtime_functions.sh
+++ b/ci/docker/runtime_functions.sh
@@ -1676,8 +1676,10 @@ build_docs() {
     pushd docs/_build
     tar -xzf jekyll-artifacts.tgz
     api_folder='html/api'
-    mkdir -p $api_folder/cpp/docs/api && tar -xzf c-artifacts.tgz --directory $api_folder/cpp/docs/api
+    # Python has it's own landing page/site so we don't put it in /docs/api
     mkdir -p $api_folder/python/docs && tar -xzf python-artifacts.tgz --directory $api_folder/python/docs
+    mkdir -p $api_folder/cpp/docs/api && tar -xzf c-artifacts.tgz --directory $api_folder/cpp/docs/api
+    mkdir -p $api_folder/r/docs/api && tar -xzf r-artifacts.tgz --directory $api_folder/r/docs/api
     mkdir -p $api_folder/julia/docs/api && tar -xzf julia-artifacts.tgz --directory $api_folder/julia/docs/api
     mkdir -p $api_folder/scala/docs/api && tar -xzf scala-artifacts.tgz --directory $api_folder/scala/docs/api
     mkdir -p $api_folder/java/docs/api && tar -xzf java-artifacts.tgz --directory $api_folder/java/docs/api
diff --git a/ci/jenkins/Jenkins_steps.groovy b/ci/jenkins/Jenkins_steps.groovy
index c882d837bd75..cd0beda9a74c 100644
--- a/ci/jenkins/Jenkins_steps.groovy
+++ b/ci/jenkins/Jenkins_steps.groovy
@@ -1534,7 +1534,7 @@ def docs_jekyll() {
 }
 
 
-// This is for the full website
+// This is for publishing the full website
 def docs_prepare() {
     return ['Prepare for publication of the full website': {
       node(NODE_LINUX_CPU) {
@@ -1545,14 +1545,19 @@ def docs_prepare() {
             unstash 'jekyll-artifacts'
             unstash 'c-artifacts'
             unstash 'python-artifacts'
+            unstash 'r-artifacts'
             unstash 'julia-artifacts'
             unstash 'scala-artifacts'
             unstash 'java-artifacts'
             unstash 'clojure-artifacts'
 
             utils.docker_run('ubuntu_cpu_jekyll', 'build_docs', false)
-            //utils.pack_lib('full_website', 'docs/_build/full_website.tgz', false)
-            // TODO: Make sure this 'test-website-publish' understand the new structure
+
+            // only stash if we're going to unstash later
+            // utils.pack_lib('full_website', 'docs/_build/full_website.tgz', false)
+
+            // archive so the publish pipeline can access the artifact
+            archiveArtifacts 'docs/_build/full_website.tgz'
           }
         }
       }
diff --git a/ci/jenkins/Jenkinsfile_website_full b/ci/jenkins/Jenkinsfile_website_full
index f7e2a7320e16..ca1b9f340900 100644
--- a/ci/jenkins/Jenkinsfile_website_full
+++ b/ci/jenkins/Jenkinsfile_website_full
@@ -49,8 +49,7 @@ core_logic: {
   ])
 
   utils.parallel_stage('Prepare', [
-    custom_steps.docs_prepare(),
-    custom_steps.docs_archive()
+    custom_steps.docs_prepare()
   ])
 
   utils.parallel_stage('Publish', [