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:15:24 UTC
[geode] branch support/1.12 updated (26f7c17 -> 47501fc)
This is an automated email from the ASF dual-hosted git repository.
onichols pushed a change to branch support/1.12
in repository https://gitbox.apache.org/repos/asf/geode.git.
from 26f7c17 GEODE-8542: java.lang.IllegalStateException: tcp message exceeded max… (#5562)
new 0cee585 Add required pipeline path dependencies (#7096)
new 47501fc 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/meta/deploy_meta.sh | 28 +++++++++++++---------------
2 files changed, 13 insertions(+), 25 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.12
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 0cee585a267ffd35234a2d96d75814eb076bd33a
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)
(cherry picked from commit 500f794971d884c7dd13c1ea736ab41ae6e14f1d)
---
ci/pipelines/meta/deploy_meta.sh | 28 +++++++++++++---------------
1 file changed, 13 insertions(+), 15 deletions(-)
diff --git a/ci/pipelines/meta/deploy_meta.sh b/ci/pipelines/meta/deploy_meta.sh
index 6befd51..b5841b2 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
@@ -132,15 +130,15 @@ YML
set -e
- if [[ ${UPSTREAM_FORK} != "apache" ]]; then
- fly -t ${FLY_TARGET} status || \
- fly -t ${FLY_TARGET} login \
+ if [[ "${UPSTREAM_FORK}" != "apache" ]]; then
+ ${FLY} -t ${FLY_TARGET} status || \
+ ${FLY} -t ${FLY_TARGET} login \
--team-name ${CONCOURSE_TEAM} \
--concourse-url=${CONCOURSE_URL}
fi
- fly -t ${FLY_TARGET} sync
- fly -t ${FLY_TARGET} set-pipeline \
+ ${FLY} -t ${FLY_TARGET} sync
+ ${FLY} -t ${FLY_TARGET} set-pipeline \
-p ${META_PIPELINE} \
--config ${SCRIPTDIR}/generated-pipeline.yml \
--var artifact-bucket=${ARTIFACT_BUCKET} \
@@ -168,19 +166,19 @@ popd 2>&1 > /dev/null
function jobStatus {
PIPELINE=$1
JOB=$2
- fly jobs -t ${FLY_TARGET} -p ${PIPELINE}|awk "/${JOB}/"'{if($2=="yes")print "paused";else if($4!="n/a")print $4; else print $3}'
+ ${FLY} jobs -t ${FLY_TARGET} -p ${PIPELINE}|awk "/${JOB}/"'{if($2=="yes")print "paused";else if($4!="n/a")print $4; else print $3}'
}
function triggerJob {
PIPELINE=$1
JOB=$2
- (set -x ; fly trigger-job -t ${FLY_TARGET} -j ${PIPELINE}/${JOB})
+ (set -x ; ${FLY} trigger-job -t ${FLY_TARGET} -j ${PIPELINE}/${JOB})
}
function pauseJob {
PIPELINE=$1
JOB=$2
- (set -x ; fly pause-job -t ${FLY_TARGET} -j ${PIPELINE}/${JOB})
+ (set -x ; ${FLY} pause-job -t ${FLY_TARGET} -j ${PIPELINE}/${JOB})
}
function pauseJobs {
@@ -203,7 +201,7 @@ function pauseNewJobs {
function unpauseJob {
PIPELINE=$1
JOB=$2
- (set -x ; fly unpause-job -t ${FLY_TARGET} -j ${PIPELINE}/${JOB})
+ (set -x ; ${FLY} unpause-job -t ${FLY_TARGET} -j ${PIPELINE}/${JOB})
}
function unpauseJobs {
@@ -216,12 +214,12 @@ function unpauseJobs {
function unpausePipeline {
PIPELINE=$1
- (set -x ; fly -t ${FLY_TARGET} unpause-pipeline -p ${PIPELINE})
+ (set -x ; ${FLY} -t ${FLY_TARGET} unpause-pipeline -p ${PIPELINE})
}
function exposePipeline {
PIPELINE=$1
- (set -x ; fly -t ${FLY_TARGET} expose-pipeline -p ${PIPELINE})
+ (set -x ; ${FLY} -t ${FLY_TARGET} expose-pipeline -p ${PIPELINE})
}
function exposePipelines {
[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.12
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 47501fc8eaf573fc0ae9440453c6462775f700c1
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)
(cherry picked from commit 5aa48dadd9370d4f6d0bec36fdc0812c800f2617)
---
ci/pipelines/examples/deploy_pipeline.sh | 10 ----------
1 file changed, 10 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