Skip to content

Commit

Permalink
dprr: Clean up language and hotfix the centos image (projectatomic#416)
Browse files Browse the repository at this point in the history
The `name` of the first task in this role wasn't accurate once we
started pulling more images from other registries.  This makes the
language a bit more generic.

Additionally, the r.c.o/centos image recently started to fail and this
was causing all the sanity tests to fail.  Switch the image to use
r.c.o/centos/centos as a hotfix.
  • Loading branch information
Micah Abbott authored and mike-nguyen committed Jun 20, 2018
1 parent 4ffadb4 commit 881a66c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions roles/docker_pull_run_remove/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,23 @@
#
# popular_images is defined in roles/docker_pull_run_remove/vars/main.yml
#
- name: Pull the popular images from Docker Hub
- name: Pull the popular container images
command: "docker pull {{ item }}"
with_items: "{{ popular_images }}"
register: dpd
retries: 5
delay: 60
until: dpd|success

- name: Run the popular images
- name: Run the popular container images
command: "docker run --rm {{ item }} echo 'hello'"
with_items: "{{ popular_images }}"

# Test for https://bugzilla.redhat.com/show_bug.cgi?id=1585735
- name: Run the popular images with cpu-shares flag
- name: Run the popular container images with cpu-shares flag
command: "docker run --cpu-shares 2 --rm {{ item }} echo 'hello'"
with_items: "{{ popular_images }}"

- name: Remove the popular images
- name: Remove the popular container images
command: "docker rmi {{ item }}"
with_items: "{{ popular_images }}"
2 changes: 1 addition & 1 deletion roles/docker_pull_run_remove/vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ popular_images:
- docker.io/busybox
- docker.io/ubuntu
- registry.fedoraproject.org/fedora
- registry.centos.org/centos
- registry.centos.org/centos/centos
- registry.access.redhat.com/rhel

0 comments on commit 881a66c

Please sign in to comment.