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 jq to the kubekins-test image and pass through KUBE_FORCE_VERIFY_CHECKS #22834

Merged
merged 1 commit into from
Mar 11, 2016

Conversation

ixdy
Copy link
Member

@ixdy ixdy commented Mar 11, 2016

Fixes after #22681.

Note that I haven't pushed kubekins-test:0.8 yet, so this will fail (and shouldn't be merged).

cc @eparis @kubernetes/sig-testing

@ixdy
Copy link
Member Author

ixdy commented Mar 11, 2016

Travis is still gonna be busted... not sure if we want to fix that.

@k8s-github-robot
Copy link

Labelling this PR as size/XS

@k8s-github-robot k8s-github-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Mar 11, 2016
@ixdy
Copy link
Member Author

ixdy commented Mar 11, 2016

(If we're happy with this change I'll push the image and re-run unit/integration tests.)

@spxtr spxtr added the do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. label Mar 11, 2016
@spxtr
Copy link
Contributor

spxtr commented Mar 11, 2016

LGTM

@ixdy
Copy link
Member Author

ixdy commented Mar 11, 2016

0.8: digest: sha256:07d08cf8c6ec567e2e001862b8e66fd0699637f96c77ebb658f9efa7fb884330 size: 50720

@k8s-bot unit test this, issue #22834

@ixdy ixdy removed the do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. label Mar 11, 2016
@k8s-bot
Copy link

k8s-bot commented Mar 11, 2016

GCE e2e build/test passed for commit 85bc91c.

@eparis
Copy link
Contributor

eparis commented Mar 11, 2016

If you are happy, merge it. LGTM

@eparis eparis added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 11, 2016
@ixdy
Copy link
Member Author

ixdy commented Mar 11, 2016

Self-merging so godep-changing PRs can work again. Will watch to make sure post-commit Jenkins doesn't fall over.

ixdy added a commit that referenced this pull request Mar 11, 2016
Add jq to the kubekins-test image and pass through KUBE_FORCE_VERIFY_CHECKS
@ixdy ixdy merged commit d94ff5b into kubernetes:master Mar 11, 2016
@ixdy
Copy link
Member Author

ixdy commented Mar 11, 2016

Now this is failing differently, and I don't understand why; it works fine locally.

Verifying ./hack/../hack/verify-godep-licenses.sh
Created workspace: /go/src/k8s.io/kubernetes/kube-godep-licenses.Qtc34D
Your godep licenses file is out of date. Run hack/update-godep-licenses.sh and commit the results.
--- /go/src/k8s.io/kubernetes/Godeps/LICENSES   2016-03-10 22:31:58.786821838 -0800
+++ /go/src/k8s.io/kubernetes/kube-godep-licenses.Qtc34D/Godeps/LICENSES    2016-03-10 22:40:58.147129743 -0800
@@ -30113,10 +30113,21 @@ WITH THE SOFTWARE OR THE USE OR OTHER DE
    See the License for the specific language governing permissions and
    limitations under the License.

-## Copyright and license
+Copyright 2012-2015 Docker, Inc.

-Code and documentation copyright 2014 Docker, inc. Code released under the Apache 2.0 license.
-Docs released under Creative commons.
+This product includes software developed at Docker, Inc. (http://www.docker.com).
+
+The following is courtesy of our legal counsel:
+
+
+Use and transfer of Docker may be subject to certain restrictions by the
+United States and other governments.  
+It is your responsibility to ensure that your use and/or transfer does not
+violate applicable laws. 
+
+For more information, please see http://www.bis.doc.gov
+
+See also http://www.apache.org/dev/crypto.html and/or seek legal counsel.

 ================================================================================
 = Godeps/_workspace/src/github.com/pborman/uuid licensed under: =
Removing workspace: /go/src/k8s.io/kubernetes/kube-godep-licenses.Qtc34D
FAILED   ./hack/../hack/verify-godep-licenses.sh    11s

cc @karlkfi @david-mcmahon

@bgrant0607
Copy link
Member

@ixdy Can we revert? submit queue is blocked.

@ixdy
Copy link
Member Author

ixdy commented Mar 11, 2016

@bgrant0607 how about #22844, which just disables this check?

@ixdy ixdy mentioned this pull request Mar 29, 2016
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/test-infra lgtm "Looks good to me", indicates that a PR is ready to be merged. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants