Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

chore: rename master to main-2.x

pull/24415/head
Jeffrey Smith II 2023-08-14 09:29:40 -04:00
parent b3b982d746
commit 8576cad9e5
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.circleci/config.yml
View File

@ -181,7 +181,7 @@ workflows:
filters:
branches:
only:
- master
- main-2.x
- grace-test:
<<: *any_filter
requires:
@ -195,12 +195,12 @@ workflows:
- build-linux-amd64
filters:
branches:
only: master
only: main-2.x
- share-testing-image:
filters:
branches:
only:
- master
- main-2.x
requires:
- e2e-monitor-ci
@ -212,7 +212,7 @@ workflows:
filters:
branches:
only:
- "master"
- "main-2.x"
jobs:
- aws-destroy-by-date

16
scripts/ci/run-monitor-ci-tests.bash
View File

@ -33,13 +33,13 @@ set -eu -o pipefail
#
# **For OSS-specific testing:**
# Since the OSS private CI is very simple, retrying a failing job in the private CI is not supported.
# OSS-specific testing can include evaluating changes on the OSS master branch against the latest UI acceptance image
# OSS-specific testing can include evaluating changes on the OSS main-2.x branch against the latest UI acceptance image
# to make sure OSS API changes don't break the UI, and evaluating changes to an OSS binary with embedded UI assets with
# a specified UI commit that the UI is from (like a tagged release commit). This allows for the master branches of
# both the UI and influxdb OSS respositories to always stay compatible, and for OSS release builds to be e2e tested
# a specified UI commit that the UI is from (like a tagged release commit). This allows for the master branch of
# both the UI and the main-2.x influxdb OSS respositories to always stay compatible, and for OSS release builds to be e2e tested
# without needing to duplicate the entire private test infrastructure provided in monitor-ci.
#
# Required Env Vars for Testing Changes to OSS Master with the Latest Image Published from UI Master:
# Required Env Vars for Testing Changes to OSS main-2.x with the Latest Image Published from UI Master:
# - RUN_WORKFLOW='build_oss'
# - OSS_SHA: the influxdb repo commit SHA we're running against
#
@ -177,24 +177,24 @@ found_failed_pipeline=0
if [[ -z "${API_KEY:-}" ]] || [[ -z "${MONITOR_CI_BRANCH:-}" ]]; then
printf "\nERROR: monitor-ci pipeline missing required env vars. Must set API_KEY and MONITOR_CI_BRANCH.\n"
exit 1
exit 1
fi
if [[ "${RUN_WORKFLOW}" == "build_oss" ]]; then
required_workflows=( "build_oss" )
if [[ -z "${OSS_SHA:-}" ]]; then
printf "\nERROR: monitor-ci pipeline missing required env vars. Must set OSS_SHA.\n"
exit 1
exit 1
fi
elif [[ "${RUN_WORKFLOW}" == "build_oss_embedded" ]]; then
required_workflows=( "build_oss_embedded" )
if [[ -z "${UI_SHA:-}" ]] || [[ -z "${UI_BRANCH:-}" ]] || [[ -z "${OSS_SHA:-}" ]]; then
printf "\nERROR: monitor-ci pipeline missing required env vars. Must set UI_SHA, UI_BRANCH, and OSS_SHA.\n"
exit 1
exit 1
fi
else
printf "\nERROR: monitor-ci pipeline missing env var RUN_WORKFLOW.\nMust choose one of: 'build_oss', 'build_oss_embedded'\n"
exit 1
exit 1
fi
pipelineStartMsg="starting monitor-ci pipeline targeting monitor-ci branch ${MONITOR_CI_BRANCH}, UI branch ${UI_BRANCH:-master} and using UI SHA ${UI_SHA:-latest}, using OSS SHA ${OSS_SHA:-latest}."

2
scripts/fetch-ui-assets.sh
View File

@ -4,7 +4,7 @@
# repository. The built UI assets are attached to a release in "influxdata/ui",
# which is linked here.
#
# The master branch of "influxdata/influxdb" (this repository) downloads from the
# The main-2.x branch of "influxdata/influxdb" (this repository) downloads from the
# release tagged at the latest released version of influxdb.
# For example, if master is tracking slightly ahead of 2.6.1, then the tag would be OSS-v2.6.1.
#