cleanups

apache · Feb 13, 2020 · 56d01e5 · 56d01e5
1 parent 0d869f3
commit 56d01e5
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 46 deletions.
diff --git a/tools/azure-pipelines/build-apache-repo.yml b/tools/azure-pipelines/build-apache-repo.yml
@@ -21,18 +21,6 @@
 #  - custom triggered e2e tests
 #  - nightly builds
 
-
-
-# to be enabled with FLINK-15834
-#schedules:
-#- cron: "0 0 * * *"
-#  displayName: nightly build
-#  branches:
-#    include:
-#    - master
-#    - release-*
-#  always: true # run even if there were no changes to the mentioned branches
-
 resources:
   containers:
   # Container with Maven 3.2.5, SSL to have the same environment everywhere.
@@ -60,36 +48,3 @@ stages:
           e2e_pool_definition:
             vmImage: 'ubuntu-16.04'
           environment: PROFILE="-Dhadoop.version=2.8.3 -Dinclude_hadoop_aws -Dscala-2.11"
-  # to be enabled with FLINK-15834
-  # Special stage for nightly builds:
-  # - stage: cron_build_on_azure_os_free_pool
-  #   displayName: "Cron build on free Azure Resource Pool"
-  #   dependsOn: [] # depending on an empty array makes the stages run in parallel
-  #   condition: or(eq(variables['Build.Reason'], 'Schedule'), eq(variables['MODE'], 'nightly'))
-  #   jobs:
-  #     - template: jobs-template.yml
-  #       parameters:
-  #         stage_name: cron_build_default
-  #         test_pool_definition:
-  #           vmImage: 'ubuntu-latest'
-  #         e2e_pool_definition:
-  #           vmImage: 'ubuntu-latest'
-  #         environment: PROFILE="-Dhadoop.version=2.8.3 -Dinclude_hadoop_aws -Dscala-2.11"
-  #     - template: jobs-template.yml
-  #       parameters:
-  #         stage_name: cron_build_scala2_12
-  #         test_pool_definition:
-  #           vmImage: 'ubuntu-latest'
-  #         e2e_pool_definition:
-  #           vmImage: 'ubuntu-latest'
-  #         environment: PROFILE="-Dhadoop.version=2.8.3 -Dinclude_hadoop_aws -Dscala-2.12 -Phive-1.2.1"
-  #     - template: jobs-template.yml
-  #       parameters:
-  #         stage_name: cron_build_jdk11
-  #         test_pool_definition:
-  #           vmImage: 'ubuntu-latest'
-  #         e2e_pool_definition:
-  #           vmImage: 'ubuntu-latest'
-  #         environment: PROFILE="-Dhadoop.version=2.8.3 -Dinclude_hadoop_aws -Dscala-2.11 -Djdk11"
-
-
diff --git a/tools/azure-pipelines/jobs-template.yml b/tools/azure-pipelines/jobs-template.yml
@@ -36,7 +36,7 @@ jobs:
   # we do not have to re-download all dependencies from maven central for 
   # each build. The hope is that downloading the cache is faster than
   # all dependencies individually.
-  # In this configuration, we a hash over all committed (not generated) .pom files 
+  # In this configuration, we use a hash over all committed (not generated) .pom files 
   # as a key for the build cache (CACHE_KEY). If we have a cache miss on the hash
   # (usually because a pom file has changed), we'll fall back to a key without
   # the pom files (CACHE_FALLBACK_KEY).