From 601d1ef0eb077d27f22eb95a57a36838ff2f53f1 Mon Sep 17 00:00:00 2001
From: danfengliu <danfengl@vmware.com>
Date: Thu, 13 Aug 2020 02:56:56 +0000
Subject: [PATCH] Add git/golang/dns config in drone image
Signed-off-by: danfengliu <danfengl@vmware.com>
---
.drone.yml | 2 ++
tests/e2e-image/drone/Dockerfile | 12 ++++++++----
tests/integration.sh | 9 ++++++++-
3 files changed, 18 insertions(+), 5 deletions(-)
mode change 100755 => 100644 tests/integration.sh
diff --git a/.drone.yml b/.drone.yml
index cfa6bc8b9..1d4100b64 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -55,6 +55,8 @@ pipeline:
- npm_registry
- harbor_sign_key
- harbor_sign_key_id
+ - test_gs_key
+ - test_export_env
commands:
- export DOMAIN=${CI_DOMAIN}
- export HOST_CONTAINER_ID=$(hostname)
diff --git a/tests/e2e-image/drone/Dockerfile b/tests/e2e-image/drone/Dockerfile
index cf58b65a0..6ab76371f 100644
--- a/tests/e2e-image/drone/Dockerfile
+++ b/tests/e2e-image/drone/Dockerfile
@@ -7,6 +7,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
bc \
time \
gcc \
+ git \
python-dev \
libffi-dev \
libssl-dev \
@@ -25,10 +26,10 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
wget curl \
parted \
#ip tool
- ethtool \
+ #ethtool \
iproute2 \
- bridge-utils \
- iputils-ping \
+ #bridge-utils \
+ #iputils-ping \
# Add docker in docker support
btrfs-tools \
e2fsprogs \
@@ -49,6 +50,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
apt-get autoremove -y && \
rm -rf /var/lib/apt/lists/*
+RUN apt-get update && \
+ apt-get install golang -y
+
RUN apt-get update -y && \
apt-get install -y zbar-tools libzbar-dev python-zbar
RUN dpkg -L libzbar-dev; ls -l /usr/include/zbar.h
@@ -91,4 +95,4 @@ RUN wget "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/di
COPY dockerd-entrypoint.sh /usr/local/bin/dockerd-entrypoint.sh
RUN chmod +x /usr/local/bin/dockerd-entrypoint.sh
-VOLUME /var/lib/docker
\ No newline at end of file
+VOLUME /var/lib/docker
diff --git a/tests/integration.sh b/tests/integration.sh
old mode 100755
new mode 100644
index dd2c8622e..d91f59dac
--- a/tests/integration.sh
+++ b/tests/integration.sh
@@ -58,6 +58,13 @@ else
harbor_target_bucket=$harbor_releases_bucket/$DRONE_BRANCH
fi
+export GS_PRIVATE_KEY=$GS_PRIVATE_KEY
+export TEST_EXPORT_ENV=$TEST_EXPORT_ENV
+
+echo "1. ===========($TEST_GS_KEY)=========="
+echo "2. ===========($test_gs_key)=========="
+echo "3. ===========($TEST_EXPORT_ENV)=========="
+echo "4. ===========($test_export_env)=========="
# GC credentials
keyfile="/root/harbor-ci-logs.key"
botofile="/root/.boto"
@@ -92,7 +99,6 @@ export Harbor_Assets_Version=$Harbor_Assets_Version
# the env is for online and offline package.
export Harbor_Package_Version=$Harbor_Package_Version
export NPM_REGISTRY=$NPM_REGISTRY
-
# release branch must have their own base image with branch name, master and others will use the dev as base.
if [[ $DRONE_BRANCH == "release-"* ]]; then
Harbor_Build_Base_Tag=$target_release_version
@@ -223,3 +229,4 @@ if [ -f "$keyfile" ]; then
rm -f $keyfile
fi
+