[airflow] 01/01: The bats script for CI image is now placed in the docker folder

[po...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

potiuk pushed a commit to branch v1-10-test
in repository https://gitbox.apache.org/repos/asf/airflow.git

commit 195f00dc6cde1a20d539cd5f5c27a0a48c310df7
Author: Jarek Potiuk <ja...@potiuk.com>
AuthorDate: Sun Oct 4 00:08:05 2020 +0200

    The bats script for CI image is now placed in the docker folder
    
    The script was previously placed in scripts/ci which caused
    a bit of a problem in 1-10-test branch where PRs were using
    scripts/ci from the v1-10-test HEAD but they were missing
    the ci script from the PR.
    
    (cherry picked from commit 2a1be3c8408df708b675adbbc5edc734aa1dfc1c)
---
 .dockerignore            |  1 -
 Dockerfile.ci            |  2 +-
 scripts/docker/load.bash | 22 ++++++++++++++++++++++
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index c914d56..7d29561 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -38,7 +38,6 @@
 # Add those folders to the context so that they are available in the CI container
 !scripts/in_container
 !scripts/docker
-!scripts/ci/dockerfiles/bats
 
 # Add tests and kubernetes_tests to context.
 !tests
diff --git a/Dockerfile.ci b/Dockerfile.ci
index 2bbc9ac..02a9a53 100644
--- a/Dockerfile.ci
+++ b/Dockerfile.ci
@@ -216,7 +216,7 @@ RUN mkdir -p /opt/bats/lib/bats-file \
 RUN echo "export PATH=/opt/bats/bin:${PATH}" >> /root/.bashrc
 
 # Additional scripts for managing BATS addons
-COPY scripts/ci/dockerfiles/bats/load.bash /opt/bats/lib/
+COPY scripts/docker/load.bash /opt/bats/lib/
 RUN chmod a+x /opt/bats/lib/load.bash
 
 
diff --git a/scripts/docker/load.bash b/scripts/docker/load.bash
new file mode 100644
index 0000000..fe7e1d2
--- /dev/null
+++ b/scripts/docker/load.bash
@@ -0,0 +1,22 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# shellcheck disable=SC1091
+source "/opt/bats/lib/bats-support/load.bash"
+# shellcheck disable=SC1091
+source "/opt/bats/lib/bats-assert/load.bash"
+# shellcheck disable=SC1091
+source "/opt/bats/lib/bats-file/load.bash"