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

Add missing envars to upload container #141

Merged

Conversation

AlexVulaj
Copy link
Contributor

These envars were missed during the refactor in #138 , and were recently discovered when checking for parity between the old job CRs created by MGO and the new job CRs.

Also some minor updates to the formatting of strings. In particular, the upload container's command went from this:

        - command:
            - /bin/bash
            - -c
            - "count=0\nuntil [ $count -gt 4 ]\ndo\n  while `pgrep -a gather > /dev/null`\n
          \ do\n    echo \"waiting for gathers to complete ...\" \n    sleep 120\n
          \   count=0\n  done\n  echo \"no gather is running ($count / 4)\"\n  ((count++))\n
          \ sleep 30\ndone\n/usr/local/bin/upload\n"

To this:

        - command:
            - /bin/bash
            - -c
            - |-
              count=0
              until [ $count -gt 4 ]
              do
                while `pgrep -a gather > /dev/null`
                do
                  echo "waiting for gathers to complete ..."
                  sleep 120
                  count=0
                done
                echo "no gather is running ($count / 4)"
                ((count++))
                sleep 30
              done
              /usr/local/bin/upload

Both are identical, but the latter is much easier to read and understand.

Copy link
Contributor

@mjlshen mjlshen left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot requested review from bng0y and devppratik June 25, 2024 20:15
Copy link
Contributor

openshift-ci bot commented Jun 25, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: AlexVulaj, mjlshen

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 25, 2024
@AlexVulaj AlexVulaj force-pushed the add-missing-upload-envars branch from b8bdcbb to 78af8d2 Compare June 25, 2024 20:21
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jun 25, 2024
@codecov-commenter
Copy link

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 37.75%. Comparing base (b5e4345) to head (78af8d2).

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #141      +/-   ##
==========================================
+ Coverage   36.78%   37.75%   +0.96%     
==========================================
  Files           5        5              
  Lines         386      392       +6     
==========================================
+ Hits          142      148       +6     
  Misses        241      241              
  Partials        3        3              
Files Coverage Δ
controllers/mustgather/template.go 88.05% <100.00%> (+0.55%) ⬆️

Copy link
Contributor

openshift-ci bot commented Jun 25, 2024

@AlexVulaj: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@openshift-merge-bot openshift-merge-bot bot merged commit ffba798 into openshift:master Jun 25, 2024
6 checks passed
@AlexVulaj AlexVulaj deleted the add-missing-upload-envars branch June 25, 2024 20:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants