Skip to content

Commit

Permalink
Test oracle
Browse files Browse the repository at this point in the history
  • Loading branch information
floryut committed Jul 5, 2021
1 parent 9ea28c4 commit 8eb2f61
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .gitlab-ci/packet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ packet_centos7-multus-calico:
when: on_success

packet_oracle7-canal-ha:
stage: deploy-part1
stage: unit-tests
extends: .packet_pr
when: on_success

Expand Down
6 changes: 6 additions & 0 deletions roles/container-engine/docker/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -120,11 +120,17 @@
retries: 4
delay: "{{ retry_stagger | d(3) }}"
notify: restart docker
ignore_errors: true
when:
- not ansible_os_family in ["Flatcar Container Linux by Kinvolk"]
- not is_ostree
- docker_package_info.pkgs|length > 0

- name: Pause for 5 minutes to build app cache
pause:
minutes: 60


# This is required to ensure any apt upgrade will not break kubernetes
- name: Tell Debian hosts not to change the docker version with apt upgrade
dpkg_selections:
Expand Down

0 comments on commit 8eb2f61

Please sign in to comment.