Skip to content

Commit 9e3dfd2

Browse files
lamezelameze
authored
Merge pull request #336 from moodlehq/revert-335-behat_init_args
Revert "Add support for BEHAT_INIT_ARGS parameter"
2 parents 86ee115 + b1ef04d commit 9e3dfd2

File tree

5 files changed

+0
-20
lines changed
  • tracker_automations/bulk_prelaunch_jobs/criteria

5 files changed

+0
-20
lines changed

‎tracker_automations/bulk_prelaunch_jobs/criteria/awaiting_component_lead_review/jobs.sh

-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ ${jenkinsreq} "DEV.01 - Developer-requested Behat" \
2323
-p PHPVERSION=${php_version} \
2424
-p BROWSER="BrowserKit (non-js)" \
2525
-p BEHAT_SUITE=ALL \
26-
-p BEHAT_INIT_ARGS="${behat_init_args}" \
2726
-w >> "${resultfile}.jenkinscli" < /dev/null
2827

2928
# We want to launch always a Behat (Firefox (js) - boost) job
@@ -34,7 +33,6 @@ ${jenkinsreq} "DEV.01 - Developer-requested Behat" \
3433
-p DATABASE=pgsql \
3534
-p PHPVERSION=${php_version} \
3635
-p BROWSER="Firefox (js)" \
37-
-p BEHAT_INIT_ARGS="${behat_init_args}" \
3836
-w >> "${resultfile}.jenkinscli" < /dev/null
3937

4038
# We want to launch a Behat (Firefox (js) - classic) job
@@ -48,7 +46,6 @@ if [[ ${target} == "main" ]]; then
4846
-p PHPVERSION=${php_version} \
4947
-p BROWSER="Firefox (js)" \
5048
-p BEHAT_SUITE=classic \
51-
-p BEHAT_INIT_ARGS="${behat_init_args}" \
5249
-w >> "${resultfile}.jenkinscli" < /dev/null
5350
fi
5451

‎tracker_automations/bulk_prelaunch_jobs/criteria/awaiting_integration/jobs.sh

-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ ${jenkinsreq} "DEV.01 - Developer-requested Behat" \
2323
-p PHPVERSION=${php_version} \
2424
-p BROWSER="BrowserKit (non-js)" \
2525
-p BEHAT_SUITE=ALL \
26-
-p BEHAT_INIT_ARGS="${behat_init_args}" \
2726
-w >> "${resultfile}.jenkinscli" < /dev/null
2827

2928
# We want to launch always a Behat (Firefox (js) - boost) job
@@ -34,7 +33,6 @@ ${jenkinsreq} "DEV.01 - Developer-requested Behat" \
3433
-p DATABASE=pgsql \
3534
-p PHPVERSION=${php_version} \
3635
-p BROWSER="Firefox (js)" \
37-
-p BEHAT_INIT_ARGS="${behat_init_args}" \
3836
-w >> "${resultfile}.jenkinscli" < /dev/null
3937

4038
# We want to launch a Behat (Firefox (js) - classic) job
@@ -48,7 +46,6 @@ if [[ ${target} == "main" ]]; then
4846
-p PHPVERSION=${php_version} \
4947
-p BROWSER="Firefox (js)" \
5048
-p BEHAT_SUITE=classic \
51-
-p BEHAT_INIT_ARGS="${behat_init_args}" \
5249
-w >> "${resultfile}.jenkinscli" < /dev/null
5350
fi
5451

‎tracker_automations/bulk_prelaunch_jobs/criteria/list_of_mdls/jobs.sh

-6
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ if [[ "${jobtype}" == "all" ]] || [[ "${jobtype}" == "behat-all" ]] || [[ "${job
7676
-p BEHAT_SUITE=ALL \
7777
-p BEHAT_TAGS="${final_tags}" \
7878
-p BEHAT_NAME="${behat_name}" \
79-
-p BEHAT_INIT_ARGS="${behat_init_args}" \
8079
-p RUNNERVERSION=${runner} \
8180
-w >> "${resultfile}.jenkinscli" < /dev/null
8281
fi
@@ -97,7 +96,6 @@ if [[ "${jobtype}" == "behat-chrome" ]]; then
9796
-p BROWSER="Chrome (js)" \
9897
-p BEHAT_TAGS="${final_tags}" \
9998
-p BEHAT_NAME="${behat_name}" \
100-
-p BEHAT_INIT_ARGS="${behat_init_args}" \
10199
-p RUNNERVERSION=${runner} \
102100
-w >> "${resultfile}.jenkinscli" < /dev/null
103101
fi
@@ -119,7 +117,6 @@ if [[ "${jobtype}" == "behat-chrome" ]]; then
119117
-p BEHAT_SUITE=classic \
120118
-p BEHAT_TAGS="${final_tags}" \
121119
-p BEHAT_NAME="${behat_name}" \
122-
-p BEHAT_INIT_ARGS="${behat_init_args}" \
123120
-p RUNNERVERSION=${runner} \
124121
-w >> "${resultfile}.jenkinscli" < /dev/null
125122
fi
@@ -140,7 +137,6 @@ if [[ "${jobtype}" == "all" ]] || [[ "${jobtype}" == "behat-all" ]] || [[ "${job
140137
-p BROWSER="Firefox (js)" \
141138
-p BEHAT_TAGS="${final_tags}" \
142139
-p BEHAT_NAME="${behat_name}" \
143-
-p BEHAT_INIT_ARGS="${behat_init_args}" \
144140
-p RUNNERVERSION=${runner} \
145141
-w >> "${resultfile}.jenkinscli" < /dev/null
146142
fi
@@ -162,7 +158,6 @@ if [[ "${jobtype}" == "all" ]] || [[ "${jobtype}" == "behat-all" ]] || [[ "${job
162158
-p BEHAT_SUITE=classic \
163159
-p BEHAT_TAGS="${final_tags}" \
164160
-p BEHAT_NAME="${behat_name}" \
165-
-p BEHAT_INIT_ARGS="${behat_init_args}" \
166161
-p RUNNERVERSION=${runner} \
167162
-w >> "${resultfile}.jenkinscli" < /dev/null
168163
fi
@@ -190,7 +185,6 @@ if [[ "${jobtype}" == "all" ]] || [[ "${jobtype}" == "behat-all" ]] || [[ "${job
190185
-p INSTALL_PLUGINAPP=ci \
191186
-p BEHAT_TAGS="${final_tags}" \
192187
-p BEHAT_NAME="${behat_name}" \
193-
-p BEHAT_INIT_ARGS="${behat_init_args}" \
194188
-p RUNNERVERSION=${runner} \
195189
-w >> "${resultfile}.jenkinscli" < /dev/null
196190
fi

‎tracker_automations/bulk_prelaunch_jobs/criteria/list_of_mdls_sdev/jobs.sh

-5
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ if [[ "${jobtype}" == "all" ]] || [[ "${jobtype}" == "behat-all" ]] || [[ "${job
3030
-p PHPVERSION=${php_version} \
3131
-p BROWSER="BrowserKit (non-js)" \
3232
-p BEHAT_SUITE=ALL \
33-
-p BEHAT_INIT_ARGS="${behat_init_args}" \
3433
-p RUNNERVERSION=${runner} \
3534
-w >> "${resultfile}.jenkinscli" < /dev/null
3635
fi
@@ -44,7 +43,6 @@ if [[ "${jobtype}" == "behat-chrome" ]]; then
4443
-p DATABASE=pgsql \
4544
-p PHPVERSION=${php_version} \
4645
-p BROWSER="Chrome (js)" \
47-
-p BEHAT_INIT_ARGS="${behat_init_args}" \
4846
-p RUNNERVERSION=${runner} \
4947
-w >> "${resultfile}.jenkinscli" < /dev/null
5048
fi
@@ -59,7 +57,6 @@ if [[ "${jobtype}" == "behat-chrome" ]]; then
5957
-p PHPVERSION=${php_version} \
6058
-p BROWSER="Chrome (js)" \
6159
-p BEHAT_SUITE=classic \
62-
-p BEHAT_INIT_ARGS="${behat_init_args}" \
6360
-p RUNNERVERSION=${runner} \
6461
-w >> "${resultfile}.jenkinscli" < /dev/null
6562

@@ -72,7 +69,6 @@ if [[ "${jobtype}" == "all" ]] || [[ "${jobtype}" == "behat-all" ]] || [[ "${job
7269
-p DATABASE=pgsql \
7370
-p PHPVERSION=${php_version} \
7471
-p BROWSER="Firefox (js)" \
75-
-p BEHAT_INIT_ARGS="${behat_init_args}" \
7672
-p RUNNERVERSION=${runner} \
7773
-w >> "${resultfile}.jenkinscli" < /dev/null
7874
fi
@@ -87,7 +83,6 @@ if [[ "${jobtype}" == "all" ]] || [[ "${jobtype}" == "behat-all" ]] || [[ "${job
8783
-p PHPVERSION=${php_version} \
8884
-p BROWSER="Firefox (js)" \
8985
-p BEHAT_SUITE=classic \
90-
-p BEHAT_INIT_ARGS="${behat_init_args}" \
9186
-p RUNNERVERSION=${runner} \
9287
-w >> "${resultfile}.jenkinscli" < /dev/null
9388
fi

‎tracker_automations/bulk_prelaunch_jobs/criteria/multi_database/jobs.sh

-3
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@ if [[ "${jobtype}" == "behat-nonjs" ]]; then
118118
-p BEHAT_SUITE=ALL \
119119
-p BEHAT_TAGS="${final_tags}" \
120120
-p BEHAT_NAME="${behat_name}" \
121-
-p BEHAT_INIT_ARGS="${behat_init_args}" \
122121
-p RUNNERVERSION=${runner} \
123122
-w >> "${resultfile}.jenkinscli" < /dev/null
124123
done
@@ -145,7 +144,6 @@ if [[ "${jobtype}" == "behat-chrome" ]]; then
145144
-p BEHAT_SUITE=default \
146145
-p BEHAT_TAGS="${final_tags}" \
147146
-p BEHAT_NAME="${behat_name}" \
148-
-p BEHAT_INIT_ARGS="${behat_init_args}" \
149147
-p RUNNERVERSION=${runner} \
150148
-w >> "${resultfile}.jenkinscli" < /dev/null
151149
done
@@ -172,7 +170,6 @@ if [[ "${jobtype}" == "behat-firefox" ]]; then
172170
-p BEHAT_SUITE=default \
173171
-p BEHAT_TAGS="${final_tags}" \
174172
-p BEHAT_NAME="${behat_name}" \
175-
-p BEHAT_INIT_ARGS="${behat_init_args}" \
176173
-p RUNNERVERSION=${runner} \
177174
-w >> "${resultfile}.jenkinscli" < /dev/null
178175
done

0 commit comments

Comments
 (0)