[AIRFLOW-4296] Remove py2 in ci process (apache#5090)

modmed · Jul 29, 2019 · c57b694 · c57b694
1 parent 3b25247
commit c57b694
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 21 deletions.
diff --git a/scripts/ci/docker-compose.yml b/scripts/ci/docker-compose.yml
@@ -74,7 +74,6 @@ services:
       - INSIDE_DOCKER_CONTAINER=true
       - ADDITIONAL_PATH=~/.local/bin
       - TOX_ENV
-      - PYTHON_VERSION
       - CI
       - TRAVIS
       - TRAVIS_BRANCH

diff --git a/scripts/ci/kubernetes/docker/Dockerfile b/scripts/ci/kubernetes/docker/Dockerfile
@@ -15,22 +15,20 @@
 #  specific language governing permissions and limitations      *
 #  under the License.                                           *
 
-FROM ubuntu:16.04
+FROM python:3.6-slim
 
 # install deps
 RUN apt-get update -y && apt-get install -y \
         wget \
-        python-dev \
-        python-pip \
         libczmq-dev \
-        libcurlpp-dev \
         curl \
         libssl-dev \
         git \
         inetutils-telnet \
         bind9utils \
         zip \
         unzip \
+        gcc \
     && apt-get clean
 
 RUN pip install --upgrade pip

diff --git a/scripts/ci/kubernetes/docker/airflow-test-env-init.sh b/scripts/ci/kubernetes/docker/airflow-test-env-init.sh
@@ -19,7 +19,7 @@
 
 set -x
 
-cd /usr/local/lib/python2.7/dist-packages/airflow && \
+cd /usr/local/lib/python3.6/site-packages/airflow && \
 cp -R example_dags/* /root/airflow/dags/ && \
 cp -R contrib/example_dags/example_kubernetes_*.py /root/airflow/dags/ && \
 cp -a contrib/example_dags/libs /root/airflow/dags/ && \

diff --git a/scripts/ci/kubernetes/docker/build.sh b/scripts/ci/kubernetes/docker/build.sh
@@ -21,6 +21,7 @@ IMAGE=${IMAGE:-airflow}
 TAG=${TAG:-latest}
 DIRNAME=$(cd "$(dirname "$0")"; pwd)
 AIRFLOW_ROOT="$DIRNAME/../../../.."
+PYTHON_DOCKER_IMAGE=python:3.6-slim
 
 set -e
 
@@ -34,12 +35,6 @@ fi
 echo "Airflow directory $AIRFLOW_ROOT"
 echo "Airflow Docker directory $DIRNAME"
 
-if [[ ${PYTHON_VERSION} == '3' ]]; then
-  PYTHON_DOCKER_IMAGE=python:3.6-slim
-else
-  PYTHON_DOCKER_IMAGE=python:2.7-slim
-fi
-
 cd $AIRFLOW_ROOT
 docker run -ti --rm -v ${AIRFLOW_ROOT}:/airflow \
     -w /airflow ${PYTHON_DOCKER_IMAGE} ./scripts/ci/kubernetes/docker/compile.sh \

diff --git a/scripts/ci/run-ci.sh b/scripts/ci/run-ci.sh
@@ -30,16 +30,10 @@ if [ -d $HOME/.minikube ]; then
     sudo chown -R airflow.airflow $HOME/.kube $HOME/.minikube
 fi
 
-if [[ $PYTHON_VERSION == '3' ]]; then
-  PIP=pip3
-else
-  PIP=pip2
-fi
-
-sudo -H $PIP install --upgrade pip
-sudo -H $PIP install tox
+sudo -H pip3 install --upgrade pip
+sudo -H pip3 install tox
 
-cd $AIRFLOW_ROOT && $PIP --version && tox --version
+cd $AIRFLOW_ROOT && pip3 --version && tox --version
 
 if [ -z "$KUBERNETES_VERSION" ];
 then