Skip to content

Commit

Permalink
update PR labels (#120)
Browse files Browse the repository at this point in the history
  • Loading branch information
RTann authored Mar 15, 2022
1 parent e6a3608 commit 7c87afd
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
8 changes: 7 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ commands:
repo:
description: Name of the repo where the PR should be opened.
type: string
labels:
description: Space separated list of PR labels to add.
type: string
default: ""
image-flavors:
description: The flavors of the apollo-ci image that the target repo uses. A comma separated list.
type: string
Expand Down Expand Up @@ -63,7 +67,7 @@ commands:
"<< parameters.repo >>" \
"Update apollo-ci image" \
"Bump version of apollo-ci image used in CircleCI" \
"ci-upgrade-tests"
"<< parameters.labels >>"
pushd "/tmp/<< parameters.repo >>"
Expand Down Expand Up @@ -306,13 +310,15 @@ jobs:
steps:
- open-test-pr:
repo: stackrox
labels: "ci-upgrade-tests"
image-flavors: "stackrox-build,stackrox-test-cci"

create-or-update-scanner-repo-pr:
<<: *defaults
steps:
- open-test-pr:
repo: scanner
labels: "generate-dumps-on-pr"
image-flavors: "stackrox-test-cci"

create-or-update-collector-repo-pr:
Expand Down
2 changes: 1 addition & 1 deletion images/static-contents/scripts/create_update_pr.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ usage() {
# 1. Open PR with labels and ensure that the first CI run for that PR respects the labels
# 2. Open PR without labels (or with labels but do not care about CI picking them)
#
# Scenario 1 (PR with CI-releavnt labels) requires to follow the following procedure:
# Scenario 1 (PR with CI-relevant labels) requires to follow the following procedure:
# A. If the PR does not exist yet, we do the following:
# - (Before): push empty commit (optionally with [ci skip] in the message) to the branch:
# 'git commit -am --allow-empty "Commit message [ci skip]" && git push origin'
Expand Down

0 comments on commit 7c87afd

Please sign in to comment.