Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add AC 2.1.1-2.dev #281

Merged
merged 1 commit into from Jul 6, 2021
Merged

Add AC 2.1.1-2.dev #281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
59 changes: 54 additions & 5 deletions .circleci/config.yml
View file
Open in desktop
Expand Up @@ -1258,7 +1258,8 @@ workflows:
name: build-2.1.1-buster
airflow_version: 2.1.1
distribution_name: buster
dev_build: false
dev_build: true
extra_args: "--build-arg VERSION=$(curl https://pip.astronomer.io/simple/astronomer-certified/latest-2.1.1.build)"
requires:
- Need-Approval-2.1.1
- static-checks
Expand All @@ -1277,8 +1278,8 @@ workflows:
- push:
name: push-2.1.1-buster
tag: "2.1.1-buster"
dev_build: false
extra_tags: "2.1.1-buster-${CIRCLE_BUILD_NUM},2.1.1-1-buster"
dev_build: true
extra_tags: "2.1.1-buster-${CIRCLE_BUILD_NUM},2.1.1-2.dev-buster"
context:
- quay.io
- docker.io
Expand All @@ -1292,8 +1293,8 @@ workflows:
- push:
name: push-2.1.1-buster-onbuild
tag: "2.1.1-buster-onbuild"
dev_build: false
extra_tags: "2.1.1-buster-onbuild-${CIRCLE_BUILD_NUM},2.1.1-1-buster-onbuild"
dev_build: true
extra_tags: "2.1.1-buster-onbuild-${CIRCLE_BUILD_NUM},2.1.1-2.dev-buster-onbuild"
context:
- quay.io
- docker.io
Expand Down Expand Up @@ -1458,6 +1459,54 @@ workflows:
branches:
only:
- master
- build:
name: build-2.1.1-buster
airflow_version: 2.1.1
distribution_name: buster
dev_build: true
extra_args: "--build-arg VERSION=$(curl https://pip.astronomer.io/simple/astronomer-certified/latest-2.1.1.build)"
- scan-trivy:
name: scan-trivy-2.1.1-buster-onbuild
airflow_version: 2.1.1
distribution: buster
distribution_name: buster-onbuild
requires:
- build-2.1.1-buster
- test:
name: test-2.1.1-buster-images
tag: "2.1.1-buster"
requires:
- build-2.1.1-buster
- push:
name: push-2.1.1-buster
tag: "2.1.1-buster"
dev_build: true
extra_tags: "2.1.1-buster-${CIRCLE_BUILD_NUM}"
context:
- quay.io
- docker.io
requires:
- scan-trivy-2.1.1-buster-onbuild
- test-2.1.1-buster-images
filters:
branches:
only:
- master
- push:
name: push-2.1.1-buster-onbuild
tag: "2.1.1-buster-onbuild"
dev_build: true
extra_tags: "2.1.1-buster-onbuild-${CIRCLE_BUILD_NUM},2.1.1-2.dev-buster-onbuild"
context:
- quay.io
- docker.io
requires:
- scan-trivy-2.1.1-buster-onbuild
- test-2.1.1-buster-images
filters:
branches:
only:
- master

jobs:
static-checks:
Expand Down
2 changes: 1 addition & 1 deletion .circleci/generate_circleci_config.py
View file
Open in desktop
Expand Up @@ -19,7 +19,7 @@
("2.0.0-8.dev", ["buster"]),
("2.0.2-4.dev", ["buster"]),
("2.1.0-3.dev", ["buster"]),
("2.1.1-1", ["buster"]),
("2.1.1-2.dev", ["buster"]),
])

# Airflow Versions for which we don't publish Python Wheels
Expand Down
8 changes: 8 additions & 0 deletions 2.1.1/CHANGELOG.md
View file
Open in desktop
@@ -1,5 +1,13 @@
# Changelog

Astronomer Certified 2.1.1-2, TBC
----------------------------------------

### Bugfixes

- Fix: Marking Task as success/failed ([commit](https://github.com/astronomer/airflow/commit/df1ff499c))
- Fix "Invalid JSON configuration, must be a dict" (#16648) ([commit](https://github.com/astronomer/airflow/commit/2637d9a15))

Astronomer Certified 2.1.1-1, 2021-07-02
----------------------------------------

Expand Down
4 changes: 2 additions & 2 deletions 2.1.1/buster/Dockerfile
View file
Open in desktop
Expand Up @@ -110,7 +110,7 @@ RUN apt-get update \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

ARG VERSION="2.1.1-1"
ARG VERSION="2.1.1-2.*"
ARG SUBMODULES="async,azure,amazon,celery,elasticsearch,google,password,cncf.kubernetes,mysql,postgres,redis,slack,ssh,statsd,virtualenv"
ARG AIRFLOW_MODULE="astronomer_certified[${SUBMODULES}]==$VERSION"
ARG AIRFLOW_VERSION="2.1.1"
Expand Down Expand Up @@ -145,7 +145,7 @@ RUN apt-get update \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

ARG VERSION="2.1.1-1"
ARG VERSION="2.1.1-2.*"
ARG AIRFLOW_VERSION="2.1.1"
LABEL io.astronomer.docker.airflow.version="${AIRFLOW_VERSION}"
LABEL io.astronomer.docker.ac.version="${VERSION}"
Expand Down