Skip to content

Commit caf50b9

Browse files
committed
need a valid user
Issue: AAH-2421
1 parent 91999ea commit caf50b9

File tree

2 files changed

+14
-13
lines changed

2 files changed

+14
-13
lines changed

dev/galaxy_collection_plays/vars.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ah_host: http://localhost:55001
2-
ah_username: iqe_admin
3-
ah_password: redhat
4-
ah_path_prefix: automation-hub
5-
ah_artifact_runner_absolute_path: /home/runner/work/galaxy_ng/galaxy_ng/galaxy_collection/galaxy-galaxy-1.0.0.tar.gz
2+
ah_username: admin
3+
ah_password: admin
4+
ah_path_prefix: galaxy
5+
ah_artifact_runner_absolute_path: /src/galaxy_collection_test/galaxy-galaxy-1.0.0.tar.gz

dev/oci_env_integration/actions/action_lib.py

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ class OCIEnvIntegrationTest:
3232
env_file (string, required): oci-env env file to use for the tests. These are all loaded
3333
from dev/oci_env_integration/oci_env_configs
3434
run_tests (boolean, required): if true, integration tests will be run inside this instance
35-
run_playbooks (boolean, required): if true, Galaxy Collection playbook tests will be run inside this instance
35+
run_playbooks (boolean, required): if true, Galaxy Collection playbook tests will be run
36+
inside this instance
3637
db_restore (string, optional): database backup to restore before running tests These are all
3738
loaded from dev/oci_env_integration/oci_env_configs. When defining this, omit
3839
the file extension (ex: fixture, not fixtur.tar.gz)
@@ -132,20 +133,20 @@ def run_test(self):
132133
def install_galaxy_collection(self, env):
133134
self.exec_cmd(
134135
env,
135-
"exec git clone https://github.com/ansible/galaxy_collection /src/galaxy_collection_test"
136+
"exec git clone https://github.com/ansible/galaxy_collection /src/galaxy_collection_test" # noqa E501
136137
)
137138

138-
# The ansible.cfg defined in the collection repository might break the test. We want the same variables for installation and running.
139+
# The ansible.cfg defined in the collection repository might break the test.
140+
# We want the same variables for installation and running.
139141
self.exec_cmd(env, "exec rm -f /src/galaxy_collection_test/ansible.cfg")
140142
self.exec_cmd(env, "exec rm -f /src/galaxy_collection_test/galaxy.yml")
141-
self.exec_cmd(env, "exec mv /src/galaxy_collection_test/.github/files/galaxy.yml.j2 /src/galaxy_collection_test/")
143+
self.exec_cmd(env, "exec mv /src/galaxy_collection_test/.github/files/galaxy.yml.j2 /src/galaxy_collection_test/") # noqa E501
142144
self.exec_cmd(
143145
env,
144-
'exec ansible all -i localhost, -c local -m template -a "src=/src/galaxy_collection_test/galaxy.yml.j2 dest=/src/galaxy_collection_test/galaxy.yml" -e collection_namespace=galaxy -e collection_name=galaxy -e collection_version=1.0.0 -e collection_repo=https://github.com/ansible/automation_hub_collection'
146+
'exec ansible all -i localhost, -c local -m template -a "src=/src/galaxy_collection_test/galaxy.yml.j2 dest=/src/galaxy_collection_test/galaxy.yml" -e collection_namespace=galaxy -e collection_name=galaxy -e collection_version=1.0.0 -e collection_repo=https://github.com/ansible/automation_hub_collection' # noqa E501
145147
)
146-
self.exec_cmd(env, "exec ansible-galaxy collection build --output-path /src/galaxy_collection_test/ /src/galaxy_collection_test/ -vvv")
147-
self.exec_cmd(env, "exec ansible-galaxy collection install /src/galaxy_collection_test/galaxy-galaxy-1.0.0.tar.gz -vvv --force")
148-
self.exec_cmd(env, "exec rm -rf /src/galaxy_collection_test")
148+
self.exec_cmd(env, "exec ansible-galaxy collection build --output-path /src/galaxy_collection_test/ /src/galaxy_collection_test/ -vvv") # noqa E501
149+
self.exec_cmd(env, "exec ansible-galaxy collection install /src/galaxy_collection_test/galaxy-galaxy-1.0.0.tar.gz -vvv --force") # noqa E501
149150

150151
def run_playbooks(self):
151152
for env in self.envs:
@@ -161,7 +162,7 @@ def run_playbooks(self):
161162
print(f"testing the {playbook} playbook")
162163
self.exec_cmd(
163164
env,
164-
f"exec ansible-playbook src/galaxy_ng/dev/galaxy_collection_plays/{playbook} -vvv"
165+
f"exec ansible-playbook src/galaxy_ng/dev/galaxy_collection_plays/{playbook} -vvv" # noqa E501
165166
)
166167

167168
def dump_logs(self):

0 commit comments

Comments
 (0)