diff --git a/playbooks/image-builder-build.yaml b/playbooks/airship-image-builder-build.yaml similarity index 100% rename from playbooks/image-builder-build.yaml rename to playbooks/airship-image-builder-build.yaml diff --git a/playbooks/image-builder-collect-logs.yaml b/playbooks/airship-image-builder-collect-logs.yaml similarity index 100% rename from playbooks/image-builder-collect-logs.yaml rename to playbooks/airship-image-builder-collect-logs.yaml diff --git a/playbooks/image-builder-deploy-docker.yaml b/playbooks/airship-image-builder-deploy-docker.yaml similarity index 100% rename from playbooks/image-builder-deploy-docker.yaml rename to playbooks/airship-image-builder-deploy-docker.yaml diff --git a/playbooks/image-builder-publish.yaml b/playbooks/airship-image-builder-publish-latest.yaml similarity index 100% rename from playbooks/image-builder-publish.yaml rename to playbooks/airship-image-builder-publish-latest.yaml diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index b7c5743..735a9f8 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -1,5 +1,5 @@ - job: - name: image-builder-upload-git-mirror + name: airship-image-builder-upload-git-mirror parent: upload-git-mirror description: Mirrors airship/image-builder to airshipit/image-builder vars: @@ -10,33 +10,33 @@ pass-to-parent: true - job: - name: image-builder-build - nodeset: image-builder-single-node + name: airship-image-builder-build + nodeset: airship-image-builder-single-node timeout: 7200 post-timeout: 7200 - pre-run: playbooks/image-builder-deploy-docker.yaml - run: playbooks/image-builder-build.yaml - post-run: playbooks/image-builder-collect-logs.yaml + pre-run: playbooks/airship-image-builder-deploy-docker.yaml + run: playbooks/airship-image-builder-build.yaml + post-run: playbooks/airship-image-builder-collect-logs.yaml - job: - name: image-builder-publish-latest - nodeset: image-builder-single-node + name: airship-image-builder-publish-latest + nodeset: airship-image-builder-single-node timeout: 7200 post-timeout: 7200 - pre-run: playbooks/image-builder-deploy-docker.yaml - run: playbooks/airship-images-publish.yaml + pre-run: playbooks/airship-image-builder-deploy-docker.yaml + run: playbooks/airship-image-builder-publish-latest.yaml secrets: - name: image_builder_quay_creds secret: image_builder_quay_creds - job: - name: image-builder-publish-commit - parent: image-builder-publish-latest + name: airship-image-builder-publish-commit + parent: airship-image-builder-publish-latest vars: image_tag: "{{ zuul.newrev }}" - nodeset: - name: image-builder-single-node + name: airship-image-builder-single-node nodes: - name: primary label: ubuntu-bionic-32GB diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml index ee96def..5e306f4 100644 --- a/zuul.d/projects.yaml +++ b/zuul.d/projects.yaml @@ -15,15 +15,15 @@ image_tag: latest check: jobs: - - image-builder-build + - airship-image-builder-build gate: jobs: - - image-builder-build + - airship-image-builder-build post: jobs: - - image-builder-upload-git-mirror - - image-builder-publish-latest - - image-builder-publish-commit + - airship-image-builder-upload-git-mirror + - airship-image-builder-publish-latest + - airship-image-builder-publish-commit tag: jobs: - - image-builder-upload-git-mirror \ No newline at end of file + - airship-image-builder-upload-git-mirror \ No newline at end of file