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.

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

Updated Jenkins pipeline to use parseChangelog utility #189

Merged
merged 8 commits into from
May 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions .github/workflows/ansible-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@ jobs:
# .../ansible_collections/cyberark/conjur/

- name: Check out code
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
path: ansible_collections/cyberark/conjur

- name: Set up Python ${{ matrix.ansible }}
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python }}

Expand Down Expand Up @@ -82,7 +82,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
path: ansible_collections/cyberark/conjur

Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ pipeline {
stage('Validate') {
parallel {
stage('Changelog') {
steps { sh './ci/parse-changelog.sh' }
steps { parseChangelog() }
}
}
}
Expand Down
6 changes: 0 additions & 6 deletions ci/parse-changelog.sh

This file was deleted.

2 changes: 1 addition & 1 deletion dev/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04
FROM ubuntu:22.04

ENV DEBIAN_FRONTEND=noninteractive

Expand Down
7 changes: 4 additions & 3 deletions dev/Dockerfile_nginx
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
FROM nginx:1.13.3
FROM nginx:1.24.0

RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get update && \
ENV DEBIAN_FRONTEND=noninteractive

RUN apt-get update && \
apt-get install -y iputils-ping procps openssl && \
rm -rf /var/lib/apt/lists/*

Expand Down
3 changes: 2 additions & 1 deletion dev/test_unit.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,5 @@ docker build \
docker run --rm \
-v "${PWD}/":/ansible_collections/cyberark/conjur/ \
-w /ansible_collections/cyberark/conjur/tests/unit/ \
pytest-tools:latest /bin/bash -c "$test_cmd"
pytest-tools:latest /bin/bash -c \
"git config --global --add safe.directory /ansible_collections/cyberark/conjur && $test_cmd"
7 changes: 4 additions & 3 deletions roles/conjur_host_identity/tests/Dockerfile_nginx
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
FROM nginx:1.13.3
FROM nginx:1.24.0

RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get update && \
ENV DEBIAN_FRONTEND=noninteractive

RUN apt-get update && \
apt-get install -y iputils-ping procps openssl && \
rm -rf /var/lib/apt/lists/*

Expand Down
7 changes: 4 additions & 3 deletions tests/conjur_variable/Dockerfile_nginx
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
FROM nginx:1.13.3
FROM nginx:1.24.0

RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get update && \
ENV DEBIAN_FRONTEND=noninteractive

RUN apt-get update && \
apt-get install -y iputils-ping \
procps \
openssl && \
Expand Down
1 change: 0 additions & 1 deletion tests/sanity/ignore-2.10.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ Jenkinsfile shebang
tests/conjur_variable/policy/root.yml yamllint:unparsable-with-libyaml
roles/conjur_host_identity/tests/policy/root.yml yamllint:unparsable-with-libyaml # File loaded by summon utility (in Jenkinsfile), not via Python
ci/build_release shebang
ci/parse-changelog.sh shebang
ci/publish_to_galaxy shebang
ci/test.sh shebang
secrets.yml yamllint:unparsable-with-libyaml # File loaded by Conjur server, not via Python
Expand Down
1 change: 0 additions & 1 deletion tests/sanity/ignore-2.11.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ dev/start.sh shebang
tests/conjur_variable/policy/root.yml yamllint:unparsable-with-libyaml
roles/conjur_host_identity/tests/policy/root.yml yamllint:unparsable-with-libyaml # File loaded by summon utility (in Jenkinsfile), not via Python
ci/build_release shebang
ci/parse-changelog.sh shebang
ci/publish_to_galaxy shebang
ci/test.sh shebang
secrets.yml yamllint:unparsable-with-libyaml # File loaded by Conjur server, not via Python
Expand Down
1 change: 0 additions & 1 deletion tests/sanity/ignore-2.12.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ dev/start.sh shebang
tests/conjur_variable/policy/root.yml yamllint:unparsable-with-libyaml # File loaded by Conjur server, not via Python
roles/conjur_host_identity/tests/policy/root.yml yamllint:unparsable-with-libyaml # File loaded by Conjur server, not via Python
ci/build_release shebang
ci/parse-changelog.sh shebang
ci/publish_to_galaxy shebang
ci/test.sh shebang
secrets.yml yamllint:unparsable-with-libyaml # File loaded by Summon utility (in Jenkinsfile), not via Python
Expand Down
1 change: 0 additions & 1 deletion tests/sanity/ignore-2.13.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ dev/start.sh shebang
tests/conjur_variable/policy/root.yml yamllint:unparsable-with-libyaml # File loaded by Conjur server, not via Python
roles/conjur_host_identity/tests/policy/root.yml yamllint:unparsable-with-libyaml # File loaded by Conjur server, not via Python
ci/build_release shebang
ci/parse-changelog.sh shebang
ci/publish_to_galaxy shebang
ci/test.sh shebang
secrets.yml yamllint:unparsable-with-libyaml # File loaded by Summon utility (in Jenkinsfile), not via Python
Expand Down
1 change: 0 additions & 1 deletion tests/sanity/ignore-2.14.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ dev/start.sh shebang
tests/conjur_variable/policy/root.yml yamllint:unparsable-with-libyaml # File loaded by Conjur server, not via Python
roles/conjur_host_identity/tests/policy/root.yml yamllint:unparsable-with-libyaml # File loaded by Conjur server, not via Python
ci/build_release shebang
ci/parse-changelog.sh shebang
ci/publish_to_galaxy shebang
ci/test.sh shebang
secrets.yml yamllint:unparsable-with-libyaml # File loaded by Summon utility (in Jenkinsfile), not via Python
Expand Down
1 change: 0 additions & 1 deletion tests/sanity/ignore-2.9.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,5 @@ dev/start.sh shebang
tests/conjur_variable/test.sh shebang
roles/conjur_host_identity/tests/test.sh shebang
ci/build_release shebang
ci/parse-changelog.sh shebang
ci/publish_to_galaxy shebang
ci/test.sh shebang