Skip to content

Commit 23ae027

Browse files
committed
ci(kitchen+travis): test fixed pre-salted images
1 parent 32b928a commit 23ae027

File tree

2 files changed

+22
-16
lines changed

2 files changed

+22
-16
lines changed

Diff for: .travis.yml

+20-16
Original file line numberDiff line numberDiff line change
@@ -13,28 +13,32 @@ services:
1313

1414
before_install:
1515
- bundle install
16+
# - sed -i -e 's:RUN zypper install -y sudo openssh which curl:WORKDIR /etc/zypp/repos.d\n RUN for f in *; do sed -i "s#download.opensuse.org#mirror.23media.com/opensuse#g" $f; done\n &:' /home/travis/.rvm/gems/ruby-2.4.1/gems/kitchen-docker-2.9.0/lib/kitchen/driver/docker.rb
17+
- sed -i -e 's:RUN zypper install -y sudo openssh which curl:WORKDIR /etc/zypp/repos.d\n RUN for f in *; do sed -i "s#download.opensuse.org#provo-mirror.opensuse.org#g" $f; done\n &:' /home/travis/.rvm/gems/ruby-2.4.1/gems/kitchen-docker-2.9.0/lib/kitchen/driver/docker.rb
18+
# - sed -i -e 's:RUN zypper install -y sudo openssh which curl:RUN grep -rl "opensuse.org" /etc/zypp/ | xargs -d \\n sed -i -e "s_\w\+\(.opensuse.org\)_provo-mirror\1_"\n &:' /home/travis/.rvm/gems/ruby-2.4.1/gems/kitchen-docker-2.9.0/lib/kitchen/driver/docker.rb
19+
# - grep -rl "opensuse.org" /etc/zypp/ | xargs -d \\n sed -i -e 's_\w\+\(.opensuse.org\)_provo-mirror\1_'
1620

1721
# Make sure the instances listed below match up with
1822
# the `platforms` defined in `kitchen.yml`
1923
env:
2024
matrix:
21-
- INSTANCE: default-debian-9-2019-2-py3
22-
- INSTANCE: default-ubuntu-1804-2019-2-py3
23-
- INSTANCE: default-centos-7-2019-2-py3
24-
- INSTANCE: default-fedora-29-2019-2-py3
25-
- INSTANCE: default-opensuse-leap-15-2019-2-py3
26-
- INSTANCE: default-debian-9-2018-3-py2
27-
- INSTANCE: default-ubuntu-1604-2018-3-py2
28-
- INSTANCE: default-centos-7-2018-3-py2
29-
- INSTANCE: default-fedora-29-2018-3-py2
30-
# TODO: Use this when fixed instead of `opensuse-423`
31-
- INSTANCE: default-opensuse-leap-15-2018-3-py2
25+
# - INSTANCE: default-debian-9-2019-2-py3
26+
# # - INSTANCE: default-ubuntu-1804-2019-2-py3
27+
# - INSTANCE: default-centos-7-2019-2-py3
28+
# - INSTANCE: default-fedora-29-2019-2-py3
29+
# - INSTANCE: default-opensuse-leap-15-2019-2-py3
30+
# - INSTANCE: default-debian-9-2018-3-py2
31+
# - INSTANCE: default-ubuntu-1604-2018-3-py2
32+
# - INSTANCE: default-centos-7-2018-3-py2
33+
# - INSTANCE: default-fedora-29-2018-3-py2
34+
# # TODO: Use this when fixed instead of `opensuse-423`
35+
# # - INSTANCE: default-opensuse-leap-15-2018-3-py2
3236
- INSTANCE: default-opensuse-423-2018-3-py2
33-
- INSTANCE: default-debian-8-2017-7-py2
34-
- INSTANCE: default-ubuntu-1604-2017-7-py2
35-
- INSTANCE: default-centos-6-2017-7-py2
36-
- INSTANCE: default-fedora-28-2017-7-py2
37-
- INSTANCE: default-opensuse-leap-42-2017-7-py2
37+
# - INSTANCE: default-debian-8-2017-7-py2
38+
# - INSTANCE: default-ubuntu-1604-2017-7-py2
39+
# - INSTANCE: default-centos-6-2017-7-py2
40+
# - INSTANCE: default-fedora-28-2017-7-py2
41+
# - INSTANCE: default-opensuse-leap-42-2017-7-py2
3842

3943
script:
4044
- bundle exec kitchen verify ${INSTANCE}

Diff for: kitchen.yml

+2
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,8 @@ platforms:
7171
- name: opensuse-leap-42-2017-7-py2
7272
driver:
7373
image: netmanagers/salt-2017.7-py2:opensuse-leap-42
74+
provision_command:
75+
- zypper refresh && zypper install -y python-pip
7476
run_command: /usr/lib/systemd/systemd
7577

7678
provisioner:

0 commit comments

Comments
 (0)