Skip to content

Commit

Permalink
Move bulk_prelaunch_jobs from master to main
Browse files Browse the repository at this point in the history
This will cause all the ToBiC jobs to start working and
reporting against main, instead of master.
  • Loading branch information
stronk7 committed Nov 15, 2023
1 parent 77dd15a commit 23de098
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# use a combination of user and password or token). See Jenkins CLI docs for more info.
#cf_repository: id for "Pull from Repository" custom field (customfield_10100)
#cf_branches: comma separated trios of moodle branch, id for "Pull XXXX Branch" custom field and php version.
# Trios are colon separated, example: master:customfield_10111:7.3,....). All them required.
# Trios are colon separated, example: main:customfield_10111:7.3,....). All them required.
#criteria: "awaiting integration"...
#schedulemins: Frecuency (in minutes) of the schedule (cron) of this job. IMPORTANT to ensure that they match or there will be issues processed more than once or skipped.
#jobtype: defaulting to "all", allows to just pick one of the available jobs: phpunit, behat-(firefox|chrome|nonjs|all).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ ${jenkinsreq} "DEV.01 - Developer-requested Behat" \
-w >> "${resultfile}.jenkinscli" < /dev/null

# We want to launch a Behat (Firefox (js) - classic) job
# only if the target branch is master.
if [[ ${target} == "master" ]]; then
# only if the target branch is main.
if [[ ${target} == "main" ]]; then
echo -n "Behat (Firefox - classic): " >> "${resultfile}.jenkinscli"
${jenkinsreq} "DEV.01 - Developer-requested Behat" \
-p REPOSITORY=${repository} \
Expand All @@ -50,8 +50,8 @@ if [[ ${target} == "master" ]]; then
fi

# We want to launch a Behat (latest-test, @app only) job
# only if the target branch is master.
if [[ ${target} == "master" ]]; then
# only if the target branch is main.
if [[ ${target} == "main" ]]; then
echo -n "App tests (stable app version): " >> "${resultfile}.jenkinscli"
${jenkinsreq} "DEV.01 - Developer-requested Behat" \
-p REPOSITORY=${repository} \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ ${jenkinsreq} "DEV.01 - Developer-requested Behat" \
-w >> "${resultfile}.jenkinscli" < /dev/null

# We want to launch a Behat (Firefox (js) - classic) job
# only if the target branch is master.
if [[ ${target} == "master" ]]; then
# only if the target branch is main.
if [[ ${target} == "main" ]]; then
echo -n "Behat (Firefox - classic): " >> "${resultfile}.jenkinscli"
${jenkinsreq} "DEV.01 - Developer-requested Behat" \
-p REPOSITORY=${repository} \
Expand All @@ -50,8 +50,8 @@ if [[ ${target} == "master" ]]; then
fi

# We want to launch a Behat (latest-test, @app only) job
# only if the target branch is master.
if [[ ${target} == "master" ]]; then
# only if the target branch is main.
if [[ ${target} == "main" ]]; then
echo -n "App tests (stable app version): " >> "${resultfile}.jenkinscli"
${jenkinsreq} "DEV.01 - Developer-requested Behat" \
-p REPOSITORY=${repository} \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -162,10 +162,10 @@ if [[ "${jobtype}" == "all" ]] || [[ "${jobtype}" == "behat-all" ]] || [[ "${job
fi

# We want to launch a Behat (latest-test, @app only) job
# only if the target branch is master.
# only if the target branch is main.
if [[ "${jobtype}" == "all" ]] || [[ "${jobtype}" == "behat-all" ]] || [[ "${jobtype}" == "behat-app" ]]; then
# Only for master or when behat-app is explicitly asked.
if [[ ${target} == "master" ]] || [[ "${jobtype}" == "behat-app" ]]; then
# Only for main or when behat-app is explicitly asked.
if [[ ${target} == "main" ]] || [[ "${jobtype}" == "behat-app" ]]; then
echo -n "App tests (stable app version) / ${behat_options}): " >> "${resultfile}.jenkinscli"
# These are the default tags for any app run.
final_tags="@app&&~@performance&&~@local_behatsnapshots&&~@ci_jenkins_skip"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,10 @@ if [[ "${jobtype}" == "all" ]] || [[ "${jobtype}" == "behat-all" ]] || [[ "${job
fi

# We want to launch a Behat (latest-test, @app only) job
# only if the target branch is master.
# only if the target branch is main.
if [[ "${jobtype}" == "all" ]] || [[ "${jobtype}" == "behat-all" ]] || [[ "${jobtype}" == "behat-app" ]]; then
# Only for master or when behat-app is explicitly asked.
if [[ ${target} == "master" ]] || [[ "${jobtype}" == "behat-app" ]]; then
# Only for main or when behat-app is explicitly asked.
if [[ ${target} == "main" ]] || [[ "${jobtype}" == "behat-app" ]]; then
echo -n "App tests (stable app version): " >> "${resultfile}.jenkinscli"
${jenkinsreq} "SDEV.01 - Developer-requested Behat" \
-p REPOSITORY=${repository} \
Expand Down

0 comments on commit 23de098

Please sign in to comment.