You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by sm...@apache.org on 2021/04/27 18:33:07 UTC
[geode] branch support/1.12 updated: GEODE-9192: test-container
fixes (#6381)
This is an automated email from the ASF dual-hosted git repository.
smgoller pushed a commit to branch support/1.12
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/support/1.12 by this push:
new 67b7c95 GEODE-9192: test-container fixes (#6381)
67b7c95 is described below
commit 67b7c95dccd7a4cd5cfa7082dbda626387583e66
Author: Sean Goller <se...@goller.net>
AuthorDate: Tue Apr 27 11:24:46 2021 -0700
GEODE-9192: test-container fixes (#6381)
* Use ubuntu as the base
* Install packages we got from the old base
* Install ca-certificates with the initial batch
* Adjust test-container build job
(cherry picked from commit 0b3eb0494e130b4b0781b774c47d04bac05df7f8)
---
ci/images/test-container/Dockerfile | 9 +++++++--
ci/pipelines/images/jinja.template.yml | 8 ++++----
ci/pipelines/meta/deploy_meta.sh | 23 +++++++++++++++++++++++
3 files changed, 34 insertions(+), 6 deletions(-)
diff --git a/ci/images/test-container/Dockerfile b/ci/images/test-container/Dockerfile
index eb58a04..f7cf4f5 100644
--- a/ci/images/test-container/Dockerfile
+++ b/ci/images/test-container/Dockerfile
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM buildpack-deps:bionic-scm
+FROM ubuntu:bionic
ENTRYPOINT []
ARG CHROME_DRIVER_VERSION=2.35
@@ -23,10 +23,16 @@ WORKDIR /tmp/work
RUN apt-get update \
&& apt-get install -y --no-install-recommends \
apt-transport-https \
+ ca-certificates \
bzip2 \
+ curl \
+ git \
+ gnupg \
lsb-release \
lsof \
net-tools \
+ procps \
+ software-properties-common \
unzip \
xz-utils \
&& echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google-chrome.list \
@@ -36,7 +42,6 @@ RUN apt-get update \
&& apt-get update \
&& apt-get install -y --no-install-recommends \
aptitude \
- ca-certificates \
google-chrome-stable \
&& wget --no-verbose -O /tmp/chromedriver_linux64.zip https://chromedriver.storage.googleapis.com/$CHROME_DRIVER_VERSION/chromedriver_linux64.zip \
&& rm -rf /opt/selenium/chromedriver \
diff --git a/ci/pipelines/images/jinja.template.yml b/ci/pipelines/images/jinja.template.yml
index aebecd4..43b52a6 100644
--- a/ci/pipelines/images/jinja.template.yml
+++ b/ci/pipelines/images/jinja.template.yml
@@ -105,12 +105,12 @@ resources:
password: ((docker-password))
repository: gcr.io/((gcp-project))/((pipeline-prefix))alpine-tools
-- name: bionic-scm-docker-image
+- name: ubuntu-docker-image
type: registry-image
icon: docker
source:
- repository: buildpack-deps
- tag: bionic-scm
+ repository: ubuntu
+ tag: bionic
- name: test-container-dockerfile
type: git
@@ -306,7 +306,7 @@ jobs:
serial: true
plan:
- aggregate:
- - get: bionic-scm-docker-image
+ - get: ubuntu-docker-image
trigger: true
- get: test-container-dockerfile
trigger: true
diff --git a/ci/pipelines/meta/deploy_meta.sh b/ci/pipelines/meta/deploy_meta.sh
index ba47076..6befd51 100755
--- a/ci/pipelines/meta/deploy_meta.sh
+++ b/ci/pipelines/meta/deploy_meta.sh
@@ -108,6 +108,29 @@ YML
python3 ../render.py jinja.template.yml --variable-file ../shared/jinja.variables.yml repository.yml pipelineProperties.yml --environment ../shared/ --output ${SCRIPTDIR}/generated-pipeline.yml --debug || exit 1
+ unamestr=$(uname)
+ platform='unknown'
+ if [[ "${unamestr}" == 'Darwin' ]]; then
+ platform='darwin'
+ elif [[ "${unamestr}" == 'Linux' ]]; then
+ platform='linux'
+ fi
+
+ FLY_URL="${CONCOURSE_URL}/api/v1/cli?arch=amd64&platform=${platform}"
+ FLY="${SCRIPTDIR}/fly"
+ if [[ ! -e "${FLY}" ]]; then
+ curl -so ${FLY} ${FLY_URL}
+ fi
+ chmod +x ${FLY}
+ set +e
+ if [[ ! $(${FLY} targets | grep "${FLY_TARGET}") ]]; then
+ echo "Creating target for ${FLY_TARGET}"
+ ${FLY} -t ${FLY_TARGET} login -n "${CONCOURSE_TEAM}" -c "${CONCOURSE_URL}"
+ else
+ echo "Target ${FLY_TARGET} already exists."
+ fi
+
+
set -e
if [[ ${UPSTREAM_FORK} != "apache" ]]; then
fly -t ${FLY_TARGET} status || \