Skip to content
Snippets Groups Projects
Commit 2fa292c4 authored by Alexander Olofsson's avatar Alexander Olofsson
Browse files

Merge branch 'pdk-fixes' into 'master'

Roll back to 3.2.0.0 image, .1 is broken

See merge request puppet-infra/shared-ci-piplines!77
parents a0aed33e 2d91676d
Branches
Tags
No related merge requests found
Pipeline #130059 passed
...@@ -17,8 +17,8 @@ variables: ...@@ -17,8 +17,8 @@ variables:
pdk-validate: pdk-validate:
stage: puppet stage: puppet
image: image: &PDK
name: puppet/pdk:3.2.0.1 name: puppet/pdk:3.2.0.0
pull_policy: if-not-present pull_policy: if-not-present
before_script: &pdk-workaround before_script: &pdk-workaround
- | - |
...@@ -91,9 +91,7 @@ pdk-validate: ...@@ -91,9 +91,7 @@ pdk-validate:
pdk-test-unit: pdk-test-unit:
stage: puppet stage: puppet
image: image: *PDK
name: puppet/pdk:3.2.0.1
pull_policy: if-not-present
before_script: *pdk-workaround before_script: *pdk-workaround
script: script:
- sed -i "s|git@gitlab.it.liu.se:|https://gitlab+deploy-token-30:$gitlab_deploy_token_30@gitlab.it.liu.se/|g" .fixtures.yml - sed -i "s|git@gitlab.it.liu.se:|https://gitlab+deploy-token-30:$gitlab_deploy_token_30@gitlab.it.liu.se/|g" .fixtures.yml
...@@ -141,9 +139,7 @@ pdk-test-unit: ...@@ -141,9 +139,7 @@ pdk-test-unit:
puppet-strings: puppet-strings:
stage: deploy stage: deploy
image: image: *PDK
name: puppet/pdk:3.2.0.1
pull_policy: if-not-present
before_script: *pdk-workaround before_script: *pdk-workaround
script: script:
- pdk bundle exec rake strings:generate:reference - pdk bundle exec rake strings:generate:reference
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment