Fix docs build on PR job (elastic#1351)

* Fix docs build on PR job * Cleanup workspace before doing other steps
artemnikitin · Jul 23, 2019 · 3b2f55d · 3b2f55d
1 parent 41b8ad1
commit 3b2f55d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/build/ci/Makefile b/build/ci/Makefile
@@ -177,12 +177,3 @@ ci-gke-cleanup: ci-e2e-delete-cluster
     	cloud-on-k8s-ci-e2e \
     	bash -c "GKE_CLUSTER_VERSION=1.11 $(GO_MOUNT_PATH)/operators/hack/gke-cluster.sh auth && \
     	 	$(GO_MOUNT_PATH)/build/ci/delete_unused_disks.py"
-
-# Run docs build
-ci-build-docs:
-	@ docker run --rm -t \
-		-v $(ROOT_DIR):$(GO_MOUNT_PATH) \
-        docker.elastic.co/docs/build:1 \
-        bash -c "git clone https://github.com/elastic/docs.git && \
-        	/docs/build_docs.pl --doc $(GO_MOUNT_PATH)/docs/index.asciidoc --out $(GO_MOUNT_PATH)/docs/html --chunk 1 && \
-        	test -e $(GO_MOUNT_PATH)/docs/html/index.html"
diff --git a/build/ci/pr/Jenkinsfile b/build/ci/pr/Jenkinsfile
@@ -38,8 +38,16 @@ pipeline {
                 }
                 stage("Run docs build") {
                     steps {
-                        checkout scm
-                        sh 'make -C build/ci ci-build-docs'
+                        cleanWs()
+                        sh 'git clone git@github.com:elastic/docs.git'
+                        sh 'git clone git@github.com:elastic/cloud-on-k8s.git'
+                        sh """
+                            $WORKSPACE/docs/build_docs \
+                            --doc $WORKSPACE/cloud-on-k8s/docs/index.asciidoc \
+                            --out $WORKSPACE/cloud-on-k8s/docs/html \
+                            --chunk 1
+                        """
+                        sh 'test -e $WORKSPACE/cloud-on-k8s/docs/html/index.html'
                     }
                 }
                 stage("Run smoke E2E tests") {