Fix the -R option on Debian/Ubuntu #1082

rallytime · 2017-05-26T18:26:01Z

What does this PR do?

When the -R option was originally implemented for Debian/Ubuntu, I must not have been testing the right thing because I am not sure how that ever could have worked. This PR reworks some of those -R checks and sets up the repositories correctly.

What issues does this PR fix or reference?

Fixes #1081

Previous Behavior

The -R option wouldn't set up any repo, and would install the default old packages in apt, which is version 0.17. :(

New Behavior

-R option works well!

root@ubuntu:~# sh test.sh -R repo.saltstack.com/staging
<snipped>
root@ubuntu:~# salt-minion --version
salt-minion 2016.11.5 (Carbon)
root@ubuntu:~# cat /etc/apt/sources.list.d/saltstack.list
deb https://repo.saltstack.com/staging/apt/ubuntu/14.04/amd64/latest trusty main

I also did a bunch of clean up in this PR that I have been wanting to do for a while. Namely:

I moved all of the duplicated warnings about the checking for the correct DPKG_ARCHITECTURE values into a single function
I created an install_saltstack_ubuntu_repository function and moved the saltstack repo set up (and also will work with the -R setting with the _REPO_URL value) there. This is similar to the way the RHEL distros gate and set up the saltstack repo.
I created an install_saltstack_debian_repository function and moved the saltstack repo set up for BOTH debian 7 and debian 8 into one function. This also works with -R, just like the ubuntu repo set up function.
In these two new functions, I also removed the checks for which "stable" version the user is installing. The packages located on saltstack's repo have been around long enough for now and the old repos are not getting updates any longer.

vutny

This is super awesome! The code looks DRY and much cleaner now. Great work.

But I would like to offer a couple of suggestions, please take a look below.

vutny · 2017-05-29T07:19:59Z

bootstrap-salt.sh

+    __REPO_ARCH="$DPKG_ARCHITECTURE"
+
+    if [ "$DPKG_ARCHITECTURE" = "i386" ]; then
+        echoerror "$_REPO_URL likely doesn't have all required 32-bit packages for Ubuntu $DISTRO_MAJOR_VERSION (yet?)."


I guess we should use ${DISTRO_NAME} variable instead of hard coded Ubuntu word here, right?

Ah, yes. Good catch. I will fix that.

vutny · 2017-05-29T07:35:41Z

bootstrap-salt.sh

+        elif [ "$ITYPE" != "git" ]; then
+            echoerror "You can try git installation mode, i.e.: sh ${__ScriptName} git v2016.11.5"
+        fi
+    fi


As I see, this should work properly during stable installation on Debian/Raspbian armhf, but will output unnecessary error messages which may confuse users.
How about to simplify this whole block to a case statement?

vutny · 2017-05-29T07:52:54Z

bootstrap-salt.sh

+        DEBIAN_CODENAME="wheezy"
+    else
+        DEBIAN_CODENAME="jessie"
+    fi


This is fine for now. But I guess in the future we would need a better checks for Debian distros codenames, something like we do for Ubuntu above and in the __ubuntu_codename_translation function.

~~Winter~~ Debian Stretch is coming...

Yeah, I agree. I thought of this, too, but I think a separate PR will be better for this right now. I'll make an issue for it, especially since 7 is phasing out and we'll be moving to 9 very soon as you said. :)

s0undt3ch

As always, @vutny added valuable input!

rallytime · 2017-05-30T17:34:43Z

@vutny I have updated this PR with your suggestions. Please take another look.

vutny · 2017-05-31T07:13:11Z

bootstrap-salt.sh

+            error_msg=""
+            ;;
+        "armhf")
+            error_msg=""


Since there are no armhf packages for Ubuntu and Debian 7, maybe we should also check that here?

vutny · 2017-05-31T07:15:27Z

@rallytime That looks really great. Just added some another suggestion above. I know I'm bothersome 😃

rallytime · 2017-05-31T15:10:42Z

@vutny Don't worry, this is good feedback!

My latest change adds warnings for when the architecture detected is armhf when installing on Ubuntu and Debian 7. I also moved the __check_dpkg_architecture function below the __ubuntu_derivatives_translation function to use the "DISTRO_NAME_L" value and added return codes to various warning cases since if we detect an unsupported architecture, we should fail sooner.

Let me know what you think.

rallytime · 2017-05-31T20:50:52Z

Go Go Jenkins!

vutny

Looks solid!

rallytime · 2017-06-01T15:18:40Z

Go Go Jenkins!

rallytime · 2017-06-01T15:32:37Z

@s0undt3ch I am not sure why the clone job is failing on these tests. I am not as familiar with this jenkins set up. Do you know why that ci/clone build is failing?

And remove legacy support for pre-repo.saltstack.com packages for Ubuntu. This change also fixes the issue where Ubuntu installations using the -R option were not working.

This function combines the previous efforts to install the correct saltstack repo for debian 7 and debian 8 into a single codeblock. This change also fixes the issue where Debian installations using the -R option were not working.

- Added checks and warnings for armhf packages not supported on Ubuntu/Debian 7 - Moved __check_dpkg_architecture below __ubuntu_derivatives_translation function to use the "DISTRO_NAME_L" value - Added return codes to various warning cases since if we detect an unsupported architecture, we should fail sooner.

rallytime requested a review from s0undt3ch May 26, 2017 18:26

vutny suggested changes May 29, 2017

View reviewed changes

s0undt3ch approved these changes May 29, 2017

View reviewed changes

rallytime mentioned this pull request May 30, 2017

Add Debian codename distro translation function #1083

Closed

vutny reviewed May 31, 2017

View reviewed changes

rallytime mentioned this pull request May 31, 2017

The -R option is broken on Ubuntu/Debian systems #1081

Closed

vutny approved these changes Jun 1, 2017

View reviewed changes

rallytime added 9 commits June 2, 2017 09:27

Move dpkg architecture warnings into a single function

caa6d7d

Create a function to setup the saltstack repo for ubuntu

a3db8ff

And remove legacy support for pre-repo.saltstack.com packages for Ubuntu. This change also fixes the issue where Ubuntu installations using the -R option were not working.

Typo fix: els --> else

d3fc57f

Spell the function name correctly...

0d8069e

Use case statement in dpkg check function to simplify error logging

db26b16

Lint fix

6c0f6c0

Just use exit numbers instead of truth values for return codes

ff9db2a

rallytime force-pushed the fix-1081 branch from 3770453 to ff9db2a Compare June 2, 2017 15:27

Lint Fixes

5ceef71

rallytime merged commit ba5e340 into saltstack:develop Jun 2, 2017

rallytime deleted the fix-1081 branch June 2, 2017 15:44

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix the -R option on Debian/Ubuntu #1082

Fix the -R option on Debian/Ubuntu #1082

rallytime commented May 26, 2017

vutny left a comment

vutny May 29, 2017

rallytime May 30, 2017

vutny May 29, 2017

rallytime May 30, 2017

vutny May 29, 2017

rallytime May 30, 2017 •

edited

s0undt3ch left a comment

rallytime commented May 30, 2017

vutny May 31, 2017

vutny commented May 31, 2017

rallytime commented May 31, 2017

rallytime commented May 31, 2017

vutny left a comment

rallytime commented Jun 1, 2017

rallytime commented Jun 1, 2017

Fix the -R option on Debian/Ubuntu #1082

Fix the -R option on Debian/Ubuntu #1082

Conversation

rallytime commented May 26, 2017

What does this PR do?

What issues does this PR fix or reference?

Previous Behavior

New Behavior

vutny left a comment

Choose a reason for hiding this comment

vutny May 29, 2017

Choose a reason for hiding this comment

rallytime May 30, 2017

Choose a reason for hiding this comment

vutny May 29, 2017

Choose a reason for hiding this comment

rallytime May 30, 2017

Choose a reason for hiding this comment

vutny May 29, 2017

Choose a reason for hiding this comment

rallytime May 30, 2017 • edited

Choose a reason for hiding this comment

s0undt3ch left a comment

Choose a reason for hiding this comment

rallytime commented May 30, 2017

vutny May 31, 2017

Choose a reason for hiding this comment

vutny commented May 31, 2017

rallytime commented May 31, 2017

rallytime commented May 31, 2017

vutny left a comment

Choose a reason for hiding this comment

rallytime commented Jun 1, 2017

rallytime commented Jun 1, 2017

rallytime May 30, 2017 •

edited