You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by on...@apache.org on 2021/11/10 00:03:07 UTC
[geode] branch support/1.14 updated (e9ffadf -> 55810c5)
This is an automated email from the ASF dual-hosted git repository.
onichols pushed a change to branch support/1.14
in repository https://gitbox.apache.org/repos/asf/geode.git.
from e9ffadf GEODE-9778: Bump netty from 4.1.67.Final to 4.1.70.Final
new 15d974c Add required pipeline path dependencies (#7096)
new 55810c5 GEODE-9775: fix remaining pipelines to support k8s (#7099)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
ci/pipelines/examples/deploy_pipeline.sh | 10 ----------
ci/pipelines/mass-test-run/deploy_pipeline.sh | 10 ----------
ci/pipelines/meta/deploy_meta.sh | 8 +++-----
ci/pipelines/meta/jinja.template.yml | 6 ++++--
4 files changed, 7 insertions(+), 27 deletions(-)
[geode] 01/02: Add required pipeline path dependencies (#7096)
Posted by on...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
onichols pushed a commit to branch support/1.14
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 15d974c3fa99f06ed3767394de0ef7cd551d46f8
Author: Robert Houghton <rh...@pivotal.io>
AuthorDate: Tue Nov 9 11:07:30 2021 -0800
Add required pipeline path dependencies (#7096)
(cherry picked from commit e34147710bd942594fe5b886289a148eea74757e)
---
ci/pipelines/meta/deploy_meta.sh | 8 +++-----
ci/pipelines/meta/jinja.template.yml | 6 ++++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ci/pipelines/meta/deploy_meta.sh b/ci/pipelines/meta/deploy_meta.sh
index f6a46c4..9db9513 100755
--- a/ci/pipelines/meta/deploy_meta.sh
+++ b/ci/pipelines/meta/deploy_meta.sh
@@ -70,10 +70,8 @@ fi
set -e
set -x
-if [[ "${CONCOURSE_HOST}" == "concourse.apachegeode-ci.info" ]]; then
- CONCOURSE_SCHEME=https
-fi
-CONCOURSE_URL=${CONCOURSE_SCHEME:-"http"}://${CONCOURSE_HOST}
+CONCOURSE_SCHEME=https
+CONCOURSE_URL=${CONCOURSE_SCHEME}://${CONCOURSE_HOST}
FLY_TARGET=${CONCOURSE_HOST}-${CONCOURSE_TEAM}
. ${SCRIPTDIR}/../shared/utilities.sh
@@ -133,7 +131,7 @@ YML
FLY=${FLY:-$(which fly)}
set -e
- if [[ ${UPSTREAM_FORK} != "apache" ]]; then
+ if [[ "${UPSTREAM_FORK}" != "apache" ]]; then
${FLY} -t ${FLY_TARGET} status || \
${FLY} -t ${FLY_TARGET} login \
--team-name ${CONCOURSE_TEAM} \
diff --git a/ci/pipelines/meta/jinja.template.yml b/ci/pipelines/meta/jinja.template.yml
index 8be8b3d..6f1116f 100644
--- a/ci/pipelines/meta/jinja.template.yml
+++ b/ci/pipelines/meta/jinja.template.yml
@@ -46,14 +46,16 @@ resources:
branch: ((geode-build-branch))
paths:
- ci/pipelines/reaper/*
+ - ci/pipelines/render.py
- name: geode-mass-test-run-pipeline
type: git
source:
{{ github_access() | indent(4) }}
branch: ((geode-build-branch))
paths:
- - ci/pipelines/mass-test-run/*
- - ci/pipelines/shared/*
+ - ci/pipelines/mass-test-run/*
+ - ci/pipelines/shared/*
+ - ci/pipelines/render.py
- name: meta-mini-dockerfile
type: git
source:
[geode] 02/02: GEODE-9775: fix remaining pipelines to support k8s
(#7099)
Posted by on...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
onichols pushed a commit to branch support/1.14
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 55810c505d8f1429640eb7a7561a5f6cc10165dd
Author: Owen Nichols <34...@users.noreply.github.com>
AuthorDate: Tue Nov 9 13:13:38 2021 -0800
GEODE-9775: fix remaining pipelines to support k8s (#7099)
(cherry picked from commit beb898c1fa06fc488a553faae2c7d03e0428782b)
---
ci/pipelines/examples/deploy_pipeline.sh | 10 ----------
ci/pipelines/mass-test-run/deploy_pipeline.sh | 10 ----------
2 files changed, 20 deletions(-)
diff --git a/ci/pipelines/examples/deploy_pipeline.sh b/ci/pipelines/examples/deploy_pipeline.sh
index 261912b..287f653 100755
--- a/ci/pipelines/examples/deploy_pipeline.sh
+++ b/ci/pipelines/examples/deploy_pipeline.sh
@@ -44,16 +44,6 @@ if [ "${GEODE_BRANCH}" = "HEAD" ]; then
exit 1
fi
-MY_NAME=$(curl -s "http://metadata.google.internal/computeMetadata/v1/instance/name" -H "Metadata-Flavor: Google")
-MY_ZONE=$(curl -s "http://metadata.google.internal/computeMetadata/v1/instance/zone" -H "Metadata-Flavor: Google")
-MY_ZONE=${MY_ZONE##*/}
-NETWORK_INTERFACE_INFO="$(gcloud compute instances describe ${MY_NAME} --zone ${MY_ZONE} --format="json(networkInterfaces)")"
-GCP_NETWORK=$(echo ${NETWORK_INTERFACE_INFO} | jq -r '.networkInterfaces[0].network')
-GCP_NETWORK=${GCP_NETWORK##*/}
-GCP_SUBNETWORK=$(echo ${NETWORK_INTERFACE_INFO} | jq -r '.networkInterfaces[0].subnetwork')
-GCP_SUBNETWORK=${GCP_SUBNETWORK##*/}
-ENV_ID=$(echo ${GCP_NETWORK} | awk -F- '{ print $1}')
-
pushd ${SCRIPTDIR} 2>&1 > /dev/null
cat > repository.yml <<YML
diff --git a/ci/pipelines/mass-test-run/deploy_pipeline.sh b/ci/pipelines/mass-test-run/deploy_pipeline.sh
index 0a48277..f3255fd 100755
--- a/ci/pipelines/mass-test-run/deploy_pipeline.sh
+++ b/ci/pipelines/mass-test-run/deploy_pipeline.sh
@@ -40,16 +40,6 @@ fi
echo "Sanitized Geode Fork = ${SANITIZED_GEODE_FORK}"
echo "Sanitized Geode Branch = ${SANITIZED_GEODE_BRANCH}"
-MY_NAME=$(curl -s "http://metadata.google.internal/computeMetadata/v1/instance/name" -H "Metadata-Flavor: Google")
-MY_ZONE=$(curl -s "http://metadata.google.internal/computeMetadata/v1/instance/zone" -H "Metadata-Flavor: Google")
-MY_ZONE=${MY_ZONE##*/}
-NETWORK_INTERFACE_INFO="$(gcloud compute instances describe ${MY_NAME} --zone ${MY_ZONE} --format="json(networkInterfaces)")"
-GCP_NETWORK=$(echo ${NETWORK_INTERFACE_INFO} | jq -r '.networkInterfaces[0].network')
-GCP_NETWORK=${GCP_NETWORK##*/}
-GCP_SUBNETWORK=$(echo ${NETWORK_INTERFACE_INFO} | jq -r '.networkInterfaces[0].subnetwork')
-GCP_SUBNETWORK=${GCP_SUBNETWORK##*/}
-ENV_ID=$(echo ${GCP_NETWORK} | awk -F- '{ print $1}')
-
#echo "DEBUG INFO *****************************"
#echo "Pipeline prefix = ${PIPELINE_PREFIX}"
#echo "Docker image prefix = ${DOCKER_IMAGE_PREFIX}"