Skip to content

Commit

Permalink
Change over to Xmidt from Webpa.
Browse files Browse the repository at this point in the history
  • Loading branch information
schmidtw committed May 24, 2017
1 parent 6d7d919 commit fdbc341
Show file tree
Hide file tree
Showing 8 changed files with 60 additions and 37 deletions.
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ before_install:
- docker exec build git clone https://github.com/Comcast/talaria.git
- docker exec build git clone https://github.com/Comcast/talaria.git codecovio_build

- 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then openssl aes-256-cbc -K $encrypted_dd7f1049d1ce_key -iv $encrypted_dd7f1049d1ce_iv -in keys/RPM-GPG-KEY-comcast-webpa.private.enc -out keys/RPM-GPG-KEY-comcast-webpa.private -d; fi'
- 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then docker cp keys/RPM-GPG-KEY-comcast-webpa.private build:/RPM-GPG-KEY-comcast-webpa.private; fi'
- 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then docker exec build bash -c "gpg --allow-secret-key-import --import /RPM-GPG-KEY-comcast-webpa.private"; fi'
- 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then openssl aes-256-cbc -K $encrypted_80fea5e24838_key -iv $encrypted_80fea5e24838_iv -in keys/RPM-GPG-KEY-comcast-xmidt.private.enc -out keys/RPM-GPG-KEY-comcast-xmidt.private -d; fi'
- 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then docker cp keys/RPM-GPG-KEY-comcast-xmidt.private build:/RPM-GPG-KEY-comcast-xmidt.private; fi'
- 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then docker exec build bash -c "gpg --allow-secret-key-import --import /RPM-GPG-KEY-comcast-xmidt.private"; fi'
- 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then docker exec build bash -c "pushd talaria; git fetch origin +refs/pull/${TRAVIS_PULL_REQUEST}/merge && git checkout -qf FETCH_HEAD; popd"; fi'
- 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then docker exec build bash -c "pushd codecovio_build; git fetch origin +refs/pull/${TRAVIS_PULL_REQUEST}/merge && git checkout -qf FETCH_HEAD; popd"; fi'

Expand All @@ -39,7 +39,7 @@ deploy:
api_key: "$AUTH_TOKEN_BUILD"
file:
- x86_64/$BINARY_NAME
- keys/RPM-GPG-KEY-comcast-webpa
- keys/RPM-GPG-KEY-comcast-xmidt
skip_cleanup: true
on:
condition: "$TRAVIS_PULL_REQUEST = false"
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
[![Go Report Card](https://goreportcard.com/badge/github.com/Comcast/talaria)](https://goreportcard.com/report/github.com/Comcast/talaria)
[![Apache V2 License](http://img.shields.io/badge/license-Apache%20V2-blue.svg)](https://github.com/Comcast/talaria/blob/master/LICENSE)

The Webpa routing agent.
The Xmidt routing agent.

# How to Install

Expand All @@ -16,7 +16,7 @@ The Webpa routing agent.
1. Import the public GPG key (replace `v0.0.1-65alpha` with the release you want)

```
rpm --import https://github.com/Comcast/talaria/releases/download/v0.0.1-65alpha/RPM-GPG-KEY-comcast-webpa
rpm --import https://github.com/Comcast/talaria/releases/download/v0.0.1-65alpha/RPM-GPG-KEY-comcast-xmidt
```

2. Install the rpm with yum (so it installs any/all dependencies for you)
Expand Down
2 changes: 1 addition & 1 deletion build_rpm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ cat ChangeLog >> ${NAME}.spec

yes "" | rpmbuild -ba --sign \
--define "_signature gpg" \
--define "_gpg_name Comcast Webpa Team <CHQSV-Webpa[email protected]>" \
--define "_gpg_name Comcast Xmidt Team <CHQSV-Xmidt[email protected]>" \
--define "_ver $release" \
--define "_releaseno ${BUILD_NUMBER}" \
--define "_fullver $new_release" \
Expand Down
28 changes: 0 additions & 28 deletions keys/RPM-GPG-KEY-comcast-webpa

This file was deleted.

Binary file removed keys/RPM-GPG-KEY-comcast-webpa.private.enc
Binary file not shown.
51 changes: 51 additions & 0 deletions keys/RPM-GPG-KEY-comcast-xmidt
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----

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
Suha8WoyLT01KdFY6j4t
=WjGo
-----END PGP PUBLIC KEY BLOCK-----
Binary file added keys/RPM-GPG-KEY-comcast-xmidt.private.enc
Binary file not shown.
4 changes: 2 additions & 2 deletions talaria.spec
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Name: talaria
Version: %{_ver}
Release: %{_releaseno}%{?dist}
Summary: The Webpa router agent.
Summary: The Xmidt router agent.

Group: System Environment/Daemons
License: ASL 2.0
Expand All @@ -14,7 +14,7 @@ BuildRequires: golang >= 1.8
Requires: supervisor

%description
The Webpa router agent.
The Xmidt router agent.

%prep
%setup -q
Expand Down

0 comments on commit fdbc341

Please sign in to comment.