Revert "Hugo deploy Live" (#7568)

DataDog · May 27, 2020 · 84a5ecc · 84a5ecc
1 parent 4c2444a
commit 84a5ecc
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 75 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -40,60 +40,30 @@ build_preview:
     LOCAL: "False"
   script:
     - post_dd_event "documentation deploy ${CI_COMMIT_REF_NAME} started" "${CI_PROJECT_URL}/pipelines/${CI_PIPELINE_ID}" "info"
+    - version_static_assets
     - touch Makefile.config
     - make examples
     - sync_integration_descriptions
     #- sync_integration_descriptions_cached
     - placehold_translations
     - update_preview_baseurl
-    - test -d "node_modules" || (echo "cp missing node_modules from /etc/node_modules"; cp -r /etc/node_modules .)
-    - yarn run build:preview
+    - build_hugo_site_new
+    - in-isolation deploy_preview
+    - collect_static_assets
     # remove service_checks json as we don't need to s3 push that..
     - rm -rf data/service_checks
-    - in-isolation deploy_preview
+    - push_site_to_s3
     - notify_slack "<https://github.com/DataDog/documentation/commit/${CI_COMMIT_SHA}|${CI_COMMIT_REF_NAME}> is ready for preview. <${CI_PROJECT_URL}/pipelines/${CI_PIPELINE_ID}| checks running>." "#31b834"
+    #- remove_static_from_repo
+    #- create_artifact
+    #- create_artifact_untracked
   artifacts:
     paths:
       - ${ARTIFACT_RESOURCE}
       - ./integrations_data
   only:
     - /.+?\/[a-zA-Z0-9_-]+/
 
-# build_preview_legacy:
-#   <<: *base_template
-#   stage: build
-#   environment: "preview"
-#   variables:
-#     URL: ${PREVIEW_DOMAIN}
-#     CONFIG: ${PREVIEW_CONFIG}
-#     MESSAGE: ":gift_heart: Your preview site is available!\nNow running tests..."
-#     CONFIGURATION_FILE: "./local/bin/py/build/configurations/pull_config_preview.yaml"
-#     LOCAL: "False"
-#   script:
-#     - post_dd_event "documentation deploy ${CI_COMMIT_REF_NAME} started" "${CI_PROJECT_URL}/pipelines/${CI_PIPELINE_ID}" "info"
-#     - version_static_assets
-#     - touch Makefile.config
-#     - make examples
-#     - sync_integration_descriptions
-#     #- sync_integration_descriptions_cached
-#     - placehold_translations
-#     - update_preview_baseurl
-#     - build_hugo_site_new
-#     - collect_static_assets
-#     # remove service_checks json as we don't need to s3 push that..
-#     - rm -rf data/service_checks
-#     - push_site_to_s3
-#     - notify_slack "<https://github.com/DataDog/documentation/commit/${CI_COMMIT_SHA}|${CI_COMMIT_REF_NAME}> is ready for preview. <${CI_PROJECT_URL}/pipelines/${CI_PIPELINE_ID}| checks running>." "#31b834"
-#     #- remove_static_from_repo
-#     #- create_artifact
-#     #- create_artifact_untracked
-#   artifacts:
-#     paths:
-#       - ${ARTIFACT_RESOURCE}
-#       - ./integrations_data
-#   only:
-#     - /.+?\/[a-zA-Z0-9_-]+/
-
 link_checks_preview:
   <<: *base_template
   stage: post-deploy
@@ -148,14 +118,16 @@ build_live:
   script:
     - post_dd_event "documentation deploy ${CI_COMMIT_REF_NAME} started" "${CI_PROJECT_URL}/pipelines/${CI_PIPELINE_ID}" "info"
     - notify_slack "<https://github.com/DataDog/documentation/commit/${CI_COMMIT_SHA}|${CI_COMMIT_SHA:0:8}> sent to gitlab for production deployment. <${CI_PROJECT_URL}/pipelines/${CI_PIPELINE_ID}|details>" "#FFD700"
+    - version_static_assets
     - touch Makefile.config
     - make examples
     - sync_integration_descriptions
     - sync_integration_metrics
     - placehold_translations
-    - test -d "node_modules" || (echo "cp missing node_modules from /etc/node_modules"; cp -r /etc/node_modules .)
-    - yarn run build:live
+    - build_hugo_site_new
     - in-isolation deploy_live
+    - collect_static_assets
+    - push_site_to_s3
     - create_artifact
     - create_artifact_untracked
   artifacts:
@@ -168,39 +140,6 @@ build_live:
   only:
     - master
 
-# build_live_legacy:
-#   <<: *base_template
-#   stage: build
-#   environment: "live"
-#   variables:
-#     CONFIG: ${LIVE_CONFIG}
-#     URL: ${LIVE_DOMAIN}
-#     UNTRACKED_EXTRAS: "data,content/en/agent/basic_agent_usage/heroku.md,content/en/agent/basic_agent_usage/ansible.md,content/en/agent/basic_agent_usage/chef.md,content/en/agent/basic_agent_usage/puppet.md,content/en/developers/integrations,content/en/developers/amazon_cloudformation.md,content/en/integrations,content/en/logs/log_collection/android.md,content/en/logs/log_collection/ios.md,content/en/tracing/setup/android.md,content/en/tracing/setup/ruby.md,content/en/security_monitoring/default_rules"
-#     CONFIGURATION_FILE: "./local/bin/py/build/configurations/pull_config.yaml"
-#     LOCAL: "False"
-#   script:
-#     - post_dd_event "documentation deploy ${CI_COMMIT_REF_NAME} started" "${CI_PROJECT_URL}/pipelines/${CI_PIPELINE_ID}" "info"
-#     - notify_slack "<https://github.com/DataDog/documentation/commit/${CI_COMMIT_SHA}|${CI_COMMIT_SHA:0:8}> sent to gitlab for production deployment. <${CI_PROJECT_URL}/pipelines/${CI_PIPELINE_ID}|details>" "#FFD700"
-#     - version_static_assets
-#     - touch Makefile.config
-#     - make examples
-#     - sync_integration_descriptions
-#     - sync_integration_metrics
-#     - placehold_translations
-#     - build_hugo_site_new
-#     - collect_static_assets
-#     - push_site_to_s3
-#     - create_artifact
-#     - create_artifact_untracked
-#   artifacts:
-#     when: on_success
-#     paths:
-#       - ${ARTIFACT_RESOURCE}
-#       - ./integrations_data
-#       - content/en
-#     expire_in: 1 week
-#   only:
-#     - master
 
 index_internal_doc:
   stage: post-deploy

diff --git a/package.json b/package.json
@@ -18,8 +18,8 @@
         "build:webpack:preview": "NODE_ENV=preview webpack --config webpack.prod.js",
         "build:hugo:live": "yarn run build:hugo -- -D -F --environment live",
         "build:live": "run-s build:webpack build:hugo:live",
-        "deploy:previewAssets": "./node_modules/.bin/hugo deploy --target previewAssets -e preview --maxDeletes 0 --log --verbose --debug",
-        "deploy:preview": "./node_modules/.bin/hugo deploy --target preview -e preview --maxDeletes -1 --log --verbose --debug",
+        "deploy:previewAssets": "./node_modules/.bin/hugo deploy --target previewAssets -e preview --maxDeletes 0 --log --verbose --debug --dryRun",
+        "deploy:preview": "./node_modules/.bin/hugo deploy --target preview -e preview --maxDeletes -1 --log --verbose --debug --dryRun",
         "deploy:liveAssets": "./node_modules/.bin/hugo deploy --target liveAssets -e live --maxDeletes 0 --log --verbose --debug --dryRun",
         "deploy:live": "./node_modules/.bin/hugo deploy --target live -e live --maxDeletes -1 --log --verbose --debug --dryRun",
         "build:apiPages": "node -e 'require(\"./src/scripts/build-api-pages.js\").init()'",