Skip to content

Commit d1a09a1

Browse files
author
ia-tests
committed
remove double run of airflow tests
1 parent 39d164a commit d1a09a1

File tree

4 files changed

+4
-9
lines changed

4 files changed

+4
-9
lines changed

ci/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ RUN curl -sSL https://sdk.cloud.google.com | bash
1111
RUN apt-get install shellcheck
1212

1313
# install yapf
14-
RUN pip3 install yapf flake8 pytest
14+
RUN pip3 install yapf flake8 pytest apache-airflow[gcp]==1.10.6
1515

1616
# install golang (+gofmt)
1717
RUN apt-get install -y golang

composer/cloudbuild/bin/run_tests.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,8 @@ function install_airflow() {
109109
# $1 relative path to directory containing bigquery sql.
110110
# $2 relative path to JSON file contianing Airflow Variables.
111111
main() {
112-
setup_local_airflow "$1" "$2" "$3"
112+
install_airflow
113+
setup_local_airflow "$1" "$2" "$3"
113114
run_tests
114115
TEST_STATUS=$?
115116
clean_up

helpers/run_tests.sh

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,6 @@ then
2323
exit 1
2424
fi
2525

26-
echo "running composer python tests..."
27-
if ! (cd ./composer && ./cloudbuild/bin/run_tests.sh ../bigquery/sql/ ./config/AirflowVariables.json plugins/);
28-
then
29-
echo "composer python3 unittests failed"
30-
exit 1
31-
fi
32-
3326
echo "dry runing bigquery sql..."
3427
if ! (cd ./bigquery && ./tests/test_sql.sh);
3528
then

precommit_cloudbuild.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,4 @@ steps:
3232
- name: 'google/cloud-sdk'
3333
entrypoint: 'bash'
3434
args: ['./helpers/run_relevant_cloudbuilds.sh', 'precommit_cloudbuild.yaml']
35+
id: 'run-relevant-cloud-builds'

0 commit comments

Comments
 (0)