Install agent on test VMs #2714

narrieta · 2022-12-14T06:17:36Z

Now we install the test agent on the test VMs before executing the tests.

The PR also includes some re-structuring of the code and some minor cleanup; I pointed out those changes with comments in the PR.

codecov · 2022-12-14T06:22:04Z

Codecov Report

Merging #2714 (76c2d21) into develop (cdb25bf) will increase coverage by 0.01%.
The diff coverage is n/a.

@@             Coverage Diff             @@
##           develop    #2714      +/-   ##
===========================================
+ Coverage    71.95%   71.96%   +0.01%     
===========================================
  Files          104      104              
  Lines        15765    15765              
  Branches      2244     2244              
===========================================
+ Hits         11343    11345       +2     
- Misses        3906     3909       +3     
+ Partials       516      511       -5

Impacted Files	Coverage Δ
azurelinuxagent/common/cgroupconfigurator.py	`72.24% <0.00%> (+0.31%)`	⬆️

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

narrieta · 2022-12-14T06:20:45Z

.gitignore

@@ -17,8 +17,6 @@ develop-eggs/
 dist/
 downloads/
 eggs/
-lib/


In my previous PR I wanted to use "lib" as the name for directories containing Python libraries, but we were ignoring those. At the time, I thought "lib" was created by makepkg.py, but that it not the case. I do not know why this ignore rule was added in the first place, but it is not needed so I am removing it (and I'm renaming the "modules" directory to "lib").

The same applies for "lib64"

narrieta · 2022-12-14T06:21:30Z

makepkg.py

@@ -1,14 +1,15 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3


Newer distros don't have a default "python". Using "python3" explicitly.

After this change, would this break on python distros if no py3?

Yes, but we don't use any of those distros in our automation or deployment pipelines.

Since we rely on makepkg.py to install agent in new automation it will break for distros if we onboard them like rhel 7 or centos 7 distros

No, we control the orchestrator VM, which is where we build the package. Currently it is Ubuntu 18, but soon Azure Pipelines will move to Ubuntu 20.

The container for the deployment pipeline is also Ubuntu 18.

I see we build the egg inside container and move to the vm. Thanks for explaining

narrieta · 2022-12-14T06:25:41Z

makepkg.py

@@ -1,14 +1,15 @@
-#!/usr/bin/env python


I changed makepkg.py so that it can be used as a script (as it has been used so far) and also as a library function. There are very few code changes, other than the introduction of the run() function and the "if name == "main":" pattern. I pointed out the actual code changes with PR comments.

When will we use this as a library function?

It's been called from AgentTestSuite._build_agent_package()

narrieta · 2022-12-14T06:26:25Z

makepkg.py

-        print(e.output)
-        sys.exit(1)
-
+        raise Exception("[{0}] failed:\n{1}\n{2}".format(" ".join(args), str(e), e.stdout))


Raising an exception instead of using print() and sys.exit()

narrieta · 2022-12-14T06:26:54Z

makepkg.py

+        raise Exception("[{0}] failed:\n{1}\n{2}".format(" ".join(args), str(e), e.stdout))
+
+
+def run(agent_family, output_directory, log):


wrapped the code of the function in a run() function

narrieta · 2022-12-14T06:42:19Z

tests_e2e/scenarios/testsuites/agent_bvt.py

        self.custom_script()

-    def check_agent_version(self) -> None:


No longer needed, since now the agent version is checked when the agent package is installed

narrieta · 2022-12-14T06:43:24Z

tests_e2e/scenarios/testsuites/agent_test_suite.py

@@ -1,53 +0,0 @@
-from pathlib import Path, PurePath


Replaced by tests_e2e/orchestrator/lib/agent_test_suite.py

narrieta · 2022-12-14T16:22:54Z

.github/workflows/ci_pr.yml

@@ -41,30 +41,30 @@ jobs:
        include:

          - python-version: 2.7
-            PYLINTOPTS: "--rcfile=ci/2.7.pylintrc"


Added the end-to-end tests to the pylint run, but only on the most recent Python we test. This code uses language features not available in older versions so it is not worth linting there.

Excluded azure_models.py and BaseExtensionTestClass.py, since they have multiple warnings. These files come from DCR and need to be rewritten anyway.

Lastly, excluded makepkg.py from the runs on 2.7 and 3.4. Some of the API calls I added do not exist on those versions.

narrieta · 2022-12-14T16:23:26Z

ci/nosetests_only.sh

@@ -1,18 +0,0 @@
-#!/usr/bin/env bash


this file is not used anywhere, deleted it

narrieta · 2022-12-14T16:23:34Z

ci/pylint_and_nosetests.sh

@@ -1,32 +0,0 @@
-#!/usr/bin/env bash
-


this file is not used anywhere, deleted it

narrieta · 2022-12-14T18:06:05Z

tests_e2e/scenarios/runbooks/daily.yml

@@ -44,7 +44,6 @@ variable:
    value: ""
    is_secret: true
 notifier:
-  - type: html


we don't need the html report

maddieford · 2022-12-15T03:56:19Z

makepkg.py

@@ -1,14 +1,15 @@
-#!/usr/bin/env python


When will we use this as a library function?

maddieford · 2022-12-15T04:03:48Z

tests_e2e/orchestrator/scripts/install-agent

@@ -0,0 +1,105 @@
+#!/usr/bin/env bash


Will we be able to use this script across all distros?

nagworld9 · 2022-12-15T20:23:50Z

makepkg.py

@@ -1,14 +1,15 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3


After this change, would this break on python distros if no py3?

nagworld9 · 2022-12-15T21:22:09Z

tests_e2e/orchestrator/scripts/install-agent

+#
+echo "Installing $package..."
+unzip -d "/var/lib/waagent/WALinuxAgent-$version" -o "$package"
+sed -i 's/AutoUpdate.Enabled=n/AutoUpdate.Enabled=y/g' /etc/waagent.conf


why do we need this autoupdate? I think we should pin the test version to run our scenarios.

There is no way to pin the version of the self-updated agent, so we deploy a new package as 9.9.9.9 and ensure auto-update is enabled.

Even we ensure auto update is enabled its no-op on agent update in test package 9.9.9.9 version except downloading extra pkgs in the vm

Sorry, I don't get your comment. If auto-update is disabled the daemon won't start 9.9.9.9 (or any of the other self-update versions).

Oh yeah, I keep forgetting that check in daemon. we are good then

nagworld9 · 2022-12-15T22:42:12Z

tests_e2e/orchestrator/scripts/collect-logs

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash


why these scripts moved here? These are executed by lisa per scenario. Isn't scenarios best place to keep? same thing for agent_test_suite.

nagworld9 · 2022-12-15T22:52:07Z

makepkg.py

-print("Creating egg {0}".format(egg_path))
-do(*args)
+if __name__ == "__main__":
+    logging.basicConfig(format='%(message)s', level=logging.INFO)


where are the log msgs stored? which file?

When the py file is invoked as a script (name == "main") we just to output to stdout/stderr , no file is created. Same behavior as the previous version of this script.

On the other hand, when the py file is used as a library module, the caller passes the log to the run() method.

In our case, the test suite is passing LISA's log, so during test runs the output goes to the test log file (on top of stdout/stderr).

nagworld9 · 2022-12-15T23:15:33Z

makepkg.py

@@ -1,14 +1,15 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3


I see we build the egg inside container and move to the vm. Thanks for explaining

narrieta added 10 commits December 13, 2022 11:37

Install agent on test VMs

f756604

install distro module

035bdca

capture command error message

b2a81a2

.

a0df4ef

.

f733474

.

00cb310

.

29425ef

.

27ac4b0

.

653ed34

.

eacbec5

narrieta requested review from ZhidongPeng, nagworld9 and maddieford as code owners December 14, 2022 06:17

narrieta added 3 commits December 14, 2022 07:16

.

d2710f0

.

251a372

.

b6ad492

narrieta commented Dec 14, 2022

View reviewed changes

.

76c2d21

narrieta commented Dec 14, 2022

View reviewed changes

maddieford approved these changes Dec 15, 2022

View reviewed changes

nagworld9 reviewed Dec 15, 2022

View reviewed changes

nagworld9 approved these changes Dec 15, 2022

View reviewed changes

narrieta merged commit cc91dc6 into Azure:develop Dec 15, 2022

narrieta deleted the install-agent branch December 15, 2022 23:18

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Install agent on test VMs #2714

Install agent on test VMs #2714

narrieta commented Dec 14, 2022

codecov bot commented Dec 14, 2022 •

edited

Loading

narrieta Dec 14, 2022

narrieta Dec 14, 2022

nagworld9 Dec 15, 2022

narrieta Dec 15, 2022

nagworld9 Dec 15, 2022 •

edited

Loading

narrieta Dec 15, 2022

nagworld9 Dec 15, 2022

narrieta Dec 14, 2022

maddieford Dec 15, 2022

narrieta Dec 15, 2022

narrieta Dec 14, 2022

narrieta Dec 14, 2022

narrieta Dec 14, 2022

narrieta Dec 14, 2022

narrieta Dec 14, 2022

narrieta Dec 14, 2022

narrieta Dec 14, 2022

narrieta Dec 14, 2022

maddieford Dec 15, 2022

maddieford Dec 15, 2022

nagworld9 Dec 15, 2022

nagworld9 Dec 15, 2022

narrieta Dec 15, 2022

nagworld9 Dec 15, 2022

narrieta Dec 15, 2022

nagworld9 Dec 15, 2022

nagworld9 Dec 15, 2022

nagworld9 Dec 15, 2022

narrieta Dec 15, 2022

narrieta Dec 15, 2022

nagworld9 Dec 15, 2022

		@@ -1,14 +1,15 @@
		#!/usr/bin/env python
		#!/usr/bin/env python3

		raise Exception("[{0}] failed:\n{1}\n{2}".format(" ".join(args), str(e), e.stdout))


		def run(agent_family, output_directory, log):

Install agent on test VMs #2714

Install agent on test VMs #2714

Conversation

narrieta commented Dec 14, 2022

codecov bot commented Dec 14, 2022 • edited Loading

Codecov Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

nagworld9 Dec 15, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codecov bot commented Dec 14, 2022 •

edited

Loading

nagworld9 Dec 15, 2022 •

edited

Loading