Skip to content

Commit 35477a0

Browse files
Remove behat
1 parent 0b2d9a4 commit 35477a0

16 files changed

+1353
-5587
lines changed

.ci/.github/workflows/build_deploy_and_test.yml

+1-100
Original file line numberDiff line numberDiff line change
@@ -237,113 +237,14 @@ jobs:
237237
source $BASH_ENV
238238
./.ci/deploy/pantheon/dev-multidev
239239
240-
behat_test:
241-
container:
242-
image: quay.io/pantheon-public/build-tools-ci:6.x
243-
options: --user root
244-
runs-on: ubuntu-latest
245-
continue-on-error: true
246-
needs: [deploy_to_pantheon]
247-
steps:
248-
- name: Checkout
249-
uses: actions/checkout@v2
250-
251-
- name: Cache bash_env.txt
252-
uses: actions/cache@v2
253-
env:
254-
cache-name: cache-bash-env
255-
with:
256-
path: bash_env.txt
257-
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ github.run_number }}
258-
restore-keys: |
259-
${{ runner.os }}-build-${{ env.cache-name }}-
260-
${{ runner.os }}-build-
261-
${{ runner.os }}-
262-
263-
- name: Cache composer cache
264-
uses: actions/cache@v2
265-
env:
266-
cache-name: cache-composer-cache
267-
with:
268-
path: ~/.composer/cache
269-
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('composer.lock') }}
270-
restore-keys: |
271-
${{ runner.os }}-build-${{ env.cache-name }}-
272-
${{ runner.os }}-build-
273-
${{ runner.os }}-
274-
275-
- name: Cache vendor folder
276-
uses: actions/cache@v2
277-
env:
278-
cache-name: cache-vendor
279-
with:
280-
path: ./vendor
281-
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('composer.lock') }}
282-
283-
- name: Cache web folder
284-
uses: actions/cache@v2
285-
env:
286-
cache-name: cache-web
287-
with:
288-
path: ./web
289-
key: ${{ runner.os }}-build-${{ env.cache-name }}
290-
291-
- name: Cache drush folder
292-
uses: actions/cache@v2
293-
env:
294-
cache-name: cache-drush
295-
with:
296-
path: ./drush
297-
key: ${{ runner.os }}-build-${{ env.cache-name }}
298-
299-
# Set TERMINUS_ENV and related environment variables.
300-
# https://github.com/pantheon-systems/docker-build-tools-ci/blob/6.x/scripts/set-environment
301-
- name: setup-environment-vars
302-
run: /build-tools-ci/scripts/set-environment
303-
304-
# Uncomment line 26 in .ci/test/behat/initialize to create a backup
305-
# prior to running Behat tests. This is useful to reset the multidev
306-
# environment to the previous state after Behat tests have run.
307-
- name: prepare for Behat testing
308-
run: |
309-
echo "$SSH_PRIVATE_KEY" > ../private.key
310-
chmod 600 ../private.key
311-
eval `ssh-agent -s`
312-
ssh-add ../private.key
313-
source $BASH_ENV
314-
./.ci/test/behat/initialize
315-
316-
- name: run acceptance tests with Behat
317-
run: |
318-
eval `ssh-agent -s`
319-
ssh-add ../private.key
320-
./.ci/test/behat/run
321-
322-
# Uncomment line 13 in .ci/test/behat/cleanup to restore a backup
323-
# after running Behat tests. This is useful to reset the multidev
324-
# environment to the previous state after Behat tests have run.
325-
- name: clean up after Behat
326-
if: ${{ always() }}
327-
run: |
328-
eval `ssh-agent -s`
329-
ssh-add ../private.key
330-
source $BASH_ENV
331-
./.ci/test/behat/cleanup
332-
333-
- name: Upload artifacts
334-
if: ${{ always() }}
335-
uses: actions/upload-artifact@v2
336-
with:
337-
name: behat-report
338-
path: /tmp/artifacts
339240
340241
visual_regression_test:
341242
container:
342243
image: backstopjs/backstopjs:5.3.2
343244
options: --user root
344245
runs-on: ubuntu-latest
345246
if: ${{ github.ref != 'refs/heads/master' }}
346-
needs: [configure_env_vars, behat_test]
247+
needs: [configure_env_vars]
347248
steps:
348249
- name: Update git version
349250
run: |

.ci/test/behat/cleanup

-44
This file was deleted.

.ci/test/behat/initialize

-38
This file was deleted.

.ci/test/behat/run

-35
This file was deleted.

.circleci/config.yml

+3-45
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,17 @@ defaults: &defaults
2020
# ADMIN_EMAIL: The email address to give the admin when installing.
2121
#=========================================================================
2222
TZ: "/usr/share/zoneinfo/America/Los_Angeles"
23-
23+
2424
# The variables below usually do not need to be modified.
25-
25+
2626
#======================================================================================================================================
2727
# Circle CI 2.0 does not yet expand environment variables so they have to be manually EXPORTed
2828
# Once environment variables can be expanded the variables below can be uncommented and the EXPORTs in set-up-globals.sh can be removed
2929
# See: https://discuss.circleci.com/t/unclear-how-to-work-with-user-variables-circleci-provided-env-variables/12810/11
3030
# See: https://discuss.circleci.com/t/environment-variable-expansion-in-working-directory/11322
3131
# See: https://discuss.circleci.com/t/circle-2-0-global-environment-variables/8681
3232
#======================================================================================================================================
33-
33+
3434
NOTIFY: 'scripts/github/add-commit-comment {project} {sha} "Created multidev environment [{site}#{env}]({dashboard-url})." {site-url}'
3535
ADMIN_USERNAME: admin
3636
TERM: dumb
@@ -143,44 +143,6 @@ jobs:
143143
name: deploy to Pantheon
144144
command: ./.ci/deploy/pantheon/dev-multidev
145145

146-
behat_test:
147-
<<: *defaults
148-
steps:
149-
- checkout
150-
151-
- restore_cache:
152-
keys:
153-
- composer-cache-{{ checksum "composer.lock" }}
154-
- composer-cache-
155-
156-
- run:
157-
# Set TERMINUS_ENV and related environment variables.
158-
# https://github.com/pantheon-systems/docker-build-tools-ci/blob/6.x/scripts/set-environment
159-
name: setup-environment-vars
160-
command: /build-tools-ci/scripts/set-environment
161-
162-
- run:
163-
name: prepare for Behat testing
164-
command: ./.ci/test/behat/initialize
165-
166-
- run:
167-
name: run acceptance tests with Behat
168-
command: ./.ci/test/behat/run
169-
170-
- run:
171-
name: clean up after Behat
172-
command: ./.ci/test/behat/cleanup
173-
when: always
174-
175-
- save_cache:
176-
key: composer-cache-{{ checksum "composer.lock" }}
177-
paths:
178-
- $HOME/.composer/cache
179-
180-
- store_artifacts:
181-
path: /tmp/artifacts
182-
destination: artifacts
183-
184146
visual_regression_test:
185147
<<: *defaults
186148
docker:
@@ -244,10 +206,6 @@ workflows:
244206
branches:
245207
ignore:
246208
- master
247-
- behat_test:
248-
requires:
249-
- deploy_to_pantheon
250-
- visual_regression_test
251209

252210
#scheduled_update_check:
253211
# triggers:

.gitlab-ci.yml

+1-34
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ stages:
2020
- configure-and-build
2121
- deploy
2222
- visual-test
23-
- behat-test
2423
- cleanup
2524
- updates
2625

@@ -95,7 +94,7 @@ deploy:pantheon:
9594

9695
test:visual-regression:
9796
stage: visual-test
98-
image:
97+
image:
9998
name: backstopjs/backstopjs:4.1.9
10099
entrypoint: [""]
101100
variables:
@@ -121,38 +120,6 @@ test:visual-regression:
121120
except:
122121
- schedules
123122

124-
test:behat:
125-
stage: behat-test
126-
script:
127-
- ./.ci/test/behat/initialize
128-
# Start headless Chrome
129-
- google-chrome --disable-gpu --headless --remote-debugging-address=0.0.0.0 --remote-debugging-port=9222 --no-sandbox </dev/null &>/dev/null &
130-
- ./.ci/test/behat/run
131-
artifacts:
132-
paths:
133-
- behat-screenshots
134-
dependencies:
135-
- deploy:pantheon
136-
- test:visual-regression
137-
only:
138-
- merge_requests
139-
- master
140-
except:
141-
- schedules
142-
143-
test:behat:cleanup:
144-
stage: cleanup
145-
when: always
146-
script:
147-
- ./.ci/test/behat/cleanup
148-
only:
149-
- merge_requests
150-
- master
151-
except:
152-
- schedules
153-
dependencies:
154-
- test:behat
155-
156123
schedule:composer:update:
157124
stage: updates
158125
script:

0 commit comments

Comments
 (0)