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.

Sign up for GitHub

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

Optimizing ado.sh #510

Merged
merged 20 commits into from
May 13, 2021
Merged

Optimizing ado.sh #510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
8aa47c9
check python version
Fred-sun Apr 22, 2021
295a1e3
add new change
Fred-sun Apr 22, 2021
82a6d81
ad new
Fred-sun Apr 22, 2021
fb1941f
for test
Fred-sun Apr 22, 2021
7116e56
check python version
Fred-sun Apr 22, 2021
9643fc7
update ado.sh
Fred-sun Apr 22, 2021
c364c82
add new change
Fred-sun Apr 22, 2021
0ef27df
add new change
Fred-sun Apr 22, 2021
0ce6d2d
Merge branch 'dev' into fix-sanity02
Fred-sun Apr 23, 2021
61b1315
Perfect the ado.sh
Fred-sun Apr 25, 2021
3fe2100
fix sanity 2.7 error
Fred-sun Apr 25, 2021
f8e17fc
delete virtual env set
Fred-sun Apr 26, 2021
d8c8d21
fix small
Fred-sun Apr 26, 2021
cbb2f6b
revert virtual env change
Fred-sun Apr 26, 2021
2f72037
Merge branch 'dev' into fix-sanity02
Fred-sun Apr 28, 2021
c3e6d59
fixing update account_enabled bug in azure_rm_aduser.py (#524)
haiyuazhang May 7, 2021
6fdfefe
fixing ad related auth issue when using service pricinpal. (#525)
haiyuazhang May 7, 2021
24b08f7
change class name of azure_rm_aduser (#526)
haiyuazhang May 8, 2021
29dd154
Merge branch 'dev' into fix-sanity02
Fred-sun May 12, 2021
a0c3416
Merge branch 'dev' into fix-sanity02
Fred-sun May 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions pr-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ parameters:
default: 'all'
values:
- 'all'
- 'sanity'
- "azure_rm_acs"
- "azure_rm_aduser"
- "azure_rm_aks"
Expand Down
2 changes: 1 addition & 1 deletion sanity-requirements-azure.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
voluptuous==0.11.7
pycodestyle==2.6.0
yamllint==1.24.2
pylint==2.5.3
cryptography==3.3.2
pylint==2.5.3
80 changes: 23 additions & 57 deletions tests/utils/ado/ado.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,87 +9,52 @@ group="${args[0]}"

command -v python
python -V

if [ "$2" = "2.7" ]
then
command -v pip
pip --version
pip list --disable-pip-version-check
echo "The specified environment is Python2.7"
else
if [ "$2" = "3.8" ]
then
sudo apt update
sudo apt install software-properties-common
sudo add-apt-repository ppa:deadsnakes/ppa
sudo apt install python"$2" -y
sudo update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.8 1
fi

command -v pip3
pip3 --version
pip3 list --disable-pip-version-check
alias pip='pip3'
sudo apt update
Copy link
Contributor

Choose a reason for hiding this comment

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

could you check if "$UID" -eq "0" here instead of always performing sudo? It would be nice to be able to run this easily from inside a Docker container

sudo apt install software-properties-common
sudo add-apt-repository ppa:deadsnakes/ppa
sudo apt install python"$2" -y
sudo update-alternatives --install /usr/bin/python3 python3 /usr/bin/python"$2" 1
fi

command -v pip
pip --version
pip list --disable-pip-version-check

export PATH="${PWD}/bin:${PATH}"
export PYTHONIOENCODING="UTF-8"
export LC_ALL="en_US.utf-8"

if [ "$2" = "2.7" ]
then
pip install virtualenv
virtualenv --python /usr/bin/python2.7 ~/ansible-venv
else
pip3 install virtualenv
virtualenv --python /usr/bin/python"$2" ~/ansible-venv
fi
pip install virtualenv
virtualenv --python /usr/bin/python"$2" ~/ansible-venv

set +ux
. ~/ansible-venv/bin/activate
set -ux

if [ "$2" = "2.7" ]
git clone https://github.com/ansible/ansible.git
cd "ansible"
if [ "$3" = "devel" ]
then
if [ "$3" = "devel" ]
then
pip install git+https://github.com/ansible/ansible.git@devel --disable-pip-version-check
else
git clone https://github.com/ansible/ansible.git
cd "ansible"
git checkout "stable-$3"
source hacking/env-setup
pip install paramiko PyYAML Jinja2 httplib2 six
fi
echo "The branch is devel"
else
if [ "$3" = "devel" ]
then
pip3 install git+https://github.com/ansible/ansible.git@devel --disable-pip-version-check
else
git clone https://github.com/ansible/ansible.git
cd "ansible"
git checkout "stable-$3"
source hacking/env-setup
pip3 install paramiko PyYAML Jinja2 httplib2 six
fi
git checkout "stable-$3"
fi
source hacking/env-setup
pip install paramiko PyYAML Jinja2 httplib2 six

TEST_DIR="${HOME}/.ansible/ansible_collections/azure/azcollection"
mkdir -p "${TEST_DIR}"
cp -aT "${SHIPPABLE_BUILD_DIR}" "${TEST_DIR}"
cd "${TEST_DIR}"
mkdir -p shippable/testresults

if [ "$2" = "2.7" ]
then
pip install --upgrade pip
pip install -I -r "${TEST_DIR}/requirements-azure.txt"
pip3 install setuptools
pip3 install -I -r "${TEST_DIR}/sanity-requirements-azure.txt"
pip3 list
else
pip3 install -I -r "${TEST_DIR}/requirements-azure.txt"
pip3 install -I -r "${TEST_DIR}/sanity-requirements-azure.txt"
pip3 list
fi
pip install -I -r "${TEST_DIR}/requirements-azure.txt"
pip install -I -r "${TEST_DIR}/sanity-requirements-azure.txt"

timeout=60

Expand All @@ -110,6 +75,7 @@ else
done
fi
echo '--------------------------------------------'
pip list
ansible --version
echo '--------------------------------------------'

Expand Down