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

ocp4: fix basic-auth check #6158

Merged
merged 1 commit into from
Oct 7, 2020
Merged

Conversation

JAORMX
Copy link
Contributor

@JAORMX JAORMX commented Oct 7, 2020

The check is now done through an API check.

@JAORMX
Copy link
Contributor Author

JAORMX commented Oct 7, 2020

Pull-request updated, HEAD is now 8e0c9d0

@JAORMX JAORMX force-pushed the basic-auth branch 2 times, most recently from 8e0c9d0 to 1f7c5b0 Compare October 7, 2020 10:08
@JAORMX
Copy link
Contributor Author

JAORMX commented Oct 7, 2020

Pull-request updated, HEAD is now 1f7c5b0

Copy link
Collaborator

@jhrozek jhrozek left a comment

Choose a reason for hiding this comment

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

/lgtm

@jhrozek
Copy link
Collaborator

jhrozek commented Oct 7, 2020

Oops, sorry, I might have acked too soon, RHEL-6 and 7 are complaining:

Exception while handling file: /home/jenkins/workspace/scap-security-guide-pull-requests/label/rhel7/build/ocp4/rules/api_server_basic_auth.yml
Traceback (most recent call last):
  File "/home/jenkins/workspace/scap-security-guide-pull-requests/label/rhel7/build-scripts/build_templated_content.py", line 56, in <module>
    builder.build()
  File "/home/jenkins/workspace/scap-security-guide-pull-requests/label/rhel7/ssg/templates.py", line 550, in build
    self.build_all_rules()
  File "/home/jenkins/workspace/scap-security-guide-pull-requests/label/rhel7/ssg/templates.py", line 528, in build_all_rules
    rule = ssg.build_yaml.Rule.from_yaml(rule_path, self.env_yaml)
  File "/home/jenkins/workspace/scap-security-guide-pull-requests/label/rhel7/ssg/build_yaml.py", line 878, in from_yaml
    yaml_contents = open_and_macro_expand(yaml_file, env_yaml)
  File "/home/jenkins/workspace/scap-security-guide-pull-requests/label/rhel7/ssg/yaml.py", line 126, in open_and_macro_expand
    return open_and_expand(yaml_file, substitutions_dict)
  File "/home/jenkins/workspace/scap-security-guide-pull-requests/label/rhel7/ssg/yaml.py", line 109, in open_and_expand
    yaml_contents = _open_yaml(expanded_template, yaml_file, substitutions_dict)
  File "/home/jenkins/workspace/scap-security-guide-pull-requests/label/rhel7/ssg/yaml.py", line 75, in _open_yaml
    raise e
yaml.constructor.ConstructorError: could not determine a constructor for the tag 'tag:yaml.org,2002:python/unicode'
  in "<unicode string>", line 40, column 15
gmake[2]: *** [ocp4/templated-content-ocp4] Error 1
gmake[1]: *** [ocp4/CMakeFiles/generate-internal-templated-content-ocp4.dir/all] Error 2
gmake[1]: *** Waiting for unfinished jobs....
[  1%] Built target generate-internal-fedora-shorthand.xml

@jhrozek
Copy link
Collaborator

jhrozek commented Oct 7, 2020

Do we care about ^ ? Can't we just let RHEL-7 ride into the sunset?

@JAORMX
Copy link
Contributor Author

JAORMX commented Oct 7, 2020

Pull-request updated, HEAD is now e06bad6

@JAORMX
Copy link
Contributor Author

JAORMX commented Oct 7, 2020

Do we care about ^ ? Can't we just let RHEL-7 ride into the sunset?

I don't think we care much about those. But it seems to be a required test 😕 so we can't merge this as it is. Don't know how to move this forward.

@JAORMX
Copy link
Contributor Author

JAORMX commented Oct 7, 2020

Pull-request updated, HEAD is now 49ea5a6

@JAORMX
Copy link
Contributor Author

JAORMX commented Oct 7, 2020

Pull-request updated, HEAD is now 3d9e2d6

@JAORMX
Copy link
Contributor Author

JAORMX commented Oct 7, 2020

Pull-request updated, HEAD is now e06bad6

@JAORMX
Copy link
Contributor Author

JAORMX commented Oct 7, 2020

Pull-request updated, HEAD is now 473c767

The check is now done through an API check.
@JAORMX
Copy link
Contributor Author

JAORMX commented Oct 7, 2020

Pull-request updated, HEAD is now 896385b

Copy link
Collaborator

@jhrozek jhrozek left a comment

Choose a reason for hiding this comment

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

great, the python2 build passes now, ACK!

@JAORMX JAORMX merged commit 65890b1 into ComplianceAsCode:master Oct 7, 2020
@yuumasato yuumasato added this to the 0.1.53 milestone Oct 27, 2020
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet