diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 92a7a8a54..40536225f 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -37,7 +37,7 @@ jobs: strategy: fail-fast: false matrix: - image: [ 'jdbc-centos6-default', 'jdbc-centos7-openjdk8', 'jdbc-centos7-openjdk11', 'jdbc-centos7-openjdk17' ] + image: [ 'jdbc-centos7-openjdk8', 'jdbc-centos7-openjdk11', 'jdbc-centos7-openjdk17' ] cloud: [ 'AWS' ] category: ['TestCategoryResultSet,TestCategoryOthers,TestCategoryLoader', 'TestCategoryConnection,TestCategoryStatement', 'TestCategoryArrow,TestCategoryCore', 'TestCategoryFips'] steps: @@ -57,7 +57,7 @@ jobs: strategy: fail-fast: false matrix: - image: [ 'jdbc-centos6-default' ] + image: [ 'jdbc-centos7-openjdk8' ] cloud: [ 'AWS' ] category: ['TestCategoryResultSet,TestCategoryOthers', 'TestCategoryConnection,TestCategoryStatement', 'TestCategoryCore,TestCategoryLoader'] is_old_driver: ['true'] diff --git a/ci/_init.sh b/ci/_init.sh index d1e585b85..c91f03c31 100755 --- a/ci/_init.sh +++ b/ci/_init.sh @@ -20,7 +20,6 @@ export DRIVER_NAME=jdbc TEST_IMAGE_VERSION=1 declare -A TEST_IMAGE_NAMES=( - [$DRIVER_NAME-centos6-default]=$DOCKER_REGISTRY_NAME/client-$DRIVER_NAME-centos6-default-test:$TEST_IMAGE_VERSION [$DRIVER_NAME-centos7-openjdk8]=$DOCKER_REGISTRY_NAME/client-$DRIVER_NAME-centos7-openjdk8-test:$TEST_IMAGE_VERSION [$DRIVER_NAME-centos7-openjdk11]=$DOCKER_REGISTRY_NAME/client-$DRIVER_NAME-centos7-openjdk11-test:$TEST_IMAGE_VERSION [$DRIVER_NAME-centos7-openjdk17]=$DOCKER_REGISTRY_NAME/client-$DRIVER_NAME-centos7-openjdk17-test:$TEST_IMAGE_VERSION @@ -28,7 +27,6 @@ declare -A TEST_IMAGE_NAMES=( export TEST_IMAGE_NAMES declare -A TEST_IMAGE_DOCKERFILES=( - [$DRIVER_NAME-centos6-default]=jdbc-centos6-default-test [$DRIVER_NAME-centos7-openjdk8]=jdbc-centos7-openjdk-test [$DRIVER_NAME-centos7-openjdk11]=jdbc-centos7-openjdk-test [$DRIVER_NAME-centos7-openjdk17]=jdbc-centos7-openjdk-test diff --git a/ci/image/Dockerfile.jdbc-centos6-default-test b/ci/image/Dockerfile.jdbc-centos6-default-test deleted file mode 100644 index 2ff9478e7..000000000 --- a/ci/image/Dockerfile.jdbc-centos6-default-test +++ /dev/null @@ -1,67 +0,0 @@ -FROM centos:6.10 - -# update OS -RUN yum -y update && \ - yum -y install epel-release && \ - yum -y install centos-release-scl - -# python -RUN yum -y install rh-python36 -COPY scripts/python3.6.sh /usr/local/bin/python3.6 -COPY scripts/python3.6.sh /usr/local/bin/python3 -RUN chmod a+x /usr/local/bin/python3.6 /usr/local/bin/python3 -COPY scripts/pip.sh /usr/local/bin/pip -RUN chmod a+x /usr/local/bin/pip -RUN pip install -U pip -RUN pip install -U snowflake-connector-python - -# aws -RUN pip install -U awscli -COPY scripts/aws.sh /usr/local/bin/aws -RUN chmod a+x /usr/local/bin/aws - -# install Development tools -RUN yum -y groupinstall "Development Tools" && \ - yum -y install zlib-devel - -# git -RUN curl -o - https://mirrors.edge.kernel.org/pub/software/scm/git/git-2.26.0.tar.gz | tar xfz - && \ - cd git-2.26.0 && \ - ./configure --prefix=/opt/git && make && make install && \ - ln -s /opt/git/bin/git /usr/local/bin/git - -# zstd -RUN yum -y install zstd - -# jq -RUN yum -y install jq - -# gosu -RUN curl -o /usr/local/bin/gosu -SL "https://github.com/tianon/gosu/releases/download/1.11/gosu-amd64" -RUN chmod +x /usr/local/bin/gosu -COPY scripts/entrypoint.sh /usr/local/bin/entrypoint.sh -RUN chmod +x /usr/local/bin/entrypoint.sh - -# Java -RUN yum -y install java-1.8.0-openjdk-devel - -# Maven -RUN curl -o - https://downloads.apache.org/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz | tar xfz - -C /opt && \ - ln -s /opt/apache-maven-3.6.3/bin/mvn /usr/local/bin/mvn - -# workspace -RUN mkdir -p /home/user && \ - chmod 777 /home/user -WORKDIR /home/user - -COPY pom.xml /root -COPY dependencies /root/dependencies - -RUN cd /root && \ - mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \ - -Dnot-self-contained-jar \ - --batch-mode --fail-never compile && \ - mv $HOME/.m2 /home/user && \ - chmod -R 777 /home/user/.m2 - -ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]