Skip to content

Commit

Permalink
Re-enabled shell check
Browse files Browse the repository at this point in the history
Don't enable main repo with PS-80 repo
  • Loading branch information
hrvojem committed Dec 13, 2019
1 parent 94d0bde commit bea7635
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 12 deletions.
4 changes: 0 additions & 4 deletions playbooks/ps_80.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@
src: "{{ vault_cert }}"
dest: /package-testing/scripts/ps_keyring_plugins_test/test.cer

- name: include tasks for enabling main repo
include: ../tasks/enable_main_repo.yml
when: lookup('env', 'install_repo') == "main"

- name: include tasks for enabling PS 8 test repo
include: ../tasks/enable_ps8_main_repo.yml
when: lookup('env', 'install_repo') == "main"
Expand Down
16 changes: 8 additions & 8 deletions version_check.sh
Original file line number Diff line number Diff line change
Expand Up @@ -108,14 +108,14 @@ if [ "${product}" = "ps55" -o "${product}" = "ps56" -o "${product}" = "ps57" -o
exit 1
fi

# if [ ${product} = "ps80" ]; then
# if [ "$(mysqlsh --version | grep -c ${version})" = 1 ]; then
# echo "mysql-shell version is correct" >> "${log}"
# else
# echo "ERROR: mysql-shell version is incorrect"
# exit 1
# fi
# fi
if [ ${product} = "ps80" ]; then
if [ "$(mysqlsh --version | grep -c ${version})" = 1 ]; then
echo "mysql-shell version is correct" >> "${log}"
else
echo "ERROR: mysql-shell version is incorrect"
exit 1
fi
fi

elif [ ${product} = "pxc56" -o ${product} = "pxc57" ]; then
for i in @@INNODB_VERSION @@VERSION; do
Expand Down

0 comments on commit bea7635

Please sign in to comment.