Skip to content
Snippets Groups Projects
Commit e57f8994 authored by Simon McVittie's avatar Simon McVittie
Browse files

CI: Run all jobs on suitably featureful runners

parent ccba3950
No related branches found
No related tags found
No related merge requests found
...@@ -83,6 +83,13 @@ variables: ...@@ -83,6 +83,13 @@ variables:
# Create a File variable with a private key authorized for P_V_CI_UPLOAD_USER # Create a File variable with a private key authorized for P_V_CI_UPLOAD_USER
PRESSURE_VESSEL_CI_UPLOAD_SSH_PRIVATE_KEY_FILE: '' PRESSURE_VESSEL_CI_UPLOAD_SSH_PRIVATE_KEY_FILE: ''
default:
tags:
- docker
- internal
- linux
- x86_64
workflow: workflow:
rules: rules:
- if: '$CI_PIPELINE_SOURCE == "merge_request_event"' - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
...@@ -150,9 +157,6 @@ package:sniper: ...@@ -150,9 +157,6 @@ package:sniper:
build:devel: build:devel:
stage: build stage: build
tags:
- docker
- linux
rules: rules:
- if: '$DEVEL_DOCKER_REGISTRY != "" && $DEVEL_DOCKER_IMAGE != ""' - if: '$DEVEL_DOCKER_REGISTRY != "" && $DEVEL_DOCKER_IMAGE != ""'
image: "${DEVEL_DOCKER_REGISTRY}/${DEVEL_DOCKER_IMAGE}" image: "${DEVEL_DOCKER_REGISTRY}/${DEVEL_DOCKER_IMAGE}"
...@@ -180,9 +184,6 @@ build:devel: ...@@ -180,9 +184,6 @@ build:devel:
build:clang: build:clang:
stage: build stage: build
tags:
- docker
- linux
rules: rules:
- if: '$DEVEL_DOCKER_REGISTRY != "" && $DEVEL_DOCKER_IMAGE != ""' - if: '$DEVEL_DOCKER_REGISTRY != "" && $DEVEL_DOCKER_IMAGE != ""'
image: "${DEVEL_DOCKER_REGISTRY}/${DEVEL_DOCKER_IMAGE}" image: "${DEVEL_DOCKER_REGISTRY}/${DEVEL_DOCKER_IMAGE}"
...@@ -259,9 +260,6 @@ relocatable-install:i386: ...@@ -259,9 +260,6 @@ relocatable-install:i386:
stage: relocatable-install stage: relocatable-install
needs: needs:
- package:i386 - package:i386
tags:
- docker
- linux
image: "${SCOUT_DOCKER_REGISTRY}/${SCOUT_I386_DOCKER_IMAGE}" image: "${SCOUT_DOCKER_REGISTRY}/${SCOUT_I386_DOCKER_IMAGE}"
script: script:
- *prepare_scout - *prepare_scout
...@@ -300,9 +298,6 @@ relocatable-install:production: ...@@ -300,9 +298,6 @@ relocatable-install:production:
needs: needs:
- package - package
- package:i386 - package:i386
tags:
- docker
- linux
image: "${SCOUT_DOCKER_REGISTRY}/${SCOUT_DOCKER_IMAGE}" image: "${SCOUT_DOCKER_REGISTRY}/${SCOUT_DOCKER_IMAGE}"
script: script:
- *prepare_scout - *prepare_scout
...@@ -361,9 +356,6 @@ relocatable-install:production: ...@@ -361,9 +356,6 @@ relocatable-install:production:
needs: needs:
- relocatable-install:production - relocatable-install:production
stage: test stage: test
tags:
- docker
- linux
variables: variables:
STEAM_CI_DEPENDENCIES: >- STEAM_CI_DEPENDENCIES: >-
libgl1-mesa-dri libgl1-mesa-dri
...@@ -487,9 +479,6 @@ autopkgtest: ...@@ -487,9 +479,6 @@ autopkgtest:
deploy: deploy:
stage: deploy stage: deploy
tags:
- docker
- linux
needs: needs:
- package - package
- package:i386 - package:i386
...@@ -553,9 +542,6 @@ deploy: ...@@ -553,9 +542,6 @@ deploy:
reuse: reuse:
stage: test stage: test
tags:
- docker
- linux
needs: [] needs: []
image: image:
name: fsfe/reuse:latest name: fsfe/reuse:latest
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment