diff options
| author | Lu Qiuwen <[email protected]> | 2019-08-28 16:44:43 +0800 |
|---|---|---|
| committer | Lu Qiuwen <[email protected]> | 2019-08-28 16:50:49 +0800 |
| commit | 8e0314e7e16476e7160a47dbe3256b2888b1d264 (patch) | |
| tree | f97a2b234e85b3cf32d0686aca1fd80a1c8b5d7b | |
| parent | ffa3c7112e4c24cc80de4ee7ef25b564e8053bcc (diff) | |
增加pulp-admin工具的安装
| -rw-r--r-- | .gitlab-ci.yml | 6 | ||||
| -rw-r--r-- | plup-consumer.yml | 6 | ||||
| -rw-r--r-- | pulp.yml | 42 |
3 files changed, 46 insertions, 8 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 172ec36..53be583 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,13 +6,15 @@ variables: DOCKER_DRIVER: overlay2 IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG -include: "/plup-consumer.yml" +include: + - "/pulp.yml" stages: - self-test self-test: - extends: .pulp-consumer-install + extends: + - .pulp-startup stage: self-test image: centos:7.4.1708 tags: diff --git a/plup-consumer.yml b/plup-consumer.yml deleted file mode 100644 index 8b2c98d..0000000 --- a/plup-consumer.yml +++ /dev/null @@ -1,6 +0,0 @@ -.pulp-consumer-install: - script: - - yum install -y http://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm - - yum install -y wget - - wget https://repos.fedorapeople.org/repos/pulp/pulp/rhel-pulp.repo -O /etc/yum.repos.d/rhel-pulp.repo - - yum install -y pulp-consumer-client pulp-rpm-consumer-extensions pulp-puppet-consumer-extensions pulp-agent pulp-rpm-handlers pulp-rpm-yumplugins pulp-puppet-handlers python-gofer-qpid diff --git a/pulp.yml b/pulp.yml new file mode 100644 index 0000000..c3d5041 --- /dev/null +++ b/pulp.yml @@ -0,0 +1,42 @@ +.pulp-repo: + variables: + PULP_SERVER_HOST: repo.mesalab.cn + PULP_SERVER_PORT: 443 + + script: + - yum install -y http://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm + - yum install -y wget + - wget https://repos.fedorapeople.org/repos/pulp/pulp/rhel-pulp.repo -O /etc/yum.repos.d/rhel-pulp.repo + +.pulp-consumer-cfgfile: + script: + - echo "[server]" >> consumer.conf.tmpfile + - echo "host: $PULP_SERVER_HOST" >> consumer.conf.tmpfile + - echo "port: $PULP_SERVER_PORT" >> consumer.conf.tmpfile + - mv consumer.conf.tmpfile /etc/pulp/consumer/conf.d/server.conf + +.pulp-admin-cfgfile: + script: + - echo "[server]" >> consumer.conf.tmpfile + - echo "host: $PULP_SERVER_HOST" >> consumer.conf.tmpfile + - echo "port: $PULP_SERVER_PORT" >> consumer.conf.tmpfile + - mv consumer.conf.tmpfile /etc/pulp/admin/conf.d/server.conf + +.pulp-consumer-install: + extends: .pulp-repo-setup + script: + - yum install -y pulp-consumer-client pulp-rpm-consumer-extensions pulp-puppet-consumer-extensions pulp-agent pulp-rpm-handlers pulp-rpm-yumplugins pulp-puppet-handlers python-gofer-qpid + +.pulp-admin-install: + extends: .pulp-repo-setup + script: + - yum install pulp-admin-client pulp-rpm-admin-extensions pulp-puppet-admin-extensions pulp-docker-admin-extensions + +.pulp-startup: + extends: + - .pulp-consumer-install + - .pulp-admin-install + - .pulp-consumer-cfgfile + - .pulp-admin-cfgfile + scripts: + - /usr/bin/goferd |