Skip to content

Commit 230d838

Browse files
author
mcdonnnj
committed
# Conflicts: # molecule/default/requirements.yml
2 parents 0d3c353 + 425d78e commit 230d838

File tree

3 files changed

+12
-1
lines changed

3 files changed

+12
-1
lines changed

molecule/default/requirements.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,14 @@ collections:
88
version: ">=3.10.2"
99

1010
roles:
11+
<<<<<<< HEAD
1112
- name: pip
1213
src: https://github.com/cisagov/ansible-role-pip
1314
- name: python
1415
src: https://github.com/cisagov/ansible-role-python
16+
=======
17+
- name: debian_archive
18+
src: https://github.com/cisagov/ansible-role-debian-archive
19+
>>>>>>> 425d78ead7b2d2c3dfeb425b825131d8738913f3
1520
- name: upgrade
1621
src: https://github.com/cisagov/ansible-role-upgrade

molecule/default/upgrade.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@
44
become: true
55
become_method: ansible.builtin.sudo
66
tasks:
7+
- name: >
8+
Switch Debian platforms that are no longer supported to Debian
9+
Archive package repositories
10+
ansible.builtin.include_role:
11+
name: debian_archive
12+
713
- name: Upgrade system packages
814
ansible.builtin.include_role:
915
name: upgrade

version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.0.0
1+
2.1.0

0 commit comments

Comments
 (0)