Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ansible: update point releases and unify build #40277

Merged
merged 2 commits into from May 12, 2018
Merged

Conversation

peterhoeg
Copy link
Member

@peterhoeg peterhoeg commented May 10, 2018

Motivation for this change
  1. We had lots of copy paste - instead use a generic builder for the various versions.

  2. Default version changed to latest (2.5 instead of 2.4) - ref Update default attributes to latest version available #40015

  3. Point release updates for all versions

Cc: @jgeerds @joamaki

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: ansible

Partial log (click to expand)

wrapping `/nix/store/gq8v591q5my51192v6rdwllmbx7k3619-python3.6-ansible-2.5.2/bin/ansible-config'...
wrapping `/nix/store/gq8v591q5my51192v6rdwllmbx7k3619-python3.6-ansible-2.5.2/bin/ansible-inventory'...
wrapping `/nix/store/gq8v591q5my51192v6rdwllmbx7k3619-python3.6-ansible-2.5.2/bin/ansible-pull'...
wrapping `/nix/store/gq8v591q5my51192v6rdwllmbx7k3619-python3.6-ansible-2.5.2/bin/ansible-connection'...
wrapping `/nix/store/gq8v591q5my51192v6rdwllmbx7k3619-python3.6-ansible-2.5.2/bin/ansible-console'...
wrapping `/nix/store/gq8v591q5my51192v6rdwllmbx7k3619-python3.6-ansible-2.5.2/bin/ansible-doc'...
wrapping `/nix/store/gq8v591q5my51192v6rdwllmbx7k3619-python3.6-ansible-2.5.2/bin/ansible-vault'...
wrapping `/nix/store/gq8v591q5my51192v6rdwllmbx7k3619-python3.6-ansible-2.5.2/bin/ansible-galaxy'...
wrapping `/nix/store/gq8v591q5my51192v6rdwllmbx7k3619-python3.6-ansible-2.5.2/bin/ansible-playbook'...
wrapping `/nix/store/gq8v591q5my51192v6rdwllmbx7k3619-python3.6-ansible-2.5.2/bin/ansible'...

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: ansible

Partial log (click to expand)

wrapping `/nix/store/z3dih1rjylbbaq3si7fl065gxsamh5k5-python3.6-ansible-2.5.2/bin/ansible-config'...
wrapping `/nix/store/z3dih1rjylbbaq3si7fl065gxsamh5k5-python3.6-ansible-2.5.2/bin/ansible-connection'...
wrapping `/nix/store/z3dih1rjylbbaq3si7fl065gxsamh5k5-python3.6-ansible-2.5.2/bin/ansible-console'...
wrapping `/nix/store/z3dih1rjylbbaq3si7fl065gxsamh5k5-python3.6-ansible-2.5.2/bin/ansible-doc'...
wrapping `/nix/store/z3dih1rjylbbaq3si7fl065gxsamh5k5-python3.6-ansible-2.5.2/bin/ansible-galaxy'...
wrapping `/nix/store/z3dih1rjylbbaq3si7fl065gxsamh5k5-python3.6-ansible-2.5.2/bin/ansible-inventory'...
wrapping `/nix/store/z3dih1rjylbbaq3si7fl065gxsamh5k5-python3.6-ansible-2.5.2/bin/ansible-playbook'...
wrapping `/nix/store/z3dih1rjylbbaq3si7fl065gxsamh5k5-python3.6-ansible-2.5.2/bin/ansible-pull'...
wrapping `/nix/store/z3dih1rjylbbaq3si7fl065gxsamh5k5-python3.6-ansible-2.5.2/bin/ansible-vault'...
/nix/store/z3dih1rjylbbaq3si7fl065gxsamh5k5-python3.6-ansible-2.5.2

};

in rec {
# I really don't know why we carry so many versions...
Copy link
Member

@Mic92 Mic92 May 10, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

sha256 = "1r9sq30xz3jrvx6yqssj5wmkml1f75rx1amd7g89f3ryngrq6m59";
};

ansible2 = ansible_2_5;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be 2.4. 2.5 is still in development.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you 100% sure? 2.5 looks to be the stable release version on https://docs.ansible.com where 2.4 is listed as a "previous version".

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok. You are right.

@FRidh
Copy link
Member

FRidh commented May 10, 2018

Could a second commit be added that removes the old versions?

@peterhoeg
Copy link
Member Author

Could a second commit be added that removes the old versions?

Done

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: ansible

Partial log (click to expand)

/nix/store/gq8v591q5my51192v6rdwllmbx7k3619-python3.6-ansible-2.5.2

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: ansible

Partial log (click to expand)

/nix/store/z3dih1rjylbbaq3si7fl065gxsamh5k5-python3.6-ansible-2.5.2

# We will carry all the supported versions

ansible_2_4 = generic {
version = "2.4.4.0";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will build 2.4 with python3. Ansible doc says:

Ansible 2.5 and above have support for Python 3. Previous to 2.5, the Python 3 support was considered a tech preview.

Do we want to use python3 here anyway although it's not officially supported?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Version 2.1 built properly with python3 when I tried.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not saying it doesn't work - it's just not officially supported. It was more of a question whether we want to package a "tech previer".

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Turns out that previously all of them were built with python2, so in order not to change too much at one time, I'll change it to that here as well.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

for all of them

1) We had lots of copy paste - instead use a generic builder for the various reasons.

2) Default version changed to latest (2.5 instead of 2.4)

3) Point release updates to all
@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: ansible

Partial log (click to expand)

wrapping `/nix/store/8glzyma6qs0h7ki4jddl8zzj442f3a9f-python2.7-ansible-2.5.2/bin/ansible-config'...
wrapping `/nix/store/8glzyma6qs0h7ki4jddl8zzj442f3a9f-python2.7-ansible-2.5.2/bin/ansible-connection'...
wrapping `/nix/store/8glzyma6qs0h7ki4jddl8zzj442f3a9f-python2.7-ansible-2.5.2/bin/ansible-console'...
wrapping `/nix/store/8glzyma6qs0h7ki4jddl8zzj442f3a9f-python2.7-ansible-2.5.2/bin/ansible-doc'...
wrapping `/nix/store/8glzyma6qs0h7ki4jddl8zzj442f3a9f-python2.7-ansible-2.5.2/bin/ansible-galaxy'...
wrapping `/nix/store/8glzyma6qs0h7ki4jddl8zzj442f3a9f-python2.7-ansible-2.5.2/bin/ansible-inventory'...
wrapping `/nix/store/8glzyma6qs0h7ki4jddl8zzj442f3a9f-python2.7-ansible-2.5.2/bin/ansible-playbook'...
wrapping `/nix/store/8glzyma6qs0h7ki4jddl8zzj442f3a9f-python2.7-ansible-2.5.2/bin/ansible-pull'...
wrapping `/nix/store/8glzyma6qs0h7ki4jddl8zzj442f3a9f-python2.7-ansible-2.5.2/bin/ansible-vault'...
/nix/store/8glzyma6qs0h7ki4jddl8zzj442f3a9f-python2.7-ansible-2.5.2

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: ansible

Partial log (click to expand)

wrapping `/nix/store/3bkc9i20ikzdh0gamfs3vvjnhkp3h4z7-python2.7-ansible-2.5.2/bin/ansible-connection'...
wrapping `/nix/store/3bkc9i20ikzdh0gamfs3vvjnhkp3h4z7-python2.7-ansible-2.5.2/bin/ansible-doc'...
wrapping `/nix/store/3bkc9i20ikzdh0gamfs3vvjnhkp3h4z7-python2.7-ansible-2.5.2/bin/ansible-galaxy'...
wrapping `/nix/store/3bkc9i20ikzdh0gamfs3vvjnhkp3h4z7-python2.7-ansible-2.5.2/bin/ansible-vault'...
wrapping `/nix/store/3bkc9i20ikzdh0gamfs3vvjnhkp3h4z7-python2.7-ansible-2.5.2/bin/ansible-console'...
wrapping `/nix/store/3bkc9i20ikzdh0gamfs3vvjnhkp3h4z7-python2.7-ansible-2.5.2/bin/ansible'...
wrapping `/nix/store/3bkc9i20ikzdh0gamfs3vvjnhkp3h4z7-python2.7-ansible-2.5.2/bin/ansible-playbook'...
wrapping `/nix/store/3bkc9i20ikzdh0gamfs3vvjnhkp3h4z7-python2.7-ansible-2.5.2/bin/ansible-config'...
wrapping `/nix/store/3bkc9i20ikzdh0gamfs3vvjnhkp3h4z7-python2.7-ansible-2.5.2/bin/ansible-pull'...
/nix/store/3bkc9i20ikzdh0gamfs3vvjnhkp3h4z7-python2.7-ansible-2.5.2

@xeji
Copy link
Contributor

xeji commented May 12, 2018

@GrahamcOfBorg build ansible ansible_2_4

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: ansible, ansible_2_4

Partial log (click to expand)

wrapping `/nix/store/3bkc9i20ikzdh0gamfs3vvjnhkp3h4z7-python2.7-ansible-2.5.2/bin/ansible-config'...
wrapping `/nix/store/3bkc9i20ikzdh0gamfs3vvjnhkp3h4z7-python2.7-ansible-2.5.2/bin/ansible-inventory'...
wrapping `/nix/store/3bkc9i20ikzdh0gamfs3vvjnhkp3h4z7-python2.7-ansible-2.5.2/bin/ansible-pull'...
wrapping `/nix/store/3bkc9i20ikzdh0gamfs3vvjnhkp3h4z7-python2.7-ansible-2.5.2/bin/ansible-connection'...
wrapping `/nix/store/3bkc9i20ikzdh0gamfs3vvjnhkp3h4z7-python2.7-ansible-2.5.2/bin/ansible-console'...
wrapping `/nix/store/3bkc9i20ikzdh0gamfs3vvjnhkp3h4z7-python2.7-ansible-2.5.2/bin/ansible-doc'...
wrapping `/nix/store/3bkc9i20ikzdh0gamfs3vvjnhkp3h4z7-python2.7-ansible-2.5.2/bin/ansible-vault'...
wrapping `/nix/store/3bkc9i20ikzdh0gamfs3vvjnhkp3h4z7-python2.7-ansible-2.5.2/bin/ansible-galaxy'...
wrapping `/nix/store/3bkc9i20ikzdh0gamfs3vvjnhkp3h4z7-python2.7-ansible-2.5.2/bin/ansible-playbook'...
wrapping `/nix/store/3bkc9i20ikzdh0gamfs3vvjnhkp3h4z7-python2.7-ansible-2.5.2/bin/ansible'...

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: ansible, ansible_2_4

Partial log (click to expand)

wrapping `/nix/store/55by1g9nl21i9q5s5f37mc2yn2c2gr42-python2.7-ansible-2.5.2/bin/ansible'...
wrapping `/nix/store/55by1g9nl21i9q5s5f37mc2yn2c2gr42-python2.7-ansible-2.5.2/bin/ansible-config'...
wrapping `/nix/store/55by1g9nl21i9q5s5f37mc2yn2c2gr42-python2.7-ansible-2.5.2/bin/ansible-connection'...
wrapping `/nix/store/55by1g9nl21i9q5s5f37mc2yn2c2gr42-python2.7-ansible-2.5.2/bin/ansible-console'...
wrapping `/nix/store/55by1g9nl21i9q5s5f37mc2yn2c2gr42-python2.7-ansible-2.5.2/bin/ansible-doc'...
wrapping `/nix/store/55by1g9nl21i9q5s5f37mc2yn2c2gr42-python2.7-ansible-2.5.2/bin/ansible-galaxy'...
wrapping `/nix/store/55by1g9nl21i9q5s5f37mc2yn2c2gr42-python2.7-ansible-2.5.2/bin/ansible-inventory'...
wrapping `/nix/store/55by1g9nl21i9q5s5f37mc2yn2c2gr42-python2.7-ansible-2.5.2/bin/ansible-playbook'...
wrapping `/nix/store/55by1g9nl21i9q5s5f37mc2yn2c2gr42-python2.7-ansible-2.5.2/bin/ansible-pull'...
wrapping `/nix/store/55by1g9nl21i9q5s5f37mc2yn2c2gr42-python2.7-ansible-2.5.2/bin/ansible-vault'...

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: ansible, ansible_2_4

Partial log (click to expand)

wrapping `/nix/store/8glzyma6qs0h7ki4jddl8zzj442f3a9f-python2.7-ansible-2.5.2/bin/ansible-connection'...
wrapping `/nix/store/8glzyma6qs0h7ki4jddl8zzj442f3a9f-python2.7-ansible-2.5.2/bin/ansible-console'...
wrapping `/nix/store/8glzyma6qs0h7ki4jddl8zzj442f3a9f-python2.7-ansible-2.5.2/bin/ansible-doc'...
wrapping `/nix/store/8glzyma6qs0h7ki4jddl8zzj442f3a9f-python2.7-ansible-2.5.2/bin/ansible-galaxy'...
wrapping `/nix/store/8glzyma6qs0h7ki4jddl8zzj442f3a9f-python2.7-ansible-2.5.2/bin/ansible-inventory'...
wrapping `/nix/store/8glzyma6qs0h7ki4jddl8zzj442f3a9f-python2.7-ansible-2.5.2/bin/ansible-playbook'...
wrapping `/nix/store/8glzyma6qs0h7ki4jddl8zzj442f3a9f-python2.7-ansible-2.5.2/bin/ansible-pull'...
wrapping `/nix/store/8glzyma6qs0h7ki4jddl8zzj442f3a9f-python2.7-ansible-2.5.2/bin/ansible-vault'...
/nix/store/8glzyma6qs0h7ki4jddl8zzj442f3a9f-python2.7-ansible-2.5.2
/nix/store/682532p509h4sxk0a0kgxvd4ivsq4rpi-python2.7-ansible-2.4.4.0

@xeji xeji merged commit 8f259f3 into NixOS:master May 12, 2018
@peterhoeg peterhoeg deleted the f/ansible branch May 13, 2018 02:47
@peterhoeg peterhoeg restored the f/ansible branch May 13, 2018 15:44
@peterhoeg peterhoeg deleted the f/ansible branch October 8, 2018 01:23
@sengaya sengaya mentioned this pull request Nov 4, 2018
9 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants