Skip to content

Remove FIPS check shell code, already done in the MCO #10488

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

Closed
cgwalters wants to merge 1 commit into from
Closed

Remove FIPS check shell code, already done in the MCO #10488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 0 additions & 1 deletion ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,6 @@ presubmits:
value: e2e-aws-fips
- name: TEST_COMMAND
value: |
fips_check
Copy link
Member

@wking wking Jul 28, 2020

Choose a reason for hiding this comment

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

I see no need for pull-ci-openshift-installer-master-e2e-aws-fips and similar jobs if we feel that the MCO test already covers the FIPS angle sufficiently. Can we just drop the jobs, instead of editing them to be identical to vanilla e2e? Or do we feel like we still need coverage on installer PRs of installs with FIPS enabled?

Copy link
Member Author

@cgwalters cgwalters Jul 28, 2020

Choose a reason for hiding this comment

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

The job injects the fips: true install config still and we're still testing that.

TEST_SUITE=openshift/conformance/parallel run-tests
image: ci-operator:latest
imagePullPolicy: Always
Expand Down
1 change: 0 additions & 1 deletion ci-operator/jobs/openshift/installer/openshift-installer-release-4.4-presubmits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,6 @@ presubmits:
value: e2e-aws-fips
- name: TEST_COMMAND
value: |
fips_check
TEST_SUITE=openshift/conformance/parallel run-tests
image: ci-operator:latest
imagePullPolicy: Always
Expand Down
1 change: 0 additions & 1 deletion ci-operator/jobs/openshift/installer/openshift-installer-release-4.6-presubmits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,6 @@ presubmits:
value: e2e-aws-fips
- name: TEST_COMMAND
value: |
fips_check
TEST_SUITE=openshift/conformance/parallel run-tests
image: ci-operator:latest
imagePullPolicy: Always
Expand Down
1 change: 0 additions & 1 deletion ci-operator/jobs/openshift/installer/openshift-installer-release-4.7-presubmits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,6 @@ presubmits:
value: e2e-aws-fips
- name: TEST_COMMAND
value: |
fips_check
TEST_SUITE=openshift/conformance/parallel run-tests
image: ci-operator:latest
imagePullPolicy: Always
Expand Down
1 change: 0 additions & 1 deletion ci-operator/jobs/openshift/kubernetes/openshift-kubernetes-master-presubmits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,6 @@ presubmits:
value: e2e-aws-fips
- name: TEST_COMMAND
value: |
fips_check
TEST_SUITE=openshift/conformance/parallel run-tests
image: ci-operator:latest
imagePullPolicy: Always
Expand Down
1 change: 0 additions & 1 deletion ci-operator/jobs/openshift/origin/openshift-origin-master-presubmits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,6 @@ presubmits:
value: e2e-aws-fips
- name: TEST_COMMAND
value: |
fips_check
TEST_SUITE=openshift/conformance/parallel run-tests
image: ci-operator:latest
imagePullPolicy: Always
Expand Down
1 change: 0 additions & 1 deletion ci-operator/jobs/openshift/origin/openshift-origin-release-4.4-presubmits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,6 @@ presubmits:
value: e2e-aws-fips
- name: TEST_COMMAND
value: |
fips_check
TEST_SUITE=openshift/conformance/parallel run-tests
image: ci-operator:latest
imagePullPolicy: Always
Expand Down
1 change: 0 additions & 1 deletion ci-operator/jobs/openshift/origin/openshift-origin-release-4.6-presubmits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,6 @@ presubmits:
value: e2e-aws-fips
- name: TEST_COMMAND
value: |
fips_check
TEST_SUITE=openshift/conformance/parallel run-tests
image: ci-operator:latest
imagePullPolicy: Always
Expand Down
1 change: 0 additions & 1 deletion ci-operator/jobs/openshift/origin/openshift-origin-release-4.7-presubmits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,6 @@ presubmits:
value: e2e-aws-fips
- name: TEST_COMMAND
value: |
fips_check
TEST_SUITE=openshift/conformance/parallel run-tests
image: ci-operator:latest
imagePullPolicy: Always
Expand Down
4 changes: 0 additions & 4 deletions ci-operator/jobs/openshift/release/openshift-release-release-4.3-periodics.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4957,16 +4957,12 @@ periodics:
tests:
- as: e2e-aws-fips
commands: |
fips_check
TEST_SUITE=all run-upgrade-tests
fips_check
openshift_installer:
cluster_profile: "$(CLUSTER_TYPE)"
- name: TEST_COMMAND
value: |
fips_check
TEST_SUITE=all run-upgrade-tests
fips_check
image: ci-operator:latest
imagePullPolicy: Always
name: ""
Expand Down
4 changes: 0 additions & 4 deletions ci-operator/jobs/openshift/release/openshift-release-release-4.4-periodics.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4629,16 +4629,12 @@ periodics:
tests:
- as: e2e-aws-fips
commands: |
fips_check
TEST_SUITE=all run-upgrade-tests
fips_check
openshift_installer:
cluster_profile: "$(CLUSTER_TYPE)"
- name: TEST_COMMAND
value: |
fips_check
TEST_SUITE=all run-upgrade-tests
fips_check
image: ci-operator:latest
imagePullPolicy: Always
name: ""
Expand Down
37 changes: 0 additions & 37 deletions ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,43 +158,6 @@ objects:
trap 'touch /tmp/shared/exit' EXIT
trap 'jobs -p | xargs -r kill || true; exit 0' TERM

function fips_check() {
get_nodes=$(oc --request-timeout=60s get nodes -o jsonpath --template '{range .items[*]}{.metadata.name}{"\n"}{end}')
nodes=( $get_nodes )
# bash doesn't handle '.' in array elements easily
for i in {0..5}; do
attempt=0
while true; do
out=$(oc --request-timeout=60s -n default debug node/"${nodes[i]}" -- cat /proc/sys/crypto/fips_enabled || true)
if [[ ! -z "${out}" ]]; then
break
fi
attempt=$(( attempt + 1 ))
if [[ $attempt -gt 3 ]]; then
break
fi
echo "command failed, $(( 4 - $attempt )) retries left"
sleep 5
done

if [[ -z "${out}" ]]; then
echo "oc debug node/${nodes[i]} failed"
exit 1
fi
if [[ "${CLUSTER_VARIANT}" =~ "fips" ]]; then
if [[ "${out}" -ne 1 ]]; then
echo "fips not enabled in node ${nodes[i]} but should be, exiting"
exit 1
fi
else
if [[ "${out}" -ne 0 ]]; then
echo "fips is enabled in node ${nodes[i]} but should not be, exiting"
exit 1
fi
fi
done
}

function patch_image_specs() {
cat <<EOF >samples-patch.yaml
- op: add
Expand Down